diff options
| author | Strangerke | 2013-10-27 16:59:38 +0100 |
|---|---|---|
| committer | Strangerke | 2013-10-27 16:59:38 +0100 |
| commit | 1e983cd8fc4e8368a7d98ec0db0b1d9f8a48ad74 (patch) | |
| tree | 732b5e024d8598a1bb09d7c778d0f7e5486ade40 /engines/tsage/ringworld2/ringworld2_scenes2.cpp | |
| parent | c145daf6254346d893b4b402a7b0ce7ac31f1d82 (diff) | |
| download | scummvm-rg350-1e983cd8fc4e8368a7d98ec0db0b1d9f8a48ad74.tar.gz scummvm-rg350-1e983cd8fc4e8368a7d98ec0db0b1d9f8a48ad74.tar.bz2 scummvm-rg350-1e983cd8fc4e8368a7d98ec0db0b1d9f8a48ad74.zip | |
TSAGE: Fix CID 1002397, 1002398, 1047257. Fix a bug in Scene3150::postInit()
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_scenes2.cpp')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes2.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index 510855b162..17dca69c45 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -1944,14 +1944,14 @@ bool Scene2450::CareTaker::startAction(CursorType action, Event &event) { if (action == CURSOR_TALK) { R2_GLOBALS._player.disableControl(); - if (R2_GLOBALS._v565AE < 3) { - ++R2_GLOBALS._v565AE; + if (R2_GLOBALS._stripModifier < 3) { + ++R2_GLOBALS._stripModifier; scene->_sceneMode = 20; R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS); if (R2_GLOBALS._player._characterIndex == R2_QUINN) - scene->_stripManager.start(699 + (R2_GLOBALS._v565AE * 2), scene); + scene->_stripManager.start(699 + (R2_GLOBALS._stripModifier * 2), scene); else - scene->_stripManager.start(700 + (R2_GLOBALS._v565AE * 2), scene); + scene->_stripManager.start(700 + (R2_GLOBALS._stripModifier * 2), scene); } return true; } else { @@ -2009,7 +2009,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player.disableControl(); switch (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex]) { case 1900: - R2_GLOBALS._v565AE = 0; + R2_GLOBALS._stripModifier = 0; R2_GLOBALS._player._characterScene[R2_QUINN] = 2450; R2_GLOBALS._player._characterScene[R2_SEEKER] = 2450; R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 2450; @@ -2145,14 +2145,14 @@ void Scene2450::signal() { g_globals->_sceneManager.changeScene(2000); break; case 20: - if (R2_GLOBALS._v565AE == 3) { + if (R2_GLOBALS._stripModifier == 3) { R2_GLOBALS._player.disableControl(); - R2_GLOBALS._v565AE = 4; + R2_GLOBALS._stripModifier = 4; _sceneMode = 2454; setAction(&_sequenceManager, this, 2454, &_careTaker, NULL); } else { R2_GLOBALS._player.enableControl(CURSOR_TALK); - if (R2_GLOBALS._v565AE < 4) + if (R2_GLOBALS._stripModifier < 4) R2_GLOBALS._player._canWalk = false; } break; |