aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-02-12 01:42:34 +0000
committerMax Horn2006-02-12 01:42:34 +0000
commitbe068cf6f38be3e12ea0b12a6a9076f48c978138 (patch)
tree7e267024920fef6683a32fda9f98b103d2335cd1
parent24a5ba86a7a4ec4992cb81d6faca14198efc6d48 (diff)
downloadscummvm-rg350-be068cf6f38be3e12ea0b12a6a9076f48c978138.tar.gz
scummvm-rg350-be068cf6f38be3e12ea0b12a6a9076f48c978138.tar.bz2
scummvm-rg350-be068cf6f38be3e12ea0b12a6a9076f48c978138.zip
The GameDetector is no longer a required parameter for Engine constructors
svn-id: r20590
-rw-r--r--engines/lure/lure.cpp4
-rw-r--r--engines/lure/lure.h2
-rw-r--r--engines/queen/queen.cpp4
-rw-r--r--engines/queen/queen.h2
-rw-r--r--engines/simon/simon.cpp4
-rw-r--r--engines/simon/simon.h2
-rw-r--r--engines/sky/sky.cpp4
-rw-r--r--engines/sky/sky.h2
8 files changed, 12 insertions, 12 deletions
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 3adc27eea9..ae60261e5c 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -146,14 +146,14 @@ DetectedGameList Engine_LURE_detectGames(const FSList &fslist) {
}
Engine *Engine_LURE_create(GameDetector *detector, OSystem *system) {
- return new LureEngine(detector, system);
+ return new LureEngine(system);
}
REGISTER_PLUGIN(LURE, "Lure of the Temptress Engine")
namespace Lure {
-LureEngine::LureEngine(GameDetector *detector, OSystem *system): Engine(system) {
+LureEngine::LureEngine(OSystem *system): Engine(system) {
// Setup mixer
/*
if (!_mixer->isReady()) {
diff --git a/engines/lure/lure.h b/engines/lure/lure.h
index 0a923cb72b..489c45b893 100644
--- a/engines/lure/lure.h
+++ b/engines/lure/lure.h
@@ -55,7 +55,7 @@ private:
void detectGame();
public:
- LureEngine(GameDetector *detector, OSystem *system);
+ LureEngine(OSystem *system);
~LureEngine();
virtual int init(GameDetector &detector);
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index e6c6f39269..b1081cf839 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -128,14 +128,14 @@ DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) {
}
Engine *Engine_QUEEN_create(GameDetector *detector, OSystem *syst) {
- return new Queen::QueenEngine(detector, syst);
+ return new Queen::QueenEngine(syst);
}
REGISTER_PLUGIN(QUEEN, "Flight of the Amazon Queen")
namespace Queen {
-QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
+QueenEngine::QueenEngine(OSystem *syst)
: Engine(syst), _debugger(0) {
}
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index 91c657cf14..3b7f448ea0 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -80,7 +80,7 @@ class Walk;
class QueenEngine : public Engine {
public:
- QueenEngine(GameDetector *detector, OSystem *syst);
+ QueenEngine(OSystem *syst);
virtual ~QueenEngine();
BamScene *bam() const { return _bam; }
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 78d0eac221..e43f618fba 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -135,7 +135,7 @@ Engine *Engine_SIMON_create(GameDetector *detector, OSystem *syst) {
o++;
}
- return new Simon::SimonEngine(detector, syst);
+ return new Simon::SimonEngine(syst);
}
REGISTER_PLUGIN(SIMON, "Simon the Sorcerer")
@@ -252,7 +252,7 @@ static const GameSpecificSettings feeblefiles_settings = {
};
#endif
-SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
+SimonEngine::SimonEngine(OSystem *syst)
: Engine(syst), midi(syst) {
_vcPtr = 0;
_vc_get_out_of_code = 0;
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index 8fa27924b6..d61bedca77 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -437,7 +437,7 @@ protected:
byte _hebrew_char_widths[32];
public:
- SimonEngine(GameDetector *detector, OSystem *syst);
+ SimonEngine(OSystem *syst);
virtual ~SimonEngine();
protected:
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index af904097ed..d7eca3dc03 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -106,7 +106,7 @@ DetectedGameList Engine_SKY_detectGames(const FSList &fslist) {
}
Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst) {
- return new Sky::SkyEngine(detector, syst);
+ return new Sky::SkyEngine(syst);
}
REGISTER_PLUGIN(SKY, "Beneath a Steel Sky")
@@ -118,7 +118,7 @@ void *SkyEngine::_itemList[300];
SystemVars SkyEngine::_systemVars = {0, 0, 0, 0, 4316, 0, 0, false, false, false };
-SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
+SkyEngine::SkyEngine(OSystem *syst)
: Engine(syst), _fastMode(0), _debugger(0) {
}
diff --git a/engines/sky/sky.h b/engines/sky/sky.h
index 71dcfa533c..00f16a0ea6 100644
--- a/engines/sky/sky.h
+++ b/engines/sky/sky.h
@@ -78,7 +78,7 @@ protected:
Intro *_skyIntro;
public:
- SkyEngine(GameDetector *detector, OSystem *syst);
+ SkyEngine(OSystem *syst);
virtual ~SkyEngine();
static bool isDemo(void);