[Scummvm-git-logs] scummvm master -> 6cf43726cc840eff8721d79bf631ba41cf968049
bluegr
noreply at scummvm.org
Wed Oct 30 10:03:23 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6cf43726cc DGDS: Move mini-games into a separate folder
Commit: 6cf43726cc840eff8721d79bf631ba41cf968049
https://github.com/scummvm/scummvm/commit/6cf43726cc840eff8721d79bf631ba41cf968049
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-30T12:03:14+02:00
Commit Message:
DGDS: Move mini-games into a separate folder
This includes the mini arcade games, as well as games with dedicated
logic, such as the shell game in HoC
Mini games for Dragon and HoC:
- Dragon: Arcade sequence: Fighting Snake (implemented)
- Dragon: Arcade: Reservoir (implemented)
- HoC: Tank 3D arcade sequence in Chengdu (missing)
- HoC: Shell game with street gambler in Istanbul (implemented)
- HoC: Train arcade sequence after Istanbul (missing)
Changed paths:
A engines/dgds/minigames/dragon_arcade.cpp
A engines/dgds/minigames/dragon_arcade.h
A engines/dgds/minigames/dragon_arcade_ttm.cpp
A engines/dgds/minigames/dragon_arcade_ttm.h
A engines/dgds/minigames/shell_game.cpp
A engines/dgds/minigames/shell_game.h
R engines/dgds/dragon_arcade.cpp
R engines/dgds/dragon_arcade.h
R engines/dgds/dragon_arcade_ttm.cpp
R engines/dgds/dragon_arcade_ttm.h
R engines/dgds/shell_game.cpp
R engines/dgds/shell_game.h
engines/dgds/dgds.cpp
engines/dgds/module.mk
engines/dgds/scene.cpp
engines/dgds/scene.h
diff --git a/engines/dgds/dgds.cpp b/engines/dgds/dgds.cpp
index b9afba0ef45..bc8d09dd8bd 100644
--- a/engines/dgds/dgds.cpp
+++ b/engines/dgds/dgds.cpp
@@ -62,7 +62,7 @@
#include "dgds/scripts.h"
#include "dgds/sound.h"
#include "dgds/game_palettes.h"
-#include "dgds/dragon_arcade.h"
+#include "dgds/minigames/dragon_arcade.h"
#include "dgds/hoc_intro.h"
// for frame contents debugging
diff --git a/engines/dgds/dragon_arcade.cpp b/engines/dgds/minigames/dragon_arcade.cpp
similarity index 99%
rename from engines/dgds/dragon_arcade.cpp
rename to engines/dgds/minigames/dragon_arcade.cpp
index 2b16d88c304..ba4bb379686 100644
--- a/engines/dgds/dragon_arcade.cpp
+++ b/engines/dgds/minigames/dragon_arcade.cpp
@@ -26,7 +26,7 @@
#include "dgds/dgds.h"
#include "dgds/image.h"
#include "dgds/includes.h"
-#include "dgds/dragon_arcade.h"
+#include "dgds/minigames/dragon_arcade.h"
#include "dgds/sound.h"
#include "dgds/scene.h"
#include "dgds/drawing.h"
diff --git a/engines/dgds/dragon_arcade.h b/engines/dgds/minigames/dragon_arcade.h
similarity index 97%
rename from engines/dgds/dragon_arcade.h
rename to engines/dgds/minigames/dragon_arcade.h
index 00489ae185c..4c1c2a249fc 100644
--- a/engines/dgds/dragon_arcade.h
+++ b/engines/dgds/minigames/dragon_arcade.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef DGDS_DRAGON_ARCADE_H
-#define DGDS_DRAGON_ARCADE_H
+#ifndef DGDS_MINIGAMES_DRAGON_ARCADE_H
+#define DGDS_MINIGAMES_DRAGON_ARCADE_H
#include "common/types.h"
-#include "engines/dgds/dragon_arcade_ttm.h"
+#include "engines/dgds/minigames/dragon_arcade_ttm.h"
namespace Dgds {
@@ -225,4 +225,4 @@ private:
} // end namespace Dgds
-#endif // DGDS_DRAGON_ARCADE_H
+#endif // DGDS_MINIGAMES_DRAGON_ARCADE_H
diff --git a/engines/dgds/dragon_arcade_ttm.cpp b/engines/dgds/minigames/dragon_arcade_ttm.cpp
similarity index 99%
rename from engines/dgds/dragon_arcade_ttm.cpp
rename to engines/dgds/minigames/dragon_arcade_ttm.cpp
index 8b3325dd6e0..b38e5733a4c 100644
--- a/engines/dgds/dragon_arcade_ttm.cpp
+++ b/engines/dgds/minigames/dragon_arcade_ttm.cpp
@@ -19,9 +19,8 @@
*
*/
-#include "dgds/dragon_arcade_ttm.h"
-
-#include "dgds/dragon_arcade.h"
+#include "dgds/minigames/dragon_arcade_ttm.h"
+#include "dgds/minigames/dragon_arcade.h"
#include "dgds/ads.h"
#include "dgds/drawing.h"
#include "dgds/sound.h"
diff --git a/engines/dgds/dragon_arcade_ttm.h b/engines/dgds/minigames/dragon_arcade_ttm.h
similarity index 96%
rename from engines/dgds/dragon_arcade_ttm.h
rename to engines/dgds/minigames/dragon_arcade_ttm.h
index f84ea028a11..eb3e4d7ed38 100644
--- a/engines/dgds/dragon_arcade_ttm.h
+++ b/engines/dgds/minigames/dragon_arcade_ttm.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef DGDS_DRAGON_ARCADE_TTM_H
-#define DGDS_DRAGON_ARCADE_TTM_H
+#ifndef DGDS_MINIGAMES_DRAGON_ARCADE_TTM_H
+#define DGDS_MINIGAMES_DRAGON_ARCADE_TTM_H
#include "common/types.h"
#include "common/ptr.h"
@@ -116,4 +116,4 @@ private:
} // end namespace Dgds
-#endif // DGDS_DRAGON_ARCADE_TTM_H
+#endif // DGDS_MINIGAMES_DRAGON_ARCADE_TTM_H
diff --git a/engines/dgds/shell_game.cpp b/engines/dgds/minigames/shell_game.cpp
similarity index 99%
rename from engines/dgds/shell_game.cpp
rename to engines/dgds/minigames/shell_game.cpp
index 118923b9592..4c9f1e2a898 100644
--- a/engines/dgds/shell_game.cpp
+++ b/engines/dgds/minigames/shell_game.cpp
@@ -21,7 +21,7 @@
#include "common/intrinsics.h"
-#include "dgds/shell_game.h"
+#include "dgds/minigames/shell_game.h"
#include "dgds/dgds.h"
#include "dgds/globals.h"
#include "dgds/font.h"
diff --git a/engines/dgds/shell_game.h b/engines/dgds/minigames/shell_game.h
similarity index 93%
rename from engines/dgds/shell_game.h
rename to engines/dgds/minigames/shell_game.h
index a213dabec76..886c0595161 100644
--- a/engines/dgds/shell_game.h
+++ b/engines/dgds/minigames/shell_game.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef DGDS_SHELL_GAME_H
-#define DGDS_SHELL_GAME_H
+#ifndef DGDS_MINIGAMES_SHELL_GAME_H
+#define DGDS_MINIGAMES_SHELL_GAME_H
#include "dgds/image.h"
@@ -64,4 +64,4 @@ private:
} // end namespace Dgds
-#endif // DGDS_SHELL_GAME_H
+#endif // DGDS_MINIGAMES_SHELL_GAME_H
diff --git a/engines/dgds/module.mk b/engines/dgds/module.mk
index 2d80da976ef..4fa01afb023 100644
--- a/engines/dgds/module.mk
+++ b/engines/dgds/module.mk
@@ -8,8 +8,6 @@ MODULE_OBJS := \
dgds.o \
dgds_rect.o \
dialog.o \
- dragon_arcade.o \
- dragon_arcade_ttm.o \
dragon_native.o \
drawing.o \
font.o \
@@ -25,10 +23,12 @@ MODULE_OBJS := \
resource.o \
scene.o \
scripts.o \
- shell_game.o \
sound.o \
sound_raw.o \
ttm.o \
+ minigames/dragon_arcade.o \
+ minigames/dragon_arcade_ttm.o \
+ minigames/shell_game.o \
sound/midiparser_sci.o \
sound/music.o \
sound/drivers/adlib.o \
diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index dcd3229da82..9706821145d 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -42,7 +42,7 @@
#include "dgds/globals.h"
#include "dgds/image.h"
#include "dgds/inventory.h"
-#include "dgds/dragon_arcade.h"
+#include "dgds/minigames/dragon_arcade.h"
#include "dgds/dragon_native.h"
#include "dgds/hoc_intro.h"
diff --git a/engines/dgds/scene.h b/engines/dgds/scene.h
index e7cefce500a..3d160a1f888 100644
--- a/engines/dgds/scene.h
+++ b/engines/dgds/scene.h
@@ -28,7 +28,7 @@
#include "dgds/dialog.h"
#include "dgds/dgds_rect.h"
-#include "dgds/shell_game.h"
+#include "dgds/minigames/shell_game.h"
namespace Dgds {
More information about the Scummvm-git-logs
mailing list