[Scummvm-git-logs] scummvm master -> dbcc04d1bad319e71dfee03e8cf438351f10add8
dreammaster
noreply at scummvm.org
Sat Feb 28 05:54:03 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
7df97d60d3 MADS: PHANTOM: Add GOG detection entry
9ee1e32599 MADS: Wrap v2 detection entries inside the define
eaec88703e MADS: Separate MADSV2 block in module.mk
dbcc04d1ba MADS: Cleanup of v2 namespaces, defines
Commit: 7df97d60d3cf3e6e71fc95ace404797d2faa0f15
https://github.com/scummvm/scummvm/commit/7df97d60d3cf3e6e71fc95ace404797d2faa0f15
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-28T16:53:36+11:00
Commit Message:
MADS: PHANTOM: Add GOG detection entry
Changed paths:
engines/mads/detection_tables.h
diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index 1e59c004c86..5ef7536bd9a 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -162,6 +162,21 @@ static const MADSGameDescription gameDescriptions[] = {
0
},
+ {
+ // Return of the Phantom GOG DOS English
+ {
+ "phantom",
+ 0,
+ AD_ENTRY1s("global.idx", "cf17ab33b5ab084763cf83c76a8d9634", 4638),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_UNSTABLE,
+ GUIO1(GAMEOPTION_EASY_MOUSE)
+ },
+ GType_Phantom,
+ 0
+ },
+
{
// Return of the Phantom DOS English Demo
{
Commit: 9ee1e32599015a396885a9d0f98193ba6feeee5f
https://github.com/scummvm/scummvm/commit/9ee1e32599015a396885a9d0f98193ba6feeee5f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-28T16:53:36+11:00
Commit Message:
MADS: Wrap v2 detection entries inside the define
Changed paths:
engines/mads/detection_tables.h
diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index 5ef7536bd9a..f6998304ee9 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -146,7 +146,7 @@ static const MADSGameDescription gameDescriptions[] = {
GType_RexNebular,
0
},
-
+#ifdef ENABLE_MADSV2
{
// Return of the Phantom DOS English
{
@@ -236,7 +236,7 @@ static const MADSGameDescription gameDescriptions[] = {
GType_Forest,
0
},
-
+#endif
{ AD_TABLE_END_MARKER, 0, 0 }
};
Commit: eaec88703ea4fd35af8a9e1d86013954103c86e6
https://github.com/scummvm/scummvm/commit/eaec88703ea4fd35af8a9e1d86013954103c86e6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-28T16:53:36+11:00
Commit Message:
MADS: Separate MADSV2 block in module.mk
Changed paths:
engines/mads/module.mk
engines/mads/scene.cpp
engines/mads/scene_data.cpp
diff --git a/engines/mads/module.mk b/engines/mads/module.mk
index 69daf80be8d..56561d92e1a 100644
--- a/engines/mads/module.mk
+++ b/engines/mads/module.mk
@@ -1,21 +1,6 @@
MODULE := engines/mads
MODULE_OBJS := \
- dragonsphere/game_dragonsphere.o \
- dragonsphere/dragonsphere_scenes.o \
- dragonsphere/dragonsphere_scenes1.o \
- dragonsphere/globals_dragonsphere.o \
- forest/game_forest.o \
- forest/forest_scenes.o \
- forest/globals_forest.o \
- phantom/game_phantom.o \
- phantom/globals_phantom.o \
- phantom/phantom_scenes.o \
- phantom/phantom_scenes1.o \
- phantom/phantom_scenes2.o \
- phantom/phantom_scenes3.o \
- phantom/phantom_scenes4.o \
- phantom/phantom_scenes5.o \
nebular/dialogs_nebular.o \
nebular/game_nebular.o \
nebular/globals_nebular.o \
@@ -65,6 +50,25 @@ MODULE_OBJS := \
staticres.o \
user_interface.o
+ifdef ENABLE_MADSV2
+MODULE_OBJS += \
+ dragonsphere/game_dragonsphere.o \
+ dragonsphere/dragonsphere_scenes.o \
+ dragonsphere/dragonsphere_scenes1.o \
+ dragonsphere/globals_dragonsphere.o \
+ forest/game_forest.o \
+ forest/forest_scenes.o \
+ forest/globals_forest.o \
+ phantom/game_phantom.o \
+ phantom/globals_phantom.o \
+ phantom/phantom_scenes.o \
+ phantom/phantom_scenes1.o \
+ phantom/phantom_scenes2.o \
+ phantom/phantom_scenes3.o \
+ phantom/phantom_scenes4.o \
+ phantom/phantom_scenes5.o
+endif
+
# This module can be built as a plugin
ifeq ($(ENABLE_MADS), DYNAMIC_PLUGIN)
PLUGIN := 1
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 22aa9466ef4..79eb3d1bffc 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -24,10 +24,12 @@
#include "mads/compression.h"
#include "mads/mads.h"
#include "mads/audio.h"
+#include "mads/nebular/nebular_scenes.h"
+#ifdef ENABLE_MADSV2
#include "mads/dragonsphere/dragonsphere_scenes.h"
#include "mads/forest/forest_scenes.h"
-#include "mads/nebular/nebular_scenes.h"
#include "mads/phantom/phantom_scenes.h"
+#endif
namespace MADS {
diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index 04143046e5b..b691e599eee 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -25,10 +25,12 @@
#include "mads/compression.h"
#include "mads/screen.h"
#include "mads/resources.h"
+#include "mads/nebular/nebular_scenes.h"
+#ifdef ENABLE_MADSV2
#include "mads/dragonsphere/dragonsphere_scenes.h"
#include "mads/forest/forest_scenes.h"
-#include "mads/nebular/nebular_scenes.h"
#include "mads/phantom/phantom_scenes.h"
+#endif
namespace MADS {
Commit: dbcc04d1bad319e71dfee03e8cf438351f10add8
https://github.com/scummvm/scummvm/commit/dbcc04d1bad319e71dfee03e8cf438351f10add8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-28T16:53:36+11:00
Commit Message:
MADS: Cleanup of v2 namespaces, defines
Changed paths:
engines/mads/dragonsphere/dragonsphere_scenes.cpp
engines/mads/dragonsphere/dragonsphere_scenes.h
engines/mads/dragonsphere/dragonsphere_scenes1.cpp
engines/mads/dragonsphere/dragonsphere_scenes1.h
engines/mads/dragonsphere/game_dragonsphere.cpp
engines/mads/dragonsphere/game_dragonsphere.h
engines/mads/dragonsphere/globals_dragonsphere.cpp
engines/mads/dragonsphere/globals_dragonsphere.h
engines/mads/forest/forest_scenes.cpp
engines/mads/forest/forest_scenes.h
engines/mads/forest/game_forest.cpp
engines/mads/forest/game_forest.h
engines/mads/forest/globals_forest.cpp
engines/mads/forest/globals_forest.h
engines/mads/phantom/game_phantom.cpp
engines/mads/phantom/game_phantom.h
engines/mads/phantom/globals_phantom.cpp
engines/mads/phantom/globals_phantom.h
engines/mads/phantom/phantom_scenes.cpp
engines/mads/phantom/phantom_scenes.h
engines/mads/phantom/phantom_scenes1.cpp
engines/mads/phantom/phantom_scenes1.h
engines/mads/phantom/phantom_scenes2.cpp
engines/mads/phantom/phantom_scenes2.h
engines/mads/phantom/phantom_scenes3.cpp
engines/mads/phantom/phantom_scenes3.h
engines/mads/phantom/phantom_scenes4.cpp
engines/mads/phantom/phantom_scenes4.h
engines/mads/phantom/phantom_scenes5.cpp
engines/mads/phantom/phantom_scenes5.h
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes.cpp b/engines/mads/dragonsphere/dragonsphere_scenes.cpp
index f2aa31f1b52..bcef5849246 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes.cpp
+++ b/engines/mads/dragonsphere/dragonsphere_scenes.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "common/config-manager.h"
#include "mads/mads.h"
#include "mads/compression.h"
@@ -31,7 +29,6 @@
#include "mads/dragonsphere/dragonsphere_scenes1.h"
namespace MADS {
-
namespace Dragonsphere {
SceneLogic *SceneFactory::createScene(MADSEngine *vm) {
@@ -236,7 +233,4 @@ void SceneInfoDragonsphere::loadCodes(BaseSurface &depthSurface, Common::Seekabl
}
} // End of namespace Dragonsphere
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes.h b/engines/mads/dragonsphere/dragonsphere_scenes.h
index 20673b6de33..6a66abdaff1 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes.h
+++ b/engines/mads/dragonsphere/dragonsphere_scenes.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_DRAGONSPHERE_SCENES_H
#define MADS_DRAGONSPHERE_SCENES_H
@@ -29,7 +27,6 @@
//#include "mads/dragonsphere/globals_dragonsphere.h"
namespace MADS {
-
namespace Dragonsphere {
enum Verb {
@@ -669,9 +666,6 @@ public:
};
} // End of namespace Dragonsphere
-
} // End of namespace MADS
-#endif /* MADS_DRAGONSPHERE_SCENES_H */
-
#endif
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
index 712f470fb64..b719e92e7cc 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
+++ b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/mads.h"
#include "mads/conversations.h"
#include "mads/scene.h"
@@ -28,7 +26,6 @@
#include "mads/dragonsphere/dragonsphere_scenes1.h"
namespace MADS {
-
namespace Dragonsphere {
void Scene1xx::setAAName() {
@@ -3691,5 +3688,3 @@ void Scene105::handleConversation() {
} // End of namespace Dragonsphere
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes1.h b/engines/mads/dragonsphere/dragonsphere_scenes1.h
index ad1c9cf46e4..7d3ad22c23f 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes1.h
+++ b/engines/mads/dragonsphere/dragonsphere_scenes1.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_DRAGON_SCENES1_H
#define MADS_DRAGON_SCENES1_H
@@ -28,7 +26,6 @@
#include "mads/dragonsphere/dragonsphere_scenes.h"
namespace MADS {
-
namespace Dragonsphere {
class Scene1xx : public DragonsphereScene {
@@ -183,6 +180,4 @@ public:
} // End of namespace Dragonsphere
} // End of namespace MADS
-#endif /* MADS_DRAGON_SCENES1_H */
-
#endif
diff --git a/engines/mads/dragonsphere/game_dragonsphere.cpp b/engines/mads/dragonsphere/game_dragonsphere.cpp
index ddfb6af5c0b..6502d39dcb8 100644
--- a/engines/mads/dragonsphere/game_dragonsphere.cpp
+++ b/engines/mads/dragonsphere/game_dragonsphere.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "common/config-manager.h"
#include "mads/mads.h"
#include "mads/game.h"
@@ -32,7 +30,6 @@
#include "mads/dragonsphere/dragonsphere_scenes.h"
namespace MADS {
-
namespace Dragonsphere {
GameDragonsphere::GameDragonsphere(MADSEngine *vm)
@@ -159,7 +156,4 @@ void GameDragonsphere::synchronize(Common::Serializer &s, bool phase1) {
}
} // End of namespace Dragonsphere
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/dragonsphere/game_dragonsphere.h b/engines/mads/dragonsphere/game_dragonsphere.h
index 0156f0289f2..81465ce04d5 100644
--- a/engines/mads/dragonsphere/game_dragonsphere.h
+++ b/engines/mads/dragonsphere/game_dragonsphere.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_GAME_DRAGONSPHERE_H
#define MADS_GAME_DRAGONSPHERE_H
@@ -29,7 +27,6 @@
#include "mads/dragonsphere/globals_dragonsphere.h"
namespace MADS {
-
namespace Dragonsphere {
// TODO: Adapt for Dragonsphere's difficulty setting
@@ -136,9 +133,6 @@ typedef Section1Handler Section7Handler;
typedef Section1Handler Section8Handler;
} // End of namespace Dragonsphere
-
} // End of namespace MADS
-#endif /* MADS_GAME_DRAGONSPHERE_H */
-
#endif
diff --git a/engines/mads/dragonsphere/globals_dragonsphere.cpp b/engines/mads/dragonsphere/globals_dragonsphere.cpp
index a303a4bf1d1..750d75c9199 100644
--- a/engines/mads/dragonsphere/globals_dragonsphere.cpp
+++ b/engines/mads/dragonsphere/globals_dragonsphere.cpp
@@ -19,12 +19,9 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/dragonsphere/globals_dragonsphere.h"
namespace MADS {
-
namespace Dragonsphere {
DragonsphereGlobals::DragonsphereGlobals()
@@ -44,9 +41,5 @@ void DragonsphereGlobals::synchronize(Common::Serializer &s) {
_animationIndexes.synchronize(s);
}
-
} // End of namespace Dragonsphere
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/dragonsphere/globals_dragonsphere.h b/engines/mads/dragonsphere/globals_dragonsphere.h
index fc354b7dd6d..bce621f1d2f 100644
--- a/engines/mads/dragonsphere/globals_dragonsphere.h
+++ b/engines/mads/dragonsphere/globals_dragonsphere.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_GLOBALS_DRAGONSPHERE_H
#define MADS_GLOBALS_DRAGONSPHERE_H
@@ -28,7 +26,6 @@
#include "mads/resources.h"
namespace MADS {
-
namespace Dragonsphere {
enum GlobalId {
@@ -177,9 +174,6 @@ public:
};
} // End of namespace Dragonsphere
-
} // End of namespace MADS
-#endif /* MADS_GLOBALS_DRAGONSPHERE_H */
-
#endif
diff --git a/engines/mads/forest/forest_scenes.cpp b/engines/mads/forest/forest_scenes.cpp
index c480bb24ff1..8ad59961953 100644
--- a/engines/mads/forest/forest_scenes.cpp
+++ b/engines/mads/forest/forest_scenes.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "common/config-manager.h"
#include "mads/mads.h"
#include "mads/compression.h"
@@ -30,7 +28,6 @@
#include "mads/forest/forest_scenes.h"
namespace MADS {
-
namespace Forest {
SceneLogic *SceneFactory::createScene(MADSEngine *vm) {
@@ -175,7 +172,4 @@ void SceneInfoForest::loadCodes(BaseSurface &depthSurface, Common::SeekableReadS
}
} // End of namespace Forest
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/forest/forest_scenes.h b/engines/mads/forest/forest_scenes.h
index e75409f272e..abc13a972b2 100644
--- a/engines/mads/forest/forest_scenes.h
+++ b/engines/mads/forest/forest_scenes.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_FOREST_SCENES_H
#define MADS_FOREST_SCENES_H
@@ -29,7 +27,6 @@
#include "mads/forest/globals_forest.h"
namespace MADS {
-
namespace Forest {
enum Verb {
@@ -233,9 +230,6 @@ public:
};
} // End of namespace Forest
-
} // End of namespace MADS
-#endif /* MADS_FOREST_SCENES_H */
-
#endif
diff --git a/engines/mads/forest/game_forest.cpp b/engines/mads/forest/game_forest.cpp
index 0cad71ae52a..f51ce2fd593 100644
--- a/engines/mads/forest/game_forest.cpp
+++ b/engines/mads/forest/game_forest.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "common/config-manager.h"
#include "mads/mads.h"
#include "mads/game.h"
@@ -32,7 +30,6 @@
//#include "mads/forest/forest_scenes.h"
namespace MADS {
-
namespace Forest {
GameForest::GameForest(MADSEngine *vm)
@@ -159,7 +156,4 @@ void GameForest::synchronize(Common::Serializer &s, bool phase1) {
}
} // End of namespace Forest
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/forest/game_forest.h b/engines/mads/forest/game_forest.h
index 77d0c48a28d..a97e7e76e52 100644
--- a/engines/mads/forest/game_forest.h
+++ b/engines/mads/forest/game_forest.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_GAME_FOREST_H
#define MADS_GAME_FOREST_H
@@ -29,7 +27,6 @@
#include "mads/forest/globals_forest.h"
namespace MADS {
-
namespace Forest {
// TODO: Adapt for Forest's difficulty setting
@@ -103,9 +100,6 @@ typedef Section1Handler Section7Handler;
typedef Section1Handler Section8Handler;
} // End of namespace Forest
-
} // End of namespace MADS
-#endif /* MADS_GAME_FOREST_H */
-
#endif
diff --git a/engines/mads/forest/globals_forest.cpp b/engines/mads/forest/globals_forest.cpp
index 46f49417aaa..5bb92c104a4 100644
--- a/engines/mads/forest/globals_forest.cpp
+++ b/engines/mads/forest/globals_forest.cpp
@@ -19,12 +19,9 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/forest/globals_forest.h"
namespace MADS {
-
namespace Forest {
ForestGlobals::ForestGlobals()
@@ -44,9 +41,5 @@ void ForestGlobals::synchronize(Common::Serializer &s) {
_animationIndexes.synchronize(s);
}
-
} // End of namespace Forest
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/forest/globals_forest.h b/engines/mads/forest/globals_forest.h
index 8032e5ba8fa..a67de5df2e5 100644
--- a/engines/mads/forest/globals_forest.h
+++ b/engines/mads/forest/globals_forest.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_GLOBALS_FOREST_H
#define MADS_GLOBALS_FOREST_H
@@ -28,7 +26,6 @@
#include "mads/resources.h"
namespace MADS {
-
namespace Forest {
enum GlobalId {
@@ -56,9 +53,6 @@ public:
};
} // End of namespace Forest
-
} // End of namespace MADS
-#endif /* MADS_GLOBALS_FOREST_H */
-
#endif
diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp
index ab22096b256..aa00f1d5c44 100644
--- a/engines/mads/phantom/game_phantom.cpp
+++ b/engines/mads/phantom/game_phantom.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/mads.h"
#include "mads/game.h"
#include "mads/screen.h"
@@ -31,7 +29,6 @@
#include "mads/phantom/phantom_scenes.h"
namespace MADS {
-
namespace Phantom {
Catacombs _easyCatacombs[32] = {
@@ -943,7 +940,4 @@ void GamePhantom::newCatacombRoom(int toRoom, int fromExit) {
}
} // End of namespace Phantom
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/game_phantom.h b/engines/mads/phantom/game_phantom.h
index 07546bd31d8..84d292ebc20 100644
--- a/engines/mads/phantom/game_phantom.h
+++ b/engines/mads/phantom/game_phantom.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_GAME_PHANTOM_H
#define MADS_GAME_PHANTOM_H
@@ -29,7 +27,6 @@
#include "mads/phantom/globals_phantom.h"
namespace MADS {
-
namespace Phantom {
enum Difficulty {
@@ -148,9 +145,6 @@ typedef Section1Handler Section4Handler;
typedef Section1Handler Section5Handler;
} // End of namespace Nebular
-
} // End of namespace MADS
-#endif /* MADS_GAME_PHANTOM_H */
-
#endif
diff --git a/engines/mads/phantom/globals_phantom.cpp b/engines/mads/phantom/globals_phantom.cpp
index 3a144cad041..ff357cf7db2 100644
--- a/engines/mads/phantom/globals_phantom.cpp
+++ b/engines/mads/phantom/globals_phantom.cpp
@@ -19,12 +19,9 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/phantom/globals_phantom.h"
namespace MADS {
-
namespace Phantom {
PhantomGlobals::PhantomGlobals() : Globals() {
@@ -45,7 +42,4 @@ void PhantomGlobals::synchronize(Common::Serializer &s) {
} // End of namespace Phantom
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/globals_phantom.h b/engines/mads/phantom/globals_phantom.h
index c2677769b6e..5a40f546465 100644
--- a/engines/mads/phantom/globals_phantom.h
+++ b/engines/mads/phantom/globals_phantom.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_GLOBALS_PHANTOM_H
#define MADS_GLOBALS_PHANTOM_H
@@ -28,7 +26,6 @@
#include "mads/resources.h"
namespace MADS {
-
namespace Phantom {
enum GlobalId {
@@ -148,9 +145,6 @@ public:
};
} // End of namespace Phantom
-
} // End of namespace MADS
-#endif /* MADS_GLOBALS_PHANTOM_H */
-
#endif
diff --git a/engines/mads/phantom/phantom_scenes.cpp b/engines/mads/phantom/phantom_scenes.cpp
index ef4c2145a07..71cfdb0fb0b 100644
--- a/engines/mads/phantom/phantom_scenes.cpp
+++ b/engines/mads/phantom/phantom_scenes.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "common/config-manager.h"
#include "mads/mads.h"
#include "mads/compression.h"
@@ -35,7 +33,6 @@
#include "mads/phantom/phantom_scenes5.h"
namespace MADS {
-
namespace Phantom {
SceneLogic *SceneFactory::createScene(MADSEngine *vm) {
@@ -209,7 +206,4 @@ void SceneInfoPhantom::loadCodes(BaseSurface &depthSurface, Common::SeekableRead
}
} // End of namespace Phantom
-
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h
index 506ebd9003f..05e0f911804 100644
--- a/engines/mads/phantom/phantom_scenes.h
+++ b/engines/mads/phantom/phantom_scenes.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_PHANTOM_SCENES_H
#define MADS_PHANTOM_SCENES_H
@@ -28,9 +26,7 @@
#include "mads/phantom/game_phantom.h"
//#include "mads/phantom/globals_phantom.h"
-
namespace MADS {
-
namespace Phantom {
enum Verb {
@@ -486,6 +482,4 @@ protected:
} // End of namespace Phantom
} // End of namespace MADS
-#endif /* MADS_PHANTOM_SCENES_H */
-
#endif
diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp
index c6c0931e2a9..b3938fd0c9a 100644
--- a/engines/mads/phantom/phantom_scenes1.cpp
+++ b/engines/mads/phantom/phantom_scenes1.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/mads.h"
#include "mads/conversations.h"
#include "mads/scene.h"
@@ -28,7 +26,6 @@
#include "mads/phantom/phantom_scenes1.h"
namespace MADS {
-
namespace Phantom {
void Scene1xx::setAAName() {
@@ -9575,5 +9572,3 @@ void Scene150::preActions() {
} // End of namespace Phantom
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/phantom_scenes1.h b/engines/mads/phantom/phantom_scenes1.h
index b3b8f9a8925..49902f9635b 100644
--- a/engines/mads/phantom/phantom_scenes1.h
+++ b/engines/mads/phantom/phantom_scenes1.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_PHANTOM_SCENES1_H
#define MADS_PHANTOM_SCENES1_H
@@ -28,7 +26,6 @@
#include "mads/phantom/phantom_scenes.h"
namespace MADS {
-
namespace Phantom {
class Scene1xx : public PhantomScene {
@@ -413,9 +410,8 @@ public:
void preActions() override;
void actions() override;
};
+
} // End of namespace Phantom
} // End of namespace MADS
-#endif /* MADS_PHANTOM_SCENES1_H */
-
#endif
diff --git a/engines/mads/phantom/phantom_scenes2.cpp b/engines/mads/phantom/phantom_scenes2.cpp
index ea0c68e1bc2..f7514aabe79 100644
--- a/engines/mads/phantom/phantom_scenes2.cpp
+++ b/engines/mads/phantom/phantom_scenes2.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/mads.h"
#include "mads/conversations.h"
#include "mads/scene.h"
@@ -28,7 +26,6 @@
#include "mads/phantom/phantom_scenes2.h"
namespace MADS {
-
namespace Phantom {
void Scene2xx::setAAName() {
@@ -7074,5 +7071,3 @@ void Scene250::preActions() {
} // End of namespace Phantom
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/phantom_scenes2.h b/engines/mads/phantom/phantom_scenes2.h
index aca836c74b4..4083eff1b1c 100644
--- a/engines/mads/phantom/phantom_scenes2.h
+++ b/engines/mads/phantom/phantom_scenes2.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_PHANTOM_SCENES2_H
#define MADS_PHANTOM_SCENES2_H
@@ -28,7 +26,6 @@
#include "mads/phantom/phantom_scenes.h"
namespace MADS {
-
namespace Phantom {
class Scene2xx : public PhantomScene {
@@ -302,6 +299,4 @@ public:
} // End of namespace Phantom
} // End of namespace MADS
-#endif /* MADS_PHANTOM_SCENES2_H */
-
#endif
diff --git a/engines/mads/phantom/phantom_scenes3.cpp b/engines/mads/phantom/phantom_scenes3.cpp
index a4e2689e62a..be364dad9d8 100644
--- a/engines/mads/phantom/phantom_scenes3.cpp
+++ b/engines/mads/phantom/phantom_scenes3.cpp
@@ -19,15 +19,12 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/mads.h"
#include "mads/conversations.h"
#include "mads/phantom/phantom_scenes.h"
#include "mads/phantom/phantom_scenes3.h"
namespace MADS {
-
namespace Phantom {
void Scene3xx::setAAName() {
@@ -2776,5 +2773,3 @@ void Scene310::handleLakeAnimation() {
} // End of namespace Phantom
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/phantom_scenes3.h b/engines/mads/phantom/phantom_scenes3.h
index 30c7a20ae08..7198370d366 100644
--- a/engines/mads/phantom/phantom_scenes3.h
+++ b/engines/mads/phantom/phantom_scenes3.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_PHANTOM_SCENES3_H
#define MADS_PHANTOM_SCENES3_H
@@ -28,7 +26,6 @@
#include "mads/phantom/phantom_scenes.h"
namespace MADS {
-
namespace Phantom {
class Scene3xx : public PhantomScene {
@@ -240,9 +237,8 @@ public:
void preActions() override;
void actions() override;
};
+
} // End of namespace Phantom
} // End of namespace MADS
-#endif /* MADS_PHANTOM_SCENES3_H */
-
#endif
diff --git a/engines/mads/phantom/phantom_scenes4.cpp b/engines/mads/phantom/phantom_scenes4.cpp
index 3f335bf2b59..d085a5fc610 100644
--- a/engines/mads/phantom/phantom_scenes4.cpp
+++ b/engines/mads/phantom/phantom_scenes4.cpp
@@ -19,15 +19,12 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/mads.h"
#include "mads/conversations.h"
#include "mads/phantom/phantom_scenes.h"
#include "mads/phantom/phantom_scenes4.h"
namespace MADS {
-
namespace Phantom {
void Scene4xx::setAAName() {
@@ -4974,5 +4971,3 @@ void Scene456::preActions() {
} // End of namespace Phantom
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/phantom_scenes4.h b/engines/mads/phantom/phantom_scenes4.h
index a8d20a64d22..908955a3137 100644
--- a/engines/mads/phantom/phantom_scenes4.h
+++ b/engines/mads/phantom/phantom_scenes4.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_PHANTOM_SCENES4_H
#define MADS_PHANTOM_SCENES4_H
@@ -28,7 +26,6 @@
#include "mads/phantom/phantom_scenes.h"
namespace MADS {
-
namespace Phantom {
class Scene4xx : public PhantomScene {
@@ -257,9 +254,8 @@ public:
void preActions() override;
void actions() override;
};
+
} // End of namespace Phantom
} // End of namespace MADS
-#endif /* MADS_PHANTOM_SCENES4_H */
-
#endif
diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp
index ab209c263ae..f802e95b304 100644
--- a/engines/mads/phantom/phantom_scenes5.cpp
+++ b/engines/mads/phantom/phantom_scenes5.cpp
@@ -19,15 +19,12 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#include "mads/mads.h"
#include "mads/conversations.h"
#include "mads/phantom/phantom_scenes.h"
#include "mads/phantom/phantom_scenes5.h"
namespace MADS {
-
namespace Phantom {
void Scene5xx::setAAName() {
@@ -4317,5 +4314,3 @@ void Scene506::preActions() {
} // End of namespace Phantom
} // End of namespace MADS
-
-#endif
diff --git a/engines/mads/phantom/phantom_scenes5.h b/engines/mads/phantom/phantom_scenes5.h
index 13c49a3107e..8ccc76be0e2 100644
--- a/engines/mads/phantom/phantom_scenes5.h
+++ b/engines/mads/phantom/phantom_scenes5.h
@@ -19,8 +19,6 @@
*
*/
-#ifdef ENABLE_MADSV2
-
#ifndef MADS_PHANTOM_SCENES5_H
#define MADS_PHANTOM_SCENES5_H
@@ -28,7 +26,6 @@
#include "mads/phantom/phantom_scenes.h"
namespace MADS {
-
namespace Phantom {
class Scene5xx : public PhantomScene {
@@ -214,6 +211,4 @@ public:
} // End of namespace Phantom
} // End of namespace MADS
-#endif /* MADS_PHANTOM_SCENES5_H */
-
#endif
More information about the Scummvm-git-logs
mailing list