diff options
author | Gregory Montoir | 2004-12-02 22:59:57 +0000 |
---|---|---|
committer | Gregory Montoir | 2004-12-02 22:59:57 +0000 |
commit | 5884c6735dc911fcf732b564324feebc4cf1c0cf (patch) | |
tree | fd8a175c13d2e82ce21b41a0654d457d72acf0b7 /queen/queen.cpp | |
parent | 891970cd767760cbb682319d3215786d4a651c08 (diff) | |
download | scummvm-rg350-5884c6735dc911fcf732b564324feebc4cf1c0cf.tar.gz scummvm-rg350-5884c6735dc911fcf732b564324feebc4cf1c0cf.tar.bz2 scummvm-rg350-5884c6735dc911fcf732b564324feebc4cf1c0cf.zip |
simplified palette handling
svn-id: r15971
Diffstat (limited to 'queen/queen.cpp')
-rw-r--r-- | queen/queen.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index 97c5e5b8b2..353c4b7cd5 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -314,17 +314,14 @@ int QueenEngine::go() { if (_logic->currentRoom() == _logic->newRoom()) { _logic->newRoom(0); } + } else if (_logic->joeWalk() == JWM_EXECUTE) { + _logic->joeWalk(JWM_NORMAL); + _command->executeCurrentAction(); } else { - if (_logic->joeWalk() == JWM_EXECUTE) { - _logic->joeWalk(JWM_NORMAL); - _command->executeCurrentAction(); - } else { - _logic->joeWalk(JWM_NORMAL); - update(true); - } + _logic->joeWalk(JWM_NORMAL); + update(true); } } - return 0; } |