diff options
author | Gregory Montoir | 2003-12-29 20:18:31 +0000 |
---|---|---|
committer | Gregory Montoir | 2003-12-29 20:18:31 +0000 |
commit | bd23a44f495e32aef7e920896848cc6ad3c4bb68 (patch) | |
tree | efa4110a178209a2e6f966f297c8229604fb1536 /queen/queen.cpp | |
parent | 865797cbeec0678a3042314875a0ea0f2c07994c (diff) | |
download | scummvm-rg350-bd23a44f495e32aef7e920896848cc6ad3c4bb68.tar.gz scummvm-rg350-bd23a44f495e32aef7e920896848cc6ad3c4bb68.tar.bz2 scummvm-rg350-bd23a44f495e32aef7e920896848cc6ad3c4bb68.zip |
cleanup & follow code conventions
svn-id: r12019
Diffstat (limited to 'queen/queen.cpp')
-rw-r--r-- | queen/queen.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index 07675f4795..41491a12ed 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -97,11 +97,10 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst) _debugLevel = ConfMan.getInt("debuglevel"); - _system->init_size(320, 200); + _system->init_size(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); } QueenEngine::~QueenEngine() { - _timer->removeTimerProc(&timerHandler); delete _bam; delete _resource; @@ -122,7 +121,6 @@ void QueenEngine::errorString(const char *buf1, char *buf2) { void QueenEngine::go() { - initialise(); _logic->registerDefaultSettings(); @@ -143,13 +141,11 @@ void QueenEngine::go() { if (_logic->currentRoom() == _logic->newRoom()) { _logic->newRoom(0); } - } - else { + } else { if (_logic->joeWalk() == JWM_EXECUTE) { _logic->joeWalk(JWM_NORMAL); _command->executeCurrentAction(); - } - else { + } else { // if (_command->parse()) { // _command->clear(true); // } @@ -161,7 +157,6 @@ void QueenEngine::go() { } void QueenEngine::initialise(void) { - _bam = new BamScene(this); _resource = new Resource(_gameDataPath, _system->get_savefile_manager(), getSavePath()); _command = new Command(this); @@ -178,13 +173,11 @@ void QueenEngine::initialise(void) { void QueenEngine::timerHandler(void *ptr) { - ((QueenEngine *)ptr)->gotTimerTick(); } void QueenEngine::gotTimerTick() { - _display->handleTimer(); } |