diff options
| author | Paul Gilbert | 2011-10-18 21:08:31 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-10-18 21:08:31 +1100 |
| commit | cd14dd3e0fd3e3fa9d4d6231c8ac97d51dd137ce (patch) | |
| tree | 6a232d2249e42ca5c69eb227b37156d073dc422b /engines/tsage | |
| parent | 2c5348dea3b89f1bd5bfcf071049c5f053720b8c (diff) | |
| download | scummvm-rg350-cd14dd3e0fd3e3fa9d4d6231c8ac97d51dd137ce.tar.gz scummvm-rg350-cd14dd3e0fd3e3fa9d4d6231c8ac97d51dd137ce.tar.bz2 scummvm-rg350-cd14dd3e0fd3e3fa9d4d6231c8ac97d51dd137ce.zip | |
TSAGE: Bugfix for using caravan key, and give item a proper name
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes4.cpp | 4 | ||||
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes5.cpp | 6 | ||||
| -rw-r--r-- | engines/tsage/events.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp index 6b7d2d5608..338b180c2c 100644 --- a/engines/tsage/blue_force/blueforce_scenes4.cpp +++ b/engines/tsage/blue_force/blueforce_scenes4.cpp @@ -1553,7 +1553,7 @@ void Scene450::postInit(SceneObjectList *OwnerList) { _pinBoy.setFrame(_pinBoy.getFrameCount()); BF_GLOBALS._sceneItems.push_back(&_pinBoy); } else if (!BF_GLOBALS.getFlag(fWithLyle) || !BF_GLOBALS.getFlag(fGivenNapkin) || - (BF_INVENTORY.getObjectScene(BF_ITEM_67) == 1)) { + (BF_INVENTORY.getObjectScene(INV_CARAVAN_KEY) == 1)) { _pinBoy.postInit(); _pinBoy.setVisage(463); _pinBoy.setPosition(Common::Point(138, 121)); @@ -1643,7 +1643,7 @@ void Scene450::signal() { break; case 4517: BF_GLOBALS.setFlag(gotTrailer450); - BF_INVENTORY.setObjectScene(BF_ITEM_67, 1); + BF_INVENTORY.setObjectScene(INV_CARAVAN_KEY, 1); _sceneMode = 4508; setAction(&_sequenceManager, this, 4508, &BF_GLOBALS._player, &_manager, &_door, NULL); break; diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp index bc73dd2eb3..d89dd24ecb 100644 --- a/engines/tsage/blue_force/blueforce_scenes5.cpp +++ b/engines/tsage/blue_force/blueforce_scenes5.cpp @@ -76,7 +76,7 @@ bool Scene550::Lyle::startAction(CursorType action, Event &event) { scene->_sceneMode = 5512; scene->setAction(&scene->_action1); } else { - scene->_sceneMode = BF_INVENTORY.getObjectScene(BF_ITEM_67) == 1 ? 5513 : 5512; + scene->_sceneMode = BF_INVENTORY.getObjectScene(INV_CARAVAN_KEY) == 1 ? 5513 : 5512; scene->setAction(&scene->_action1); } return true; @@ -101,8 +101,8 @@ bool Scene550::CaravanDoor::startAction(CursorType action, Event &event) { case CURSOR_USE: SceneItem::display2(550, 7); return true; - case BF_ITEM_67: - if ((BF_GLOBALS._dayNumber == 3) || !BF_GLOBALS.getFlag(fWithLyle)) + case INV_CARAVAN_KEY: + if ((BF_GLOBALS._dayNumber != 3) || !BF_GLOBALS.getFlag(fWithLyle)) SceneItem::display2(550, 33); else { BF_GLOBALS._player.disableControl(); diff --git a/engines/tsage/events.h b/engines/tsage/events.h index 0195b2fc7b..7e1b745521 100644 --- a/engines/tsage/events.h +++ b/engines/tsage/events.h @@ -80,7 +80,7 @@ enum CursorType { INV_9MM_BULLETS = 54, INV_SCHEDULE = 55, INV_GRENADES = 56, INV_YELLOW_CORD = 57, INV_HALF_YELLOW_CORD = 58, INV_BLACK_CORD = 59, INV_HALF_BLACK_CORD = 61, INV_WARRANT = 62, INV_JACKET = 63, INV_GREENS_KNIFE = 64, INV_DOG_WHISTLE = 65, INV_AMMO_BELT = 66, - BF_ITEM_67 = 67, BF_LAST_INVENT = 68, + INV_CARAVAN_KEY = 67, BF_LAST_INVENT = 68, // Cursors CURSOR_WALK = 0x100, CURSOR_LOOK = 0x200, CURSOR_700 = 700, CURSOR_USE = 0x400, CURSOR_TALK = 0x800, |