aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Bouclet2018-12-10 19:11:25 +0100
committerBastien Bouclet2018-12-10 19:11:25 +0100
commit10ff73e6e03a4b9117fd7035355ee28c2dffa4a4 (patch)
tree5d2f7f7bf8351b6a952b5763aa05b2bbd92d826a
parent0d1800b6052fb781d442591fab007f95b6515b08 (diff)
downloadscummvm-rg350-10ff73e6e03a4b9117fd7035355ee28c2dffa4a4.tar.gz
scummvm-rg350-10ff73e6e03a4b9117fd7035355ee28c2dffa4a4.tar.bz2
scummvm-rg350-10ff73e6e03a4b9117fd7035355ee28c2dffa4a4.zip
ILLUSIONS: Push down the advanced detector include
So the whole engine is not rebuilt when making changes to shared code.
-rw-r--r--engines/illusions/detection.cpp9
-rw-r--r--engines/illusions/illusions.h13
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp
index 3a9c77e845..024dea2641 100644
--- a/engines/illusions/detection.cpp
+++ b/engines/illusions/detection.cpp
@@ -40,6 +40,15 @@ static const PlainGameDescriptor illusionsGames[] = {
namespace Illusions {
+struct IllusionsGameDescription {
+ ADGameDescription desc;
+ int gameId;
+};
+
+int IllusionsEngine::getGameId() const {
+ return _gameDescription->gameId;
+}
+
static const IllusionsGameDescription gameDescriptions[] = {
{
{
diff --git a/engines/illusions/illusions.h b/engines/illusions/illusions.h
index 4140c9c4fb..8110c686a5 100644
--- a/engines/illusions/illusions.h
+++ b/engines/illusions/illusions.h
@@ -36,12 +36,9 @@
#include "common/system.h"
#include "common/winexe.h"
#include "common/winexe_pe.h"
-#include "engines/advancedDetector.h"
#include "engines/engine.h"
#include "graphics/surface.h"
-struct ADGameDescription;
-
namespace Illusions {
char *debugW2I(byte *wstr);
@@ -64,6 +61,7 @@ class Cursor;
class Dictionary;
struct Fader;
class FramesList;
+struct IllusionsGameDescription;
class Input;
class Screen;
class ScreenText;
@@ -84,11 +82,6 @@ enum {
kGameIdDuckman = 2
};
-struct IllusionsGameDescription {
- ADGameDescription desc;
- int gameId;
-};
-
class IllusionsEngine : public Engine {
public:
IllusionsEngine(OSystem *syst, const IllusionsGameDescription *gd);
@@ -153,9 +146,7 @@ public:
int16 _menuChoiceOfs;
- int getGameId() const {
- return _gameDescription->gameId;
- }
+ int getGameId() const;
void runUpdateFunctions();
int updateActors(uint flags);