diff options
| author | Paul Gilbert | 2011-10-22 00:35:01 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-10-22 08:14:07 +1100 |
| commit | 5c0ba0f6e2ce78b8855f93cf1690026193e11254 (patch) | |
| tree | 7e70a95f504ae70bbfcb43fd20d12f6b138420b9 /engines | |
| parent | 7c8ab727c1ca9b6e51d9b1a7489c3e49819681e3 (diff) | |
| download | scummvm-rg350-5c0ba0f6e2ce78b8855f93cf1690026193e11254.tar.gz scummvm-rg350-5c0ba0f6e2ce78b8855f93cf1690026193e11254.tar.bz2 scummvm-rg350-5c0ba0f6e2ce78b8855f93cf1690026193e11254.zip | |
TSAGE: Bugfixes for arresting Green in BF Scene 355
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes3.cpp | 8 | ||||
| -rw-r--r-- | engines/tsage/globals.cpp | 4 | ||||
| -rw-r--r-- | engines/tsage/globals.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp index be26a16bdd..90f2ccdb52 100644 --- a/engines/tsage/blue_force/blueforce_scenes3.cpp +++ b/engines/tsage/blue_force/blueforce_scenes3.cpp @@ -3016,7 +3016,7 @@ bool Scene355::Green::startAction(CursorType action, Event &event) { BF_GLOBALS._player._regionBitList |= 0x10; BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9985; - scene->setAction(&scene->_sequenceManager, scene, 3357, &BF_GLOBALS._player, this, NULL); + scene->setAction(&scene->_sequenceManager, scene, 3557, &BF_GLOBALS._player, this, NULL); } return true; case CURSOR_TALK: @@ -3026,14 +3026,14 @@ bool Scene355::Green::startAction(CursorType action, Event &event) { } else if (BF_INVENTORY.getObjectScene(INV_HANDCUFFS) != 1) { return false; } else { - switch (BF_GLOBALS._v4CEC2) { + switch (BF_GLOBALS._greenDay5TalkCtr++) { case 0: scene->_stripManager.start(3565, scene); break; case 1: scene->_stripManager.start(3567, scene); break; - case 2: + default: scene->_stripManager.start(3571, scene); break; } @@ -3066,7 +3066,7 @@ bool Scene355::Green::startAction(CursorType action, Event &event) { } return true; case INV_HANDCUFFS: - if (BF_GLOBALS._v4CEC2 <= 1) + if (BF_GLOBALS._greenDay5TalkCtr <= 1) SceneItem::display2(355, 38); else { BF_GLOBALS._player.disableControl(); diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index 4c129f9274..f22405d0d4 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -197,7 +197,7 @@ void BlueForceGlobals::synchronize(Serializer &s) { s.syncAsSint16LE(_v4CEB6); s.syncAsSint16LE(_safeCombination); s.syncAsSint16LE(_v4CEC0); - s.syncAsSint16LE(_v4CEC2); + s.syncAsSint16LE(_greenDay5TalkCtr); s.syncAsSint16LE(_v4CEC4); s.syncAsSint16LE(_v4CEC8); s.syncAsSint16LE(_v4CECA); @@ -259,7 +259,7 @@ void BlueForceGlobals::reset() { _v4CEB6 = 0; _safeCombination = 0; _v4CEC0 = 0; - _v4CEC2 = 0; + _greenDay5TalkCtr = 0; _v4CEC4 = 0; _v4CEC8 = 1; _v4CECA = 0; diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 8edb082163..6740aa8a1f 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -175,7 +175,7 @@ public: int _v4CEB6; int _safeCombination; int _v4CEC0; - int _v4CEC2; + int _greenDay5TalkCtr; int _v4CEC4; int _v4CEC8; int _v4CECA; |