diff options
| author | Paul Gilbert | 2013-11-08 21:34:26 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-08 21:34:26 -0500 |
| commit | c65e8a31a3ca994bb2516b0ab100134cb25f4683 (patch) | |
| tree | 07d70e18f649897701c26962c1648987f29a9fc1 /engines/tsage/ringworld2/ringworld2_scenes3.cpp | |
| parent | 6682fd46ca2f960520c2d514c5cc40bdde685fdf (diff) | |
| download | scummvm-rg350-c65e8a31a3ca994bb2516b0ab100134cb25f4683.tar.gz scummvm-rg350-c65e8a31a3ca994bb2516b0ab100134cb25f4683.tar.bz2 scummvm-rg350-c65e8a31a3ca994bb2516b0ab100134cb25f4683.zip | |
TSAGE: Renamed globals used by R2R duct maze laser panels
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_scenes3.cpp')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 682a6074d9..1c70f5e6c3 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -685,8 +685,10 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { break; } default: - if ((R2_GLOBALS._v56AA0 == 1) && (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2000) && (R2_GLOBALS._player._oldCharacterScene[R2_QUINN] == 3100)) { - ++R2_GLOBALS._v56AA0; + if ((R2_GLOBALS._mirandaJailState == 1) && (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2000) + && (R2_GLOBALS._player._oldCharacterScene[R2_QUINN] == 3100)) { + // Moving story on to Miranda getting food delivered + ++R2_GLOBALS._mirandaJailState; _sceneMode = 3156; _guard.postInit(); _guard._effect = EFFECT_SHADED2; @@ -699,8 +701,8 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { setAction(&_sequenceManager, this, 3156, &R2_GLOBALS._player, &_guard, &_doorBars, &_foodTray, NULL); } else { - if ((R2_GLOBALS._v56AA0 != 1) && (R2_GLOBALS._v56AA0 != 2)) - ++R2_GLOBALS._v56AA0; + if ((R2_GLOBALS._mirandaJailState != 1) && (R2_GLOBALS._mirandaJailState != 2)) + ++R2_GLOBALS._mirandaJailState; R2_GLOBALS._player.setup(30, 3, 1); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); |