diff options
| -rw-r--r-- | queen/queen.cpp | 7 | ||||
| -rw-r--r-- | queen/queen.h | 36 |
2 files changed, 15 insertions, 28 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index 7e3742f629..bdf434a888 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -102,12 +102,9 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst) _mixer->setVolume(ConfMan.getInt("sfx_volume")); - _debugMode = ConfMan.hasKey("debuglevel"); _debugLevel = ConfMan.getInt("debuglevel"); _detectname = detector->_game.detectname; - _fastMode = 0; - _system->init_size(320, 200); } @@ -188,9 +185,6 @@ void QueenEngine::roomChanged() { void QueenEngine::go() { - if (!_dump_file) - _dump_file = stdout; - initialise(); _logic->oldRoom(0); @@ -226,6 +220,7 @@ void QueenEngine::go() { } void QueenEngine::initialise(void) { + _resource = new Resource(_gameDataPath, _detectname, _system->get_savefile_manager(), getSavePath()); _input = new Input(_resource->getLanguage(), _system); _display = new Display(_resource->getLanguage(), _system, _input); diff --git a/queen/queen.h b/queen/queen.h index e3aa9e0039..213879bbf0 100644 --- a/queen/queen.h +++ b/queen/queen.h @@ -36,42 +36,34 @@ class Display; class Sound; class QueenEngine : public Engine { - void errorString(const char *buf_input, char *buf_output); -protected: - bool _quickLaunch; // set when starting with -x - - uint16 _debugMode; - int _numScreenUpdates; - - int _number_of_savegames; - - FILE *_dump_file; - - Graphics *_graphics; - Input *_input; - Resource *_resource; - Logic *_logic; - Display *_display; - Sound *_sound; - - const char *_detectname; // necessary for music - public: + QueenEngine(GameDetector *detector, OSystem *syst); virtual ~QueenEngine(); protected: - byte _fastMode; - void go(); + void errorString(const char *buf_input, char *buf_output); //! Called when we go from one room to another void roomChanged(); // SETUP_ROOM + void go(); + void initialise(); static void timerHandler(void *ptr); void gotTimerTick(); + + + Graphics *_graphics; + Input *_input; + Resource *_resource; + Logic *_logic; + Display *_display; + Sound *_sound; + + const char *_detectname; // necessary for music }; } // End of namespace Queen |