diff options
Diffstat (limited to 'engines/saga')
-rw-r--r-- | engines/saga/game.cpp | 5 | ||||
-rw-r--r-- | engines/saga/gfx.cpp | 4 | ||||
-rw-r--r-- | engines/saga/gfx.h | 2 | ||||
-rw-r--r-- | engines/saga/saga.cpp | 10 | ||||
-rw-r--r-- | engines/saga/saga.h | 6 |
5 files changed, 11 insertions, 16 deletions
diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp index 4154173f33..10c009b8f1 100644 --- a/engines/saga/game.cpp +++ b/engines/saga/game.cpp @@ -31,7 +31,6 @@ #include "common/hashmap.h" #include "common/config-manager.h" #include "base/plugins.h" -#include "base/gameDetector.h" #include "backends/fs/fs.h" #include "saga/rscfile.h" @@ -84,8 +83,8 @@ DetectedGameList Engine_SAGA_detectGames(const FSList &fslist) { return Saga::GAME_detectGames(fslist); } -Engine *Engine_SAGA_create(GameDetector *detector, OSystem *syst) { - return new Saga::SagaEngine(detector, syst); +Engine *Engine_SAGA_create(OSystem *syst) { + return new Saga::SagaEngine(syst); } REGISTER_PLUGIN(SAGA, "SAGA Engine"); diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp index cdb445df8d..940eb01927 100644 --- a/engines/saga/gfx.cpp +++ b/engines/saga/gfx.cpp @@ -36,9 +36,9 @@ namespace Saga { -Gfx::Gfx(SagaEngine *vm, OSystem *system, int width, int height, GameDetector &detector) : _vm(vm), _system(system) { +Gfx::Gfx(SagaEngine *vm, OSystem *system, int width, int height) : _vm(vm), _system(system) { _system->beginGFXTransaction(); - _vm->initCommonGFX(detector, (width > 320)); + _vm->initCommonGFX(width > 320); _system->initSize(width, height); _system->endGFXTransaction(); diff --git a/engines/saga/gfx.h b/engines/saga/gfx.h index ff96cbf081..2c0f4df600 100644 --- a/engines/saga/gfx.h +++ b/engines/saga/gfx.h @@ -134,7 +134,7 @@ class SagaEngine; class Gfx { public: - Gfx(SagaEngine *vm, OSystem *system, int width, int height, GameDetector &detector); + Gfx(SagaEngine *vm, OSystem *system, int width, int height); ~Gfx(); Surface *getBackBuffer() { return &_backBuffer; diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index f0d4184f64..2a8f0e1802 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -23,7 +23,6 @@ */ #include "common/stdafx.h" -#include "base/gameDetector.h" #include "common/file.h" #include "common/config-manager.h" @@ -58,9 +57,8 @@ namespace Saga { #define MAX_TIME_DELTA 100 -SagaEngine::SagaEngine(GameDetector *detector, OSystem *syst) - : Engine(syst), - _targetName(detector->_targetName) { +SagaEngine::SagaEngine(OSystem *syst) + : Engine(syst) { _leftMouseButtonPressed = _rightMouseButtonPressed = false; @@ -148,7 +146,7 @@ void SagaEngine::errorString(const char *buf1, char *buf2) { strcpy(buf2, buf1); } -int SagaEngine::init(GameDetector &detector) { +int SagaEngine::init() { _soundVolume = ConfMan.getInt("sfx_volume") / 25; _musicVolume = ConfMan.getInt("music_volume") / 25; _subtitlesEnabled = ConfMan.getBool("subtitles"); @@ -186,7 +184,7 @@ int SagaEngine::init(GameDetector &detector) { _previousTicks = _system->getMillis(); // Initialize graphics - _gfx = new Gfx(this, _system, getDisplayWidth(), getDisplayHeight(), detector); + _gfx = new Gfx(this, _system, getDisplayWidth(), getDisplayHeight()); // Graphics driver should be initialized before console _console = new Console(this); diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 0ba23b4948..450b21ec71 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -573,9 +573,9 @@ class SagaEngine : public Engine { protected: int go(); - int init(GameDetector &detector); + int init(); public: - SagaEngine(GameDetector * detector, OSystem * syst); + SagaEngine(OSystem *syst); virtual ~SagaEngine(); void shutDown() { _quit = true; } @@ -666,8 +666,6 @@ public: } private: - Common::String _targetName; - uint _saveFilesMaxCount; uint _saveFilesCount; SaveFileData _saveFiles[MAX_SAVES]; |