diff options
| author | Paul Gilbert | 2014-04-01 22:50:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-01 22:50:03 -0400 |
| commit | 0c1001fbf4c37379ec685b036e63d6d59055997a (patch) | |
| tree | ff9c1acb460af33d96802ab0f52b2960446289f5 | |
| parent | 87124b4380abf077a3c97f3997777228f7d825cf (diff) | |
| download | scummvm-rg350-0c1001fbf4c37379ec685b036e63d6d59055997a.tar.gz scummvm-rg350-0c1001fbf4c37379ec685b036e63d6d59055997a.tar.bz2 scummvm-rg350-0c1001fbf4c37379ec685b036e63d6d59055997a.zip | |
MADS: Minor variable renaming and remove incorrect variable set in scene loop
| -rw-r--r-- | engines/mads/game.cpp | 8 | ||||
| -rw-r--r-- | engines/mads/game.h | 2 | ||||
| -rw-r--r-- | engines/mads/scene.cpp | 2 | ||||
| -rw-r--r-- | engines/mads/screen.cpp | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp index fd0379972b..2b42080d35 100644 --- a/engines/mads/game.cpp +++ b/engines/mads/game.cpp @@ -57,7 +57,7 @@ Game::Game(MADSEngine *vm): _vm(vm), _surface(nullptr), _objects(vm), _vocabEmergency = false; _aaName = "*I0.AA"; _priorFrameTimer = 0; - _updateSceneFlag = false; + _anyEmergency = false; _triggerMode = KERNEL_TRIGGER_PARSER; _triggerSetupMode = KERNEL_TRIGGER_PARSER; _ticksExpiry = 0; @@ -256,11 +256,11 @@ void Game::sectionLoop() { _kernelMode = KERNEL_ACTIVE_CODE; _scene._roomChanged = false; - if ((_quoteEmergency || _vocabEmergency) && !_updateSceneFlag) { + if ((_quoteEmergency || _vocabEmergency) && !_anyEmergency) { _scene._currentSceneId = _scene._priorSceneId; - _updateSceneFlag = true; + _anyEmergency = true; } else { - _updateSceneFlag = false; + _anyEmergency = false; _scene.loop(); } diff --git a/engines/mads/game.h b/engines/mads/game.h index 4521ad68c1..54aef443a6 100644 --- a/engines/mads/game.h +++ b/engines/mads/game.h @@ -77,7 +77,7 @@ protected: Common::StringArray _quotes; bool _quoteEmergency; bool _vocabEmergency; - bool _updateSceneFlag; + bool _anyEmergency; /** * Constructor diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp index 21d09fb056..71e6873de5 100644 --- a/engines/mads/scene.cpp +++ b/engines/mads/scene.cpp @@ -263,8 +263,6 @@ bool Scene::getDepthHighBits(const Common::Point &pt) { } void Scene::loop() { - _nextSceneId = _currentSceneId; - while (!_vm->shouldQuit() && !_reloadSceneFlag && _nextSceneId == _currentSceneId) { // Handle drawing a game frame doFrame(); diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 0c78b0c8a1..8bb17d30a6 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -254,7 +254,7 @@ ScreenObjects::ScreenObjects(MADSEngine *vm) : _vm(vm) { _objectY = -1; _v8333C = false; _v832EC = 0; - _v7FECA = 0; + _v7FECA = true; _v7FED6 = 0; _v8332A = 0; _category = CAT_NONE; |