diff options
author | Max Horn | 2006-04-15 20:36:41 +0000 |
---|---|---|
committer | Max Horn | 2006-04-15 20:36:41 +0000 |
commit | 68cb7f52c8dd64ccfe8f28e847b530c8835175c3 (patch) | |
tree | 635011611fbc8592289b85c0b704d5a0cec057ea /engines/queen | |
parent | ad45318328e23b76e346414c62ef4c22d8ebe059 (diff) | |
download | scummvm-rg350-68cb7f52c8dd64ccfe8f28e847b530c8835175c3.tar.gz scummvm-rg350-68cb7f52c8dd64ccfe8f28e847b530c8835175c3.tar.bz2 scummvm-rg350-68cb7f52c8dd64ccfe8f28e847b530c8835175c3.zip |
- Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places
svn-id: r21916
Diffstat (limited to 'engines/queen')
-rw-r--r-- | engines/queen/queen.cpp | 7 | ||||
-rw-r--r-- | engines/queen/queen.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index d1219fb59e..c87ccd6695 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -24,7 +24,6 @@ #include "backends/fs/fs.h" -#include "base/gameDetector.h" #include "base/plugins.h" #include "common/config-manager.h" @@ -129,7 +128,7 @@ DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) { return detectedGames; } -Engine *Engine_QUEEN_create(GameDetector *detector, OSystem *syst) { +Engine *Engine_QUEEN_create(OSystem *syst) { return new Queen::QueenEngine(syst); } @@ -404,9 +403,9 @@ int QueenEngine::go() { return 0; } -int QueenEngine::init(GameDetector &detector) { +int QueenEngine::init() { _system->beginGFXTransaction(); - initCommonGFX(detector, false); + initCommonGFX(false); _system->initSize(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); _system->endGFXTransaction(); diff --git a/engines/queen/queen.h b/engines/queen/queen.h index 3b7f448ea0..2077f42a34 100644 --- a/engines/queen/queen.h +++ b/engines/queen/queen.h @@ -25,7 +25,6 @@ #include "base/engine.h" -class GameDetector; namespace Common { class InSaveFile; } @@ -136,7 +135,7 @@ protected: void errorString(const char *buf_input, char *buf_output); int go(); - int init(GameDetector &detector); + int init(); int _talkSpeed; |