[Scummvm-git-logs] scummvm master -> ae6b0cfdefec82f31c123656261ecb90c0ac1546
bgK
bastien.bouclet at gmail.com
Tue May 1 12:49:12 CEST 2018
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
eedb53207d AVALANCHE: Push down AD includes
dc96d43717 CGE2: Push down the AD includes
779f2f549a CRYO: Push down the AD includes
91c8f2df7d FULLPIPE: Remove useless AD include
42e4283b4b MORTEVIELLE: Push down the AD includes
30c20f2d3c PLUMBERS: Push down the AD includes
ff4498bda3 PRINCE: Push down the AD includes
e866543c82 SAGA: Remove useless AD includes
ae6b0cfdef WINTERMUTE: Push down the AD includes
Commit: eedb53207da3a44a587e60941b6bfda3347219a7
https://github.com/scummvm/scummvm/commit/eedb53207da3a44a587e60941b6bfda3347219a7
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
AVALANCHE: Push down AD includes
Changed paths:
engines/avalanche/avalanche.cpp
engines/avalanche/avalanche.h
engines/avalanche/detection.cpp
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 29fb082..303fb0c 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -57,7 +57,6 @@ AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription *
_help = nullptr;
_highscore = nullptr;
- _platform = gd->desc.platform;
initVariables();
}
@@ -179,10 +178,6 @@ GUI::Debugger *AvalancheEngine::getDebugger() {
return _console;
}
-Common::Platform AvalancheEngine::getPlatform() const {
- return _platform;
-}
-
bool AvalancheEngine::hasFeature(EngineFeature f) const {
return (f == kSupportsSavingDuringRuntime) || (f == kSupportsLoadingDuringRuntime);
}
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 6eb5e67..d50373b 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -48,10 +48,10 @@
#include "avalanche/mainmenu.h"
#include "avalanche/highscore.h"
+#include "common/error.h"
#include "common/serializer.h"
#include "engines/engine.h"
-#include "engines/advancedDetector.h"
#include "graphics/cursorman.h"
@@ -61,9 +61,7 @@ class RandomSource;
namespace Avalanche {
-struct AvalancheGameDescription {
- ADGameDescription desc;
-};
+struct AvalancheGameDescription;
static const int kSavegameVersion = 2;
@@ -132,7 +130,6 @@ protected:
private:
AvalancheConsole *_console;
- Common::Platform _platform;
public:
// For Thinkabout:
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 64634dc..7f3d4f8 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -35,6 +35,10 @@
namespace Avalanche {
+struct AvalancheGameDescription {
+ ADGameDescription desc;
+};
+
uint32 AvalancheEngine::getFeatures() const {
return _gameDescription->desc.flags;
}
@@ -43,6 +47,10 @@ const char *AvalancheEngine::getGameId() const {
return _gameDescription->desc.gameId;
}
+Common::Platform AvalancheEngine::getPlatform() const {
+ return _gameDescription->desc.platform;
+}
+
static const PlainGameDescriptor avalancheGames[] = {
{"avalanche", "Lord Avalot d'Argent"},
{0, 0}
Commit: dc96d437178af5064b4a3aab03b5d2107a78afba
https://github.com/scummvm/scummvm/commit/dc96d437178af5064b4a3aab03b5d2107a78afba
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
CGE2: Push down the AD includes
Changed paths:
engines/cge2/cge2.h
engines/cge2/events.cpp
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index 899520c..381d42b 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -32,12 +32,13 @@
#include "common/savefile.h"
#include "common/serializer.h"
#include "engines/engine.h"
-#include "engines/advancedDetector.h"
#include "common/system.h"
#include "cge2/fileio.h"
#include "cge2/console.h"
#include "audio/mixer.h"
+struct ADGameDescription;
+
namespace CGE2 {
class Vga;
diff --git a/engines/cge2/events.cpp b/engines/cge2/events.cpp
index 2dac04a..b5c4527 100644
--- a/engines/cge2/events.cpp
+++ b/engines/cge2/events.cpp
@@ -29,7 +29,6 @@
#include "common/config-manager.h"
#include "common/events.h"
#include "common/translation.h"
-#include "engines/advancedDetector.h"
#include "cge2/events.h"
#include "cge2/text.h"
#include "cge2/cge2_main.h"
Commit: 779f2f549ae44597643be6cac9f6da0455f39530
https://github.com/scummvm/scummvm/commit/779f2f549ae44597643be6cac9f6da0455f39530
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
CRYO: Push down the AD includes
Changed paths:
engines/cryo/cryo.h
engines/cryo/eden.cpp
diff --git a/engines/cryo/cryo.h b/engines/cryo/cryo.h
index 515849f..9a8bc91 100644
--- a/engines/cryo/cryo.h
+++ b/engines/cryo/cryo.h
@@ -25,7 +25,6 @@
#include "common/scummsys.h"
#include "common/config-manager.h"
-#include "engines/advancedDetector.h"
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/error.h"
@@ -39,6 +38,8 @@
#include "cryo/video.h"
#include "cryo/debugger.h"
+struct ADGameDescription;
+
namespace Cryo {
class Console;
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 7ea2314..c4a76a4 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -26,7 +26,6 @@
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/error.h"
-#include "gui/EventRecorder.h"
#include "common/file.h"
#include "common/savefile.h"
#include "common/fs.h"
Commit: 91c8f2df7dfc86b88af802f3085ba2dc9d647569
https://github.com/scummvm/scummvm/commit/91c8f2df7dfc86b88af802f3085ba2dc9d647569
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
FULLPIPE: Remove useless AD include
Changed paths:
engines/fullpipe/modal.cpp
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 45ccabc..80fa329 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -36,7 +36,6 @@
#include "graphics/surface.h"
#include "engines/savestate.h"
-#include "engines/advancedDetector.h"
namespace Fullpipe {
Commit: 42e4283b4b9ac45f64a920cc5079229910947bb7
https://github.com/scummvm/scummvm/commit/42e4283b4b9ac45f64a920cc5079229910947bb7
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
MORTEVIELLE: Push down the AD includes
Changed paths:
engines/mortevielle/mortevielle.h
engines/mortevielle/saveload.h
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 42d70fc..5d00547 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -33,7 +33,6 @@
#include "common/random.h"
#include "common/rect.h"
#include "common/stack.h"
-#include "engines/advancedDetector.h"
#include "engines/engine.h"
#include "common/error.h"
#include "graphics/surface.h"
diff --git a/engines/mortevielle/saveload.h b/engines/mortevielle/saveload.h
index b401823..18042d9 100644
--- a/engines/mortevielle/saveload.h
+++ b/engines/mortevielle/saveload.h
@@ -33,6 +33,7 @@
#include "graphics/palette.h"
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
+#include "engines/savestate.h"
#define SAVEGAME_VERSION 1
Commit: 30c20f2d3c1ae4fc6f73b8b89b37623c1fcacaf2
https://github.com/scummvm/scummvm/commit/30c20f2d3c1ae4fc6f73b8b89b37623c1fcacaf2
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
PLUMBERS: Push down the AD includes
Changed paths:
engines/plumbers/plumbers.h
diff --git a/engines/plumbers/plumbers.h b/engines/plumbers/plumbers.h
index 56b27fb..5dbb337 100644
--- a/engines/plumbers/plumbers.h
+++ b/engines/plumbers/plumbers.h
@@ -25,7 +25,6 @@
#include "common/scummsys.h"
#include "common/config-manager.h"
-#include "engines/advancedDetector.h"
#include "common/error.h"
#include "engines/engine.h"
@@ -44,6 +43,8 @@
#include "plumbers/console.h"
+struct ADGameDescription;
+
namespace Plumbers {
enum PlumbersDebugChannels {
kDebugGeneral = 1 << 0
Commit: ff4498bda3c84b21e3d4b0d6cd1113510cba4233
https://github.com/scummvm/scummvm/commit/ff4498bda3c84b21e3d4b0d6cd1113510cba4233
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
PRINCE: Push down the AD includes
Changed paths:
engines/prince/detection.cpp
engines/prince/prince.h
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index 21bd55e..e382346 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -21,9 +21,15 @@
*/
#include "prince/prince.h"
+#include "engines/advancedDetector.h"
namespace Prince {
+struct PrinceGameDescription {
+ ADGameDescription desc;
+ PrinceGameType gameType;
+};
+
int PrinceEngine::getGameType() const {
return _gameDescription->gameType;
}
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index c264125..8ff71db 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -38,7 +38,6 @@
#include "gui/debugger.h"
-#include "engines/advancedDetector.h"
#include "engines/engine.h"
#include "engines/util.h"
@@ -58,14 +57,10 @@ enum PrinceGameType {
kPrinceDataPL
};
-struct PrinceGameDescription {
- ADGameDescription desc;
- PrinceGameType gameType;
-};
-
struct SavegameHeader;
class PrinceEngine;
+struct PrinceGameDescription;
class GraphicsMan;
class Script;
class Interpreter;
Commit: e866543c82ba8eb94ff2b1d764b0afc3a61bd3d3
https://github.com/scummvm/scummvm/commit/e866543c82ba8eb94ff2b1d764b0afc3a61bd3d3
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
SAGA: Remove useless AD includes
Changed paths:
engines/saga/resource_hrs.cpp
engines/saga/resource_res.cpp
diff --git a/engines/saga/resource_hrs.cpp b/engines/saga/resource_hrs.cpp
index ba58830..9257f65 100644
--- a/engines/saga/resource_hrs.cpp
+++ b/engines/saga/resource_hrs.cpp
@@ -34,7 +34,6 @@
#include "saga/scene.h"
#include "saga/sndres.h"
-#include "engines/advancedDetector.h"
#include "common/endian.h"
namespace Saga {
diff --git a/engines/saga/resource_res.cpp b/engines/saga/resource_res.cpp
index d57238b..a2822f8 100644
--- a/engines/saga/resource_res.cpp
+++ b/engines/saga/resource_res.cpp
@@ -32,8 +32,6 @@
#include "saga/scene.h"
#include "saga/sndres.h"
-#include "engines/advancedDetector.h"
-
namespace Saga {
#ifdef ENABLE_IHNM
Commit: ae6b0cfdefec82f31c123656261ecb90c0ac1546
https://github.com/scummvm/scummvm/commit/ae6b0cfdefec82f31c123656261ecb90c0ac1546
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-01T12:48:05+02:00
Commit Message:
WINTERMUTE: Push down the AD includes
Changed paths:
engines/wintermute/base/base_engine.h
engines/wintermute/detection.cpp
engines/wintermute/game_description.h
engines/wintermute/wintermute.cpp
engines/wintermute/wintermute.h
diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h
index cbf5d92..905d227 100644
--- a/engines/wintermute/base/base_engine.h
+++ b/engines/wintermute/base/base_engine.h
@@ -34,10 +34,24 @@
#include "common/random.h"
#include "common/language.h"
-#include "engines/wintermute/game_description.h"
-
namespace Wintermute {
+enum WMETargetExecutable {
+ OLDEST_VERSION,
+ WME_1_0_0,
+ WME_1_1_0,
+ WME_1_2_0,
+ WME_1_3_0,
+ WME_1_4_0,
+ WME_1_5_0,
+ WME_1_6_0,
+ WME_1_7_0,
+ WME_1_8_0,
+ WME_1_8_6,
+ WME_1_9_0,
+ LATEST_VERSION
+};
+
class BaseFileManager;
class BaseRegistry;
class BaseGame;
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index 9ccb75d..df5cc41 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -22,6 +22,7 @@
#include "engines/advancedDetector.h"
#include "engines/wintermute/wintermute.h"
+#include "engines/wintermute/game_description.h"
#include "engines/wintermute/base/base_persistence_manager.h"
#include "common/config-manager.h"
diff --git a/engines/wintermute/game_description.h b/engines/wintermute/game_description.h
index 313fff8..92f62dd 100644
--- a/engines/wintermute/game_description.h
+++ b/engines/wintermute/game_description.h
@@ -24,25 +24,10 @@
#define WINTERMUTE_GAME_DESCRIPTION_H
#include "engines/advancedDetector.h"
+#include "engines/wintermute/base/base_engine.h"
namespace Wintermute {
-enum WMETargetExecutable {
- OLDEST_VERSION,
- WME_1_0_0,
- WME_1_1_0,
- WME_1_2_0,
- WME_1_3_0,
- WME_1_4_0,
- WME_1_5_0,
- WME_1_6_0,
- WME_1_7_0,
- WME_1_8_0,
- WME_1_8_6,
- WME_1_9_0,
- LATEST_VERSION
-};
-
struct WMEGameDescription {
ADGameDescription adDesc;
WMETargetExecutable targetExecutable;
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index e68004d..811ecce 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -33,6 +33,7 @@
#include "engines/util.h"
#include "engines/wintermute/ad/ad_game.h"
#include "engines/wintermute/wintermute.h"
+#include "engines/wintermute/game_description.h"
#include "engines/wintermute/debugger.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/base/base_engine.h"
diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index a8f9a18..346354e 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -24,9 +24,8 @@
#define WINTERMUTE_WINTERMUTE_H
#include "engines/engine.h"
-#include "engines/advancedDetector.h"
#include "gui/debugger.h"
-#include "engines/wintermute/game_description.h"
+#include "common/fs.h"
namespace Wintermute {
@@ -34,6 +33,7 @@ class Console;
class BaseGame;
class SystemClassRegistry;
class DebuggerController;
+struct WMEGameDescription;
// our engine debug channels
enum {
More information about the Scummvm-git-logs
mailing list