diff options
| author | Strangerke | 2011-10-20 23:51:19 +0200 |
|---|---|---|
| committer | Strangerke | 2011-10-20 23:51:19 +0200 |
| commit | eb8aee13357c8eb556b1d4b0c37ef2b804ff0b80 (patch) | |
| tree | 87ab149e9f89289b9de68405785d05c4a0a8fa98 | |
| parent | 200ef0d51e1483b69b8f20acdfb7f713dbfbeca1 (diff) | |
| download | scummvm-rg350-eb8aee13357c8eb556b1d4b0c37ef2b804ff0b80.tar.gz scummvm-rg350-eb8aee13357c8eb556b1d4b0c37ef2b804ff0b80.tar.bz2 scummvm-rg350-eb8aee13357c8eb556b1d4b0c37ef2b804ff0b80.zip | |
TSAGE: Blue Force - Some more renaming, fix a bug in scene 910
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes9.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index 45e9d0fc34..1749f19fe1 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -797,7 +797,7 @@ bool Scene910::Object1::startAction(CursorType action, Event &event) { } else { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9130; - if (BF_GLOBALS.getFlag(8)) + if (BF_GLOBALS.getFlag(gunDrawn)) setAction(&scene->_sequenceManager1, scene, 9138, &BF_GLOBALS._player, &scene->_lyle, NULL); else setAction(&scene->_sequenceManager1, scene, 9130, &BF_GLOBALS._player, &scene->_lyle, NULL); @@ -839,7 +839,7 @@ bool Scene910::Object2::startAction(CursorType action, Event &event) { case 1: if (BF_GLOBALS._v4CEE2 > 1) { if (BF_GLOBALS._v4CEE2 != 4) { - if ((BF_GLOBALS.getFlag(8)) && (BF_GLOBALS.getFlag(25)) && (BF_GLOBALS.getHasBullets())) { + if ((BF_GLOBALS.getFlag(gunDrawn)) && (BF_GLOBALS.getFlag(25)) && (BF_GLOBALS.getHasBullets())) { if (scene->_field2DE0 == 0) { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9126; @@ -860,7 +860,7 @@ bool Scene910::Object2::startAction(CursorType action, Event &event) { return true; } } else { - if ((BF_GLOBALS.getFlag(8)) && (BF_GLOBALS.getFlag(25)) && (BF_GLOBALS.getHasBullets())) { + if ((BF_GLOBALS.getFlag(gunDrawn)) && (BF_GLOBALS.getFlag(25)) && (BF_GLOBALS.getHasBullets())) { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9125; scene->setAction(&scene->_sequenceManager1, scene, 9125, &scene->_nico, NULL); @@ -958,7 +958,7 @@ bool Scene910::Object3::startAction(CursorType action, Event &event) { return true; break; case 1: - if ((BF_GLOBALS.getFlag(8)) && (BF_GLOBALS.getFlag(25)) && (BF_GLOBALS.getHasBullets())){ + if ((BF_GLOBALS.getFlag(gunDrawn)) && (BF_GLOBALS.getFlag(25)) && (BF_GLOBALS.getHasBullets())){ BF_GLOBALS._player.disableControl(); if (BF_GLOBALS._v4CEE4 == 2) { scene->_sceneMode = 9132; @@ -1832,9 +1832,10 @@ bool Scene910::Item1::startAction(CursorType action, Event &event) { } else { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9103; - if (BF_GLOBALS.getFlag(8)) + if (BF_GLOBALS.getFlag(gunDrawn)) { + scene->_sceneMode = 9123; scene->setAction(&scene->_sequenceManager1, scene, 9123, &BF_GLOBALS._player, NULL); - else + } else scene->setAction(&scene->_sequenceManager1, scene, 9103, &BF_GLOBALS._player, NULL); } return true; @@ -2114,7 +2115,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) { BF_GLOBALS._walkRegions.proc1(16); BF_GLOBALS._walkRegions.proc1(14); BF_GLOBALS._walkRegions.proc1(10); - if (BF_GLOBALS.getFlag(8)) { + if (BF_GLOBALS.getFlag(gunDrawn)) { BF_GLOBALS._player.setVisage(1911); BF_GLOBALS._player.animate(ANIM_MODE_NONE, 0, NULL); BF_GLOBALS._player.setFrame(7); |