diff options
-rw-r--r-- | engines/mads/nebular/nebular_scenes.h | 2 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes1.cpp | 16 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 20 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes3.cpp | 34 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes4.cpp | 38 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes5.cpp | 28 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes6.cpp | 28 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes7.cpp | 42 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes8.cpp | 22 |
9 files changed, 115 insertions, 115 deletions
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h index 516d58d30e..9f11291d37 100644 --- a/engines/mads/nebular/nebular_scenes.h +++ b/engines/mads/nebular/nebular_scenes.h @@ -1279,7 +1279,7 @@ enum Noun { NOUN_BIG_HEADS = 0x473, NOUN_INSTALL = 0x474, NOUN_LIFE_SUPPORT_MODULE = 0x475, - NOUN_REMOVE = 0x476, + //NOUN_REMOVE = 0x476, NOUN_LARGE_BLADE = 0x477, NOUN_SIDE_ENTRANCE = 0x478, NOUN_INDICATOR = 0x479, diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index bd99888ed2..b34fae42b0 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -206,7 +206,7 @@ void Scene101::enter() { _globals._sequenceIndexes[11] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[11], false, 3, 0, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[11], 17, 17); _scene->_hotspots.activate(NOUN_CHAIR, false); - _chairHotspotId = _scene->_dynamicHotspots.add(NOUN_CHAIR, 0x13F, -1, Common::Rect(159, 84, 159 + 33, 84 + 36)); + _chairHotspotId = _scene->_dynamicHotspots.add(NOUN_CHAIR, VERB_SIT_IN, -1, Common::Rect(159, 84, 159 + 33, 84 + 36)); if (_scene->_priorSceneId == 112) sayDang(); } else { @@ -394,7 +394,7 @@ void Scene101::actions() { _game._player._stepEnabled = true; _sittingFl = true; _scene->_hotspots.activate(71, false); - _chairHotspotId = _scene->_dynamicHotspots.add(71, 0x13F, -1, Common::Rect(159, 84, 159 + 33, 84 + 36)); + _chairHotspotId = _scene->_dynamicHotspots.add(NOUN_CHAIR, VERB_SIT_IN, -1, Common::Rect(159, 84, 159 + 33, 84 + 36)); if (!_action.isAction(VERB_LOOK, NOUN_VIEW_SCREEN)) { _action._inProgress = false; return; @@ -2618,7 +2618,7 @@ void Scene109::actions() { return; } - if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE)) && (_action.isTarget(0x146) || _action.isTarget(0x178))) { + if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE)) && (_action.isTarget(NOUN_SMALL_HOLE) || _action.isTarget(NOUN_TUNNEL))) { if (_action.isObject(NOUN_DEAD_FISH) || _action.isObject(NOUN_STUFFED_FISH) || _action.isObject(NOUN_BURGER)) { _throwingObjectId = _game._objects.getIdFromDesc(_action._activeAction._objectNameId); if (_throwingObjectId >= 0) { @@ -3000,11 +3000,11 @@ void Scene111::enter() { _globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1); _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_BATS, 0xD1, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BATS, VERB_LOOK_AT, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(-2, 0), FACING_NONE); - idx = _scene->_dynamicHotspots.add(NOUN_BATS, 0xD1, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); + idx = _scene->_dynamicHotspots.add(NOUN_BATS, VERB_LOOK_AT, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(-2, 0), FACING_NONE); - idx = _scene->_dynamicHotspots.add(NOUN_BATS, 0xD1, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); + idx = _scene->_dynamicHotspots.add(NOUN_BATS, VERB_LOOK_AT, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(-2, 0), FACING_NONE); _launch1Fl = false; @@ -3055,14 +3055,14 @@ void Scene111::step() { _scene->_sequences.remove(_globals._sequenceIndexes[4]); _globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 5, 1, 0, 0); _launch1Fl = true; - int idx = _scene->_dynamicHotspots.add(NOUN_BATS, 0xD1, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BATS, VERB_LOOK_AT, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(-2, 0), FACING_NONE); } if (!_launched2Fl && (_vm->getRandomNumber(1, 30000) == 1)) { _scene->_sequences.remove(_globals._sequenceIndexes[5]); _globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 5, 1, 0, 0); - int idx = _scene->_dynamicHotspots.add(NOUN_BATS, 0xD1, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BATS, VERB_LOOK_AT, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(-2, 0), FACING_NONE); _launched2Fl = true; } diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 3562a62994..5768275d29 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -871,7 +871,7 @@ void Scene202::actions() { _action._inProgress = false; return; } - } else if (((_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x82)) || (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x1B6))) && (_globals[kSexOfRex] == SEX_MALE)) { + } else if (((_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_FIELD_TO_NORTH)) || (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_STRANGE_DEVICE))) && (_globals[kSexOfRex] == SEX_MALE)) { if (!_ladderTopFl) { switch (_game._trigger) { case 0: @@ -1343,7 +1343,7 @@ void Scene205::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(20502); - else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x1C8)) + else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_OPPOSITE_BANK)) _vm->_dialogs->show(20518); else if (_action.isAction(VERB_TALKTO, NOUN_NATIVE_WOMAN)) { if (_game._trigger == 0) { @@ -3538,7 +3538,7 @@ void Scene209::actions() { return; } - if (_action.isAction(VERB_GIVE, NOUN_TWINKIFRUIT, 0xE3) || _action.isAction(VERB_THROW, NOUN_TWINKIFRUIT, 0xE3)) { + if (_action.isAction(VERB_GIVE, NOUN_TWINKIFRUIT, NOUN_MONKEY) || _action.isAction(VERB_THROW, NOUN_TWINKIFRUIT, NOUN_MONKEY)) { _vm->_dialogs->show(20909); _action._inProgress = false; return; @@ -3558,7 +3558,7 @@ void Scene209::actions() { return; } - if (_action.isAction(VERB_THROW, NOUN_POISON_DARTS, 0xE3)) { + if (_action.isAction(VERB_THROW, NOUN_POISON_DARTS, NOUN_MONKEY)) { _vm->_dialogs->show(20916); _action._inProgress = false; return; @@ -4442,7 +4442,7 @@ void Scene210::preActions() { } void Scene210::actions() { - if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x1C0)) { + if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_HUT_TO_NORTH)) { _vm->_dialogs->show(21017); } else if (_game._screenObjects._inputMode == 1) { handleConversations(); @@ -4847,7 +4847,7 @@ void Scene211::preActions() { void Scene211::actions() { if (_action._lookFlag && (_globals[kMonkeyStatus] == MONKEY_AMBUSH_READY)) _vm->_dialogs->show(21111); - else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x100)) + else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_PALM_TREE)) _vm->_dialogs->show(21116); else if (_action.isAction(VERB_LOOK, NOUN_BUSHY_FERN)) _vm->_dialogs->show(21101); @@ -5102,7 +5102,7 @@ void Scene214::step() { void Scene214::actions() { if (_action._lookFlag) _vm->_dialogs->show(21427); - else if (_action.isAction(VERB_WALK_OUTSIDE, 0xAA)) + else if (_action.isAction(VERB_WALK_OUTSIDE, NOUN_HUT)) _scene->_nextSceneId = 207; else if (_action.isAction(VERB_TAKE, NOUN_POISON_DARTS) && (_game._trigger || _game._objects.isInRoom(OBJ_POISON_DARTS))) { switch (_game._trigger) { @@ -5194,9 +5194,9 @@ void Scene214::actions() { _vm->_dialogs->show(21414); else if (_action.isAction(VERB_TALKTO, NOUN_CAPTIVE_CREATURE)) _vm->_dialogs->show(21415); - else if (_action.isAction(VERB_GIVE, NOUN_TWINKIFRUIT, 0x1C3)) + else if (_action.isAction(VERB_GIVE, NOUN_TWINKIFRUIT, NOUN_CAPTIVE_CREATURE)) _vm->_dialogs->show(21416); - else if (_action.isAction(VERB_SHOOT, 0x29, 0x1C3) || _action.isAction(VERB_HOSE_DOWN, 0x29, 0x1C3)) + else if (_action.isAction(VERB_SHOOT, NOUN_BLOWGUN, NOUN_CAPTIVE_CREATURE) || _action.isAction(VERB_HOSE_DOWN, NOUN_BLOWGUN, NOUN_CAPTIVE_CREATURE)) _vm->_dialogs->show(21417); else if (_action.isAction(VERB_LOOK, NOUN_BIG_HEADS)) _vm->_dialogs->show(21418); @@ -5313,7 +5313,7 @@ void Scene215::actions() { _scene->_kernelMessages.reset(); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(idx)); } - } else if (_action.isAction(VERB_WALK_OUTSIDE, 0xAA)) + } else if (_action.isAction(VERB_WALK_OUTSIDE, NOUN_HUT)) _scene->_nextSceneId = 210; else if (_action.isAction(VERB_LOOK, NOUN_BEAR_RUG)) _vm->_dialogs->show(21501); diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index a5bf1872a4..ff965ed5cb 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -804,7 +804,7 @@ void Scene307::enter() { if (_grateOpenedFl) { _scene->_hotspots.activate(17, false); - int idx = _scene->_dynamicHotspots.add(17, 0x2F7, -1, Common::Rect(117, 67, 117 + 19, 67 + 13)); + int idx = _scene->_dynamicHotspots.add(17, VERB_CLIMB_INTO, -1, Common::Rect(117, 67, 117 + 19, 67 + 13)); int hotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(129, 104), FACING_NORTH); _scene->_dynamicHotspots.setCursor(hotspotId, CURSOR_GO_UP); @@ -932,7 +932,7 @@ void Scene307::actions() { setDialogNode(node); break; } - } else if (_action.isAction(VERB_PRY, 0x12C, 0x11)) { + } else if (_action.isAction(VERB_PRY, NOUN_SCALPEL, NOUN_AIR_VENT)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -991,7 +991,7 @@ void Scene307::actions() { _scene->_sequences.remove(_globals._sequenceIndexes[5]); _grateOpenedFl = true; _scene->_hotspots.activate(17, false); - int idx = _scene->_dynamicHotspots.add(17, 0x2F7, -1, Common::Rect(117, 67, 117 + 19, 67 + 13)); + int idx = _scene->_dynamicHotspots.add(17, NOUN_CLIMB_INTO, -1, Common::Rect(117, 67, 117 + 19, 67 + 13)); int hotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(129, 104), FACING_NORTH); _scene->_dynamicHotspots.setCursor(hotspotId, CURSOR_GO_UP); _game._objects.removeFromInventory(OBJ_SCALPEL, NOWHERE); @@ -4036,7 +4036,7 @@ void Scene351::actions() { else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH)) _scene->_nextSceneId = 352; else if (_action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP)) { - if (_game._trigger || !_game._objects.isInInventory(0xF)) { + if (_game._trigger || !_game._objects.isInInventory(OBJ_CREDIT_CHIP)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -4163,7 +4163,7 @@ void Scene352::putArmDown(bool corridorExit, bool doorwayExit) { case 2: { _globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 0); - int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM, 0xD, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(230, 117), FACING_NORTHWEST); _scene->changeVariant(0); } @@ -4172,7 +4172,7 @@ void Scene352::putArmDown(bool corridorExit, bool doorwayExit) { case 3: _scene->_kernelMessages.reset(); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x100)); - _game._objects.setRoom(0x2F, _scene->_currentSceneId); + _game._objects.setRoom(OBJ_GUARDS_ARM, _scene->_currentSceneId); _game._player._visible = true; if (corridorExit) _scene->_sequences.addTimer(48, 6); @@ -4244,7 +4244,7 @@ void Scene352::enter() { if (_game._objects.isInRoom(OBJ_TAPE_PLAYER)) { _globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 12, 0, 0, 0); _scene->_sequences.setDepth(_globals._sequenceIndexes[5], 5); - int idx = _scene->_dynamicHotspots.add(NOUN_TAPE_PLAYER, 0xD, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_TAPE_PLAYER, VERB_WALKTO, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); _tapePlayerHotspotIdx = _scene->_dynamicHotspots.setPosition(idx, Common::Point(84, 145), FACING_WEST); } @@ -4258,7 +4258,7 @@ void Scene352::enter() { if (_game._objects.isInRoom(OBJ_GUARDS_ARM)) { _globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 0); - int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM, 0xD, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(230, 117), FACING_NORTHWEST); } else _mustPutArmDownFl = true; @@ -4315,14 +4315,14 @@ void Scene352::preActions() { } } - if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, 0x1F3)) { + if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_SCANNER)) { if (_globals[kSexOfRex] == REX_MALE) _game._player.walk(Common::Point(269, 111), FACING_NORTHEAST); else _game._player.walk(Common::Point(271, 111), FACING_NORTHEAST); } - if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM, 0x89)) { + if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_FLOOR)) { if (_game._objects.isInInventory(OBJ_GUARDS_ARM)) _game._player.walk(Common::Point(230, 117), FACING_NORTHWEST); } @@ -4401,7 +4401,7 @@ void Scene352::actions() { exit_doorway = true; } - if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM, 0x89)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_FLOOR)) { if (_mustPutArmDownFl) putArmDown(exit_corridor, exit_doorway); else if (exit_corridor) @@ -4441,7 +4441,7 @@ void Scene352::actions() { case 2: _game._player._visible = true; _game._player._stepEnabled = true; - _vm->_dialogs->showItem(0x2F, 0x899C); + _vm->_dialogs->showItem(OBJ_GUARDS_ARM, 0x899C); break; } _action._inProgress = false; @@ -4449,7 +4449,7 @@ void Scene352::actions() { } } - if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, 0x1F3)) { + if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_SCANNER)) { if (!_vaultOpenFl) { switch (_game._trigger) { case 0: @@ -4510,7 +4510,7 @@ void Scene352::actions() { _vaultOpenFl = true; int idx; if (!_globals[kHaveYourStuff]) { - idx = _scene->_dynamicHotspots.add(NOUN_YOUR_STUFF, 0xD, -1, Common::Rect(282, 87, 282 + 13, 87 + 7)); + idx = _scene->_dynamicHotspots.add(NOUN_YOUR_STUFF, VERB_WALKTO, -1, Common::Rect(282, 87, 282 + 13, 87 + 7)); _hotspot2Idx = _scene->_dynamicHotspots.setPosition(idx, Common::Point(280, 111), FACING_NORTHEAST); _globals._sequenceIndexes[1] = _commonSequenceIdx; _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x102)); @@ -4519,9 +4519,9 @@ void Scene352::actions() { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x103)); } - idx = _scene->_dynamicHotspots.add(NOUN_OTHER_STUFF, 0xD, -1, Common::Rect(282, 48, 282 + 36, 48 + 27)); + idx = _scene->_dynamicHotspots.add(NOUN_OTHER_STUFF, VERB_WALKTO, -1, Common::Rect(282, 48, 282 + 36, 48 + 27)); _hotspot1Idx = _scene->_dynamicHotspots.setPosition(idx, Common::Point(287, 115), FACING_NORTHEAST); - idx = _scene->_dynamicHotspots.add(NOUN_LAMP, 0xD, -1, Common::Rect(296, 76, 296 + 11, 76 + 17)); + idx = _scene->_dynamicHotspots.add(NOUN_LAMP, VERB_WALKTO, -1, Common::Rect(296, 76, 296 + 11, 76 + 17)); _lampHostpotIdx = _scene->_dynamicHotspots.setPosition(idx, Common::Point(287, 115), FACING_NORTHEAST); _game._player._stepEnabled = true; } @@ -4933,7 +4933,7 @@ void Scene359::enter() { if (_game._objects.isInRoom(OBJ_SECURITY_CARD)) { _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 9, 0, 0, 0); - _cardHotspotId = _scene->_dynamicHotspots.add(NOUN_SECURITY_CARD, 0xD, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); + _cardHotspotId = _scene->_dynamicHotspots.add(NOUN_SECURITY_CARD, VERB_WALKTO, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(_cardHotspotId, Common::Point(107, 107), FACING_SOUTH); } diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp index d803b62ecd..017319b675 100644 --- a/engines/mads/nebular/nebular_scenes4.cpp +++ b/engines/mads/nebular/nebular_scenes4.cpp @@ -888,14 +888,14 @@ void Scene402::enter() { _globals._sequenceIndexes[14] = _scene->_sequences.startCycle(_globals._spriteIndexes[14], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[14], 7); _scene->_sequences.setPosition(_globals._sequenceIndexes[14], Common::Point(210, 80)); - int idx = _scene->_dynamicHotspots.add(NOUN_REPAIR_LIST, 0xD1, _globals._sequenceIndexes[14], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_REPAIR_LIST, VERB_LOOK_AT, _globals._sequenceIndexes[14], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_NONE); } { _globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); } @@ -903,7 +903,7 @@ void Scene402::enter() { _globals._sequenceIndexes[15] = _scene->_sequences.startCycle(_globals._spriteIndexes[15], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[15], 8); _scene->_sequences.setPosition(_globals._sequenceIndexes[15], Common::Point(250, 80)); - int idx = _scene->_dynamicHotspots.add(NOUN_CREDIT_CHIP, 0x4, _globals._sequenceIndexes[15], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_CREDIT_CHIP, VERB_TAKE, _globals._sequenceIndexes[15], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_NONE); } @@ -965,7 +965,7 @@ void Scene402::step() { _globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 7, 0, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 3, 4); _scene->_sequences.setDepth(_globals._sequenceIndexes[10], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[10], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[10], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _bartenderTalking = true; if (_talkTimer > 1000) @@ -978,7 +978,7 @@ void Scene402::step() { if ((_game._trigger == 101) && _bartenderTalking) { _scene->_sequences.remove(_globals._sequenceIndexes[10]); _globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); _bartenderSteady = true; @@ -1107,7 +1107,7 @@ void Scene402::step() { _globals._sequenceIndexes[15] = _scene->_sequences.startCycle(_globals._spriteIndexes[15], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[15], 8); _scene->_sequences.setPosition(_globals._sequenceIndexes[15], Common::Point(250, 80)); - int idx = _scene->_dynamicHotspots.add(NOUN_CREDIT_CHIP, 0x4, _globals._sequenceIndexes[15], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_CREDIT_CHIP, VERB_TAKE, _globals._sequenceIndexes[15], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_NONE); } break; @@ -1140,7 +1140,7 @@ void Scene402::step() { int seqIdx = _globals._sequenceIndexes[12]; _globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1); _bartenderSteady = true; - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _scene->_sequences.updateTimeout(_globals._sequenceIndexes[9], seqIdx); _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); @@ -1218,7 +1218,7 @@ void Scene402::step() { case 91: { _scene->_sequences.remove(_globals._sequenceIndexes[9]); _globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); _bartenderSteady = true; @@ -1310,7 +1310,7 @@ void Scene402::step() { case 1: { _globals._sequenceIndexes[10] = _scene->_sequences.startCycle(_globals._spriteIndexes[10], false, 4); _scene->_sequences.setDepth(_globals._sequenceIndexes[10], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[10], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[10], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _bartenderHandsHips = true; } @@ -1319,7 +1319,7 @@ void Scene402::step() { case 2: { _globals._sequenceIndexes[11] = _scene->_sequences.startCycle(_globals._spriteIndexes[11], false, 2); _scene->_sequences.setDepth(_globals._sequenceIndexes[11], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[11], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[11], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _bartenderLooksLeft = true; } @@ -1328,7 +1328,7 @@ void Scene402::step() { case 3: { _globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _bartenderSteady = true; } @@ -1621,7 +1621,7 @@ void Scene402::step() { _scene->_sequences.remove(_globals._sequenceIndexes[10]); _bartenderHandsHips = false; _globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _bartenderSteady = true; _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); @@ -1629,7 +1629,7 @@ void Scene402::step() { _scene->_sequences.remove(_globals._sequenceIndexes[11]); _bartenderLooksLeft = false; _globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, 0xD, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[9], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(228, 83), FACING_SOUTH); _bartenderSteady = true; _scene->_sequences.setDepth(_globals._sequenceIndexes[9], 8); @@ -2491,7 +2491,7 @@ void Scene405::actions() { _scene->_nextSceneId = 408; else if (_action.isAction(VERB_WALK_THROUGH, NOUN_WIDE_DOOR) && !_globals[kArmoryDoorOpen]) _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 60, _game.getQuote(0x24F)); - else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) && !_globals[kArmoryDoorOpen]) { + else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, NOUN_CARD_SLOT) && !_globals[kArmoryDoorOpen]) { _game._player._stepEnabled = false; _game._player._visible = false; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; @@ -2501,7 +2501,7 @@ void Scene405::actions() { Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1); _scene->_sequences.setPosition(_globals._sequenceIndexes[3], msgPos); _scene->_sequences.setScale(_globals._sequenceIndexes[3], 87); - } else if ((_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) || _action.isAction(VERB_CLOSE, NOUN_WIDE_DOOR)) && _globals[kArmoryDoorOpen]) { + } else if ((_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, NOUN_CARD_SLOT) || _action.isAction(VERB_CLOSE, NOUN_WIDE_DOOR)) && _globals[kArmoryDoorOpen]) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; _game._player._visible = false; @@ -2699,7 +2699,7 @@ void Scene406::actions() { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(80, 100); } - } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) && !_globals[kStorageDoorOpen]) { + } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, NOUN_CARD_SLOT) && !_globals[kStorageDoorOpen]) { _game._player._stepEnabled = false; _game._player._visible = false; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; @@ -2709,7 +2709,7 @@ void Scene406::actions() { Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1); _scene->_sequences.setPosition(_globals._sequenceIndexes[2], msgPos); _scene->_sequences.setScale(_globals._sequenceIndexes[2], 87); - } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) && _globals[kStorageDoorOpen]) { + } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, NOUN_CARD_SLOT) && _globals[kStorageDoorOpen]) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; _game._player._visible = false; @@ -2910,7 +2910,7 @@ void Scene408::enter() { if (_game._objects.isInRoom(OBJ_TARGET_MODULE)) { _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 3); - int idx = _scene->_dynamicHotspots.add(NOUN_TARGET_MODULE, 0xD, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_TARGET_MODULE, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(283, 128), FACING_NORTHEAST); } sceneEntrySound(); @@ -3782,7 +3782,7 @@ void Scene411::actions() { return; } - if ((_globals[kNextIngredient] >= 4) && (_action.isAction(VERB_TAKE, NOUN_EXPLOSIVES) || _action.isAction(VERB_PUT, NOUN_CHARGE_CASES, 0x3AB)) + if ((_globals[kNextIngredient] >= 4) && (_action.isAction(VERB_TAKE, NOUN_EXPLOSIVES) || _action.isAction(VERB_PUT, NOUN_CHARGE_CASES, NOUN_EXPLOSIVES)) && !_game._objects[OBJ_CHARGE_CASES].getQuality(3) && _game._objects.isInInventory(OBJ_CHARGE_CASES)) { switch (_game._trigger) { diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp index d4b67da190..832c99a5f5 100644 --- a/engines/mads/nebular/nebular_scenes5.cpp +++ b/engines/mads/nebular/nebular_scenes5.cpp @@ -174,7 +174,7 @@ void Scene501::enter() { } _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_DOOR, 0x18B, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_DOOR, VERB_WALK_THROUGH, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); _doorHotspotid = _scene->_dynamicHotspots.setPosition(idx,Common::Point(282, 110), FACING_NORTH); _scene->_dynamicHotspots.setCursor(_doorHotspotid, CURSOR_GO_UP); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7); @@ -241,7 +241,7 @@ void Scene501::step() { _globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7); _vm->_sound->command(12); - _doorHotspotid = _scene->_dynamicHotspots.add(NOUN_DOOR, 0x18B, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); + _doorHotspotid = _scene->_dynamicHotspots.add(NOUN_DOOR, VERB_WALK_THROUGH, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(_globals._sequenceIndexes[3], Common::Point(282, 110), FACING_NORTH); _scene->_dynamicHotspots.setCursor(_doorHotspotid, CURSOR_GO_UP); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 83); @@ -343,9 +343,9 @@ void Scene501::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251)) + } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, NOUN_CARD_SLOT)) _vm->_dialogs->show(50113); - else if (_action.isAction(VERB_PUT, NOUN_FAKE_ID, 0x251)) { + else if (_action.isAction(VERB_PUT, NOUN_FAKE_ID, NOUN_CARD_SLOT)) { switch (_game._trigger) { case 0: case 1: @@ -389,7 +389,7 @@ void Scene501::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, NOUN_ID_CARD, 0x251)) { + } else if (_action.isAction(VERB_PUT, NOUN_ID_CARD, NOUN_CARD_SLOT)) { switch (_game._trigger) { case 0: case 1: @@ -559,7 +559,7 @@ void Scene503::enter() { if (_game._objects[OBJ_DETONATORS]._roomNumber == _scene->_currentSceneId) { _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 9, 0, 0, 0); - _detonatorHotspotId = _scene->_dynamicHotspots.add(NOUN_DETONATORS, 0xD, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); + _detonatorHotspotId = _scene->_dynamicHotspots.add(NOUN_DETONATORS, VERB_WALKTO, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(_detonatorHotspotId, Common::Point(254, 135), FACING_SOUTH); } @@ -1197,12 +1197,12 @@ void Scene506::enter() { _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RXCD_3"); _globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_LABORATORY, 0x242, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_LABORATORY, VERB_WALK_INTO, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); int hotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(65, 125), FACING_NORTHWEST); _scene->_dynamicHotspots.setCursor(hotspotId, CURSOR_GO_LEFT); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10); _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1); - idx = _scene->_dynamicHotspots.add(NOUN_SOFTWARE_STORE, 0x242, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); + idx = _scene->_dynamicHotspots.add(NOUN_SOFTWARE_STORE, VERB_WALK_INTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); hotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(112, 102), FACING_NORTHWEST); _scene->_dynamicHotspots.setCursor(hotspotId, CURSOR_GO_LEFT); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 13); @@ -1328,7 +1328,7 @@ void Scene506::handleDoorSequences() { case 83: { _doorSequenceIdx = _scene->_sequences.startCycle(_doorSpriteIdx, false, 1); - int idx = _scene->_dynamicHotspots.add(_doorWord, 0x242, _doorSequenceIdx, Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(_doorWord, VERB_WALK_INTO, _doorSequenceIdx, Common::Rect(0, 0, 0, 0)); int hotspotId = _scene->_dynamicHotspots.setPosition(idx, _doorPos, FACING_NORTHWEST); _scene->_dynamicHotspots.setCursor(hotspotId, CURSOR_GO_LEFT); _scene->_sequences.setDepth(_doorSequenceIdx, _doorDepth); @@ -1766,10 +1766,10 @@ void Scene508::actions() { } else { _vm->_dialogs->show(50837); } - } else if (_action.isAction(VERB_REFLECT, 0x120, 0x343) || _action.isAction(VERB_PUT, NOUN_REARVIEW_MIRROR, 0x344) || _action.isAction(VERB_PUT, NOUN_REARVIEW_MIRROR, 0x343)) { + } else if (_action.isAction(VERB_REFLECT, NOUN_REARVIEW_MIRROR, NOUN_LASER_BEAM) || _action.isAction(VERB_PUT, NOUN_REARVIEW_MIRROR, NOUN_PEDESTAL) || _action.isAction(VERB_PUT, NOUN_REARVIEW_MIRROR, NOUN_LASER_BEAM)) { _chosenObject = 1; handlePedestral(); - } else if (_action.isAction(VERB_PUT, NOUN_COMPACT_CASE, 0x344) || _action.isAction(VERB_PUT, NOUN_COMPACT_CASE, 0x343) || _action.isAction(VERB_REFLECT, 0x57, 0x343)) { + } else if (_action.isAction(VERB_PUT, NOUN_COMPACT_CASE, NOUN_PEDESTAL) || _action.isAction(VERB_PUT, NOUN_COMPACT_CASE, NOUN_LASER_BEAM) || _action.isAction(VERB_REFLECT, NOUN_COMPACT_CASE, NOUN_LASER_BEAM)) { _chosenObject = 2; handlePedestral(); } else if (_action._lookFlag) @@ -2139,7 +2139,7 @@ void Scene511::actions() { _vm->_dialogs->show(51117); else if (_action.isAction(VERB_LOOK, NOUN_DOME_ENTRANCE)) _vm->_dialogs->show(51118); - else if (_action.isAction(VERB_UNLOCK, 0xFF, 0x37C) || _action.isAction(VERB_UNLOCK, 0x6F, 0x37C)) + else if (_action.isAction(VERB_UNLOCK, NOUN_PADLOCK_KEY, NOUN_DOME_ENTRANCE) || _action.isAction(VERB_UNLOCK, NOUN_DOOR_KEY, NOUN_DOME_ENTRANCE)) _vm->_dialogs->show(51119); else if ( (_action.isAction(VERB_PUT) || _action.isAction(VERB_THROW)) && (_action.isObject(NOUN_TIMEBOMB) || _action.isObject(NOUN_BOMB) || _action.isObject(NOUN_BOMBS)) @@ -2621,7 +2621,7 @@ void Scene513::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, NOUN_ID_CARD, 0x251) || _action.isAction(VERB_PUT, NOUN_FAKE_ID, 0x251)) { + } else if (_action.isAction(VERB_PUT, NOUN_ID_CARD, NOUN_CARD_SLOT) || _action.isAction(VERB_PUT, NOUN_FAKE_ID, NOUN_CARD_SLOT)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2694,7 +2694,7 @@ void Scene513::actions() { _vm->_dialogs->show(51321); else if (_action.isAction(VERB_LOOK, NOUN_BRICK_WALL)) _vm->_dialogs->show(51322); - else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251)) + else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, NOUN_CARD_SLOT)) _vm->_dialogs->show(51320); else return; diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp index 8101428aab..eb85fa86e1 100644 --- a/engines/mads/nebular/nebular_scenes6.cpp +++ b/engines/mads/nebular/nebular_scenes6.cpp @@ -2190,15 +2190,15 @@ void Scene608::step() { void Scene608::preActions() { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; - if ((_action.isAction(VERB_THROW, NOUN_BONE, 0x410) || _action.isAction(VERB_THROW, NOUN_BONES, 0x410) - || _action.isAction(VERB_THROW, NOUN_BONE, 0x411) || _action.isAction(VERB_THROW, NOUN_BONES, 0x411) - || _action.isAction(VERB_THROW, NOUN_BONES, 0x471) || _action.isAction(VERB_THROW, NOUN_BONE, 0x471)) && _dogActiveFl) { + if ((_action.isAction(VERB_THROW, NOUN_BONE, NOUN_REAR_OF_GARAGE) || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_REAR_OF_GARAGE) + || _action.isAction(VERB_THROW, NOUN_BONE, NOUN_FRONT_OF_GARAGE) || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_FRONT_OF_GARAGE) + || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_OBNOXIOUS_DOG) || _action.isAction(VERB_THROW, NOUN_BONE, NOUN_OBNOXIOUS_DOG)) && _dogActiveFl) { _game._player._stepEnabled = false; _game._player.walk(Common::Point(56, 146), FACING_EAST); } - if ((_action.isAction(VERB_THROW, NOUN_BONES, 0x41D) || _action.isAction(VERB_THROW, NOUN_BONE, 0x41D) - || _action.isAction(VERB_THROW, NOUN_BONES, 0x41E) || _action.isAction(VERB_THROW, NOUN_BONE, 0x41E)) && _dogActiveFl) { + if ((_action.isAction(VERB_THROW, NOUN_BONES, NOUN_AREA_BEHIND_CAR) || _action.isAction(VERB_THROW, NOUN_BONE, NOUN_AREA_BEHIND_CAR) + || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_DANGER_ZONE) || _action.isAction(VERB_THROW, NOUN_BONE, NOUN_DANGER_ZONE)) && _dogActiveFl) { _game._player._stepEnabled = false; _game._player.walk(Common::Point(75, 136), FACING_EAST); } @@ -2337,8 +2337,8 @@ void Scene608::actions() { default: break; } - } else if (_action.isAction(VERB_THROW, NOUN_BONE, 0x410) || _action.isAction(VERB_THROW, NOUN_BONES, 0x410) - || _action.isAction(VERB_THROW, NOUN_BONES, 0x471) || _action.isAction(VERB_THROW, NOUN_BONE, 0x471)) { + } else if (_action.isAction(VERB_THROW, NOUN_BONE, NOUN_REAR_OF_GARAGE) || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_REAR_OF_GARAGE) + || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_OBNOXIOUS_DOG) || _action.isAction(VERB_THROW, NOUN_BONE, NOUN_OBNOXIOUS_DOG)) { _game._player._stepEnabled = true; if (_dogActiveFl) { if (_game._trigger == 0) { @@ -2349,7 +2349,7 @@ void Scene608::actions() { handleThrowingBone(); } else _vm->_dialogs->show(60841); - } else if (_action.isAction(VERB_THROW, NOUN_BONE, 0x411) || _action.isAction(VERB_THROW, NOUN_BONES, 0x411)) { + } else if (_action.isAction(VERB_THROW, NOUN_BONE, NOUN_FRONT_OF_GARAGE) || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_FRONT_OF_GARAGE)) { _game._player._stepEnabled = true; if (_dogActiveFl) { if (_game._trigger == 0) { @@ -2360,8 +2360,8 @@ void Scene608::actions() { handleThrowingBone(); } else _vm->_dialogs->show(60841); - } else if (_action.isAction(VERB_THROW, NOUN_BONES, 0x41D) || _action.isAction(VERB_THROW, NOUN_BONE, 0x41D) - || _action.isAction(VERB_THROW, NOUN_BONES, 0x41E) || _action.isAction(VERB_THROW, NOUN_BONE, 0x41E)) { + } else if (_action.isAction(VERB_THROW, NOUN_BONES, NOUN_AREA_BEHIND_CAR) || _action.isAction(VERB_THROW, NOUN_BONE, NOUN_AREA_BEHIND_CAR) + || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_DANGER_ZONE) || _action.isAction(VERB_THROW, NOUN_BONE, NOUN_DANGER_ZONE)) { _game._player._stepEnabled = true; if ((_globals[kCarStatus] == 0) && _dogActiveFl) { if (_dogActiveFl) { @@ -2711,7 +2711,7 @@ void Scene609::enterStore() { } void Scene609::preActions() { - if (_action.isAction(VERB_UNLOCK, 0x6F, 0x425)) + if (_action.isAction(VERB_UNLOCK, NOUN_DOOR_KEY, NOUN_VIDEO_STORE_DOOR)) _game._player.walk(Common::Point(78, 99), FACING_NORTHWEST); } @@ -2759,7 +2759,7 @@ void Scene609::actions() { _videoDoorMode = 2; enterStore(); } - } else if (_action.isAction(VERB_UNLOCK, 0x6F, 0x425)) { + } else if (_action.isAction(VERB_UNLOCK, NOUN_DOOR_KEY, NOUN_VIDEO_STORE_DOOR)) { _videoDoorMode = 1; enterStore(); } else if (_action.isAction(VERB_GET_INSIDE, NOUN_CAR)) { @@ -2948,7 +2948,7 @@ void Scene610::actions() { break; } } - } else if (_action.isAction(VERB_PUT, NOUN_PHONE_HANDSET, 0x42F)) { + } else if (_action.isAction(VERB_PUT, NOUN_PHONE_HANDSET, NOUN_PHONE_CRADLE)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -4347,7 +4347,7 @@ void Scene611::preActions() { void Scene611::actions() { if (_game._screenObjects._inputMode == 1) handleDialog(); - else if ((_action.isAction(VERB_GIVE, NOUN_PHONE_CELLS, 0x45A)) || (_action.isAction(VERB_GIVE, NOUN_DURAFAIL_CELLS, 0x45A))) { + else if ((_action.isAction(VERB_GIVE, NOUN_PHONE_CELLS, NOUN_HERMIT)) || (_action.isAction(VERB_GIVE, NOUN_DURAFAIL_CELLS, NOUN_HERMIT))) { _action._activeAction._verbId = 0x294; _giveBatteriesFl = true; handleSubDialog1(); diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp index b31a35913b..d59f7ff5f3 100644 --- a/engines/mads/nebular/nebular_scenes7.cpp +++ b/engines/mads/nebular/nebular_scenes7.cpp @@ -1028,7 +1028,7 @@ void Scene703::step() { void Scene703::actions() { if (_game._screenObjects._inputMode == 1) handleFillBottle(_action._activeAction._verbId); - else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B0)) { + else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_DOCK_TO_SOUTH)) { _game._player._stepEnabled = false; if (_globals[kMonsterAlive]) _curSequence = 8; @@ -1036,7 +1036,7 @@ void Scene703::actions() { _curSequence = 5; else _curSequence = 3; - } else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B2)) { + } else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_BUILDING_TO_NORTH)) { _game._player._stepEnabled = false; if (_globals[kMonsterAlive]) { _startMonsterTimer = false; @@ -1049,30 +1049,30 @@ void Scene703::actions() { _curSequence = 4; else _curSequence = 1; - } else if (_action.isAction(VERB_THROW, NOUN_BONE, 0x468) || _action.isAction(VERB_THROW, NOUN_BONES, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_BONE, NOUN_SEA_MONSTER) || _action.isAction(VERB_THROW, NOUN_BONES, NOUN_SEA_MONSTER)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); _scene->_activeAnimation->setCurrentFrame(19); - } else if (_action.isAction(VERB_THROW, NOUN_CHICKEN, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_CHICKEN, NOUN_SEA_MONSTER)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); - } else if (_action.isAction(VERB_THROW, NOUN_TWINKIFRUIT, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_TWINKIFRUIT, NOUN_SEA_MONSTER)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); _scene->_activeAnimation->setCurrentFrame(39); - } else if (_action.isAction(VERB_THROW, NOUN_BOMB, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_BOMB, NOUN_SEA_MONSTER)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); _scene->_activeAnimation->setCurrentFrame(59); - } else if (_action.isAction(VERB_THROW, NOUN_CHICKEN_BOMB, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_CHICKEN_BOMB, NOUN_SEA_MONSTER)) { _useBomb = true; _game._player._stepEnabled = false; _scene->freeAnimation(); @@ -1227,7 +1227,7 @@ void Scene704::enter() { _scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(190, 122)); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2); } - int idx = _scene->_dynamicHotspots.add(NOUN_BONES, 0xD1, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_BONES, VERB_LOOK_AT, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); _bottleHotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(-2, 0), FACING_NONE); } @@ -1414,13 +1414,13 @@ void Scene704::step() { void Scene704::actions() { if (_game._screenObjects._inputMode == 1) handleFillBottle(_action._activeAction._verbId); - else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B4)) { + else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_OPEN_WATER_TO_SOUTH)) { _game._player._stepEnabled = false; if (_boatDirection == 1) _animationMode = 5; else _animationMode = 3; - } else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B2)) { + } else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_BUILDING_TO_NORTH)) { _game._player._stepEnabled = false; if (_boatDirection == 2) _animationMode = 4; @@ -1664,7 +1664,7 @@ void Scene705::step() { void Scene705::actions() { if (_game._screenObjects._inputMode == 1) handleFillBottle(_action._activeAction._verbId); - else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B4)) { + else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_OPEN_WATER_TO_SOUTH)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1959,7 +1959,7 @@ void Scene706::actions() { return; } - if (_action.isAction(VERB_PUT, NOUN_BOTTLE, 0x344)) { + if (_action.isAction(VERB_PUT, NOUN_BOTTLE, NOUN_PEDESTAL)) { if ((_globals[kBottleStatus] == 2 && _game._difficulty == DIFFICULTY_HARD) || (_globals[kBottleStatus] != 0 && _game._difficulty != DIFFICULTY_HARD)) { if (!_game._objects.isInInventory(OBJ_VASE) || _game._trigger) { @@ -2106,7 +2106,7 @@ void Scene710::step() { } void Scene710::actions() { - if (_action.isAction(VERB_PUT_DOWN, 0x27)) { + if (_action.isAction(VERB_PUT_DOWN, NOUN_BINOCULARS)) { _game._player._stepEnabled = false; if (_game._globals[kCityFlooded]) @@ -2194,7 +2194,7 @@ void Scene751::enter() { if (_globals[kLineStatus] == 2 || _globals[kLineStatus] == 3) { _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -1); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7); - int idx = _scene->_dynamicHotspots.add(NOUN_FISHING_LINE, 0xD, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_FISHING_LINE, VERB_WALKTO, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(268, 140), FACING_NORTHWEST); } @@ -2228,7 +2228,7 @@ void Scene751::enter() { } else if (_globals[kLineStatus] == 2) { _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -1); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7); - int idx = _scene->_dynamicHotspots.add(NOUN_FISHING_LINE, 0xD, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_FISHING_LINE, VERB_WALKTO, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(268, 140), FACING_NORTHWEST); } @@ -2310,7 +2310,7 @@ void Scene751::preActions() { if (_action.isAction(VERB_LOOK, NOUN_TALL_BUILDING)) _game._player.walk(Common::Point(154, 129), FACING_NORTHEAST); - if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x470)) + if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_TALL_BUILDING)) _game._player.walk(Common::Point(154, 129), FACING_NORTH); if (_action.isAction(VERB_WALKTO, NOUN_EAST_END_OF_PLATFORM)) @@ -2322,7 +2322,7 @@ void Scene751::preActions() { if (_action.isAction(VERB_LOOK) || _action.isObject(NOUN_FISHING_LINE) || _action.isAction(VERB_TALKTO)) _game._player._needToWalk = false; - if ((!_action.isAction(VERB_PUT, NOUN_FISHING_LINE, 0x467) || !_action.isAction(VERB_TIE, NOUN_FISHING_LINE, 0x467) || !_action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, 0x467)) + if ((!_action.isAction(VERB_PUT, NOUN_FISHING_LINE, NOUN_HOOK) || !_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_HOOK) || !_action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_HOOK)) && (_game._player._needToWalk)) { switch (_game._trigger) { case 0: @@ -2351,7 +2351,7 @@ void Scene751::preActions() { void Scene751::actions() { if (_action.isAction(VERB_WALK_ALONG, NOUN_PLATFORM)) ; // Nothing - else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x470)) { + else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_TALL_BUILDING)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2419,7 +2419,7 @@ void Scene751::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, NOUN_FISHING_LINE, 0x467) || _action.isAction(VERB_TIE, NOUN_FISHING_LINE, 0x467) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, 0x467)) { + } else if (_action.isAction(VERB_PUT, NOUN_FISHING_LINE, NOUN_HOOK) || _action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_HOOK) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_HOOK)) { if (_globals[kLineStatus] == 1) { switch (_game._trigger) { case 0: @@ -2452,7 +2452,7 @@ void Scene751::actions() { _game._player._visible = true; _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -1); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7); - int idx = _scene->_dynamicHotspots.add(NOUN_FISHING_LINE, 0xD, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_FISHING_LINE, VERB_WALKTO, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(268, 140), FACING_NORTHWEST); _scene->_kernelMessages.reset(); _game._objects.setRoom(OBJ_FISHING_LINE, _scene->_currentSceneId); @@ -2490,7 +2490,7 @@ void Scene751::actions() { _vm->_dialogs->show(75121); else if (_action.isAction(VERB_LOOK, NOUN_TALL_BUILDING)) _vm->_dialogs->show(75122); - else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, 0x316) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, 0x316)) + else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_CEMENT_PYLON) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_CEMENT_PYLON)) _vm->_dialogs->show(75123); else return; diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp index c0f24a78fc..db9024b3bb 100644 --- a/engines/mads/nebular/nebular_scenes8.cpp +++ b/engines/mads/nebular/nebular_scenes8.cpp @@ -363,14 +363,14 @@ void Scene802::enter() { if ((_globals[kRemoteOnGround]) && (!_game._objects.isInInventory(OBJ_REMOTE))) { _globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_REMOTE, 0xD,_globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_REMOTE, VERB_WALKTO,_globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(107, 99), FACING_NORTH); } if (!_game._objects.isInInventory(OBJ_SHIELD_MODULATOR) && !_globals[kShieldModInstalled]) { _globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_SHIELD_MODULATOR, 0xD, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_SHIELD_MODULATOR, VERB_WALKTO, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(93, 97), FACING_NORTH); } sceneEntrySound(); @@ -388,7 +388,7 @@ void Scene802::step() { if (_game._trigger == 71) { _globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 8); - int idx = _scene->_dynamicHotspots.add(NOUN_REMOTE, 0xD, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_REMOTE, VERB_WALKTO, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(107, 99), FACING_NORTH); _globals[kRemoteSequenceRan] = true; @@ -545,7 +545,7 @@ void Scene803::enter() { if (_globals[kHoppyDead]) { _globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('e', 1)); _globals._sequenceIndexes[7] = _scene->_sequences.startCycle(_globals._spriteIndexes[7], false, 1); - int idx = _scene->_dynamicHotspots.add(NOUN_GUTS, 0xD, _globals._sequenceIndexes[7], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_GUTS, VERB_WALKTO, _globals._sequenceIndexes[7], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(66, 123), FACING_SOUTH); } @@ -637,7 +637,7 @@ void Scene803::step() { _scene->_sequences.addSubEntry(_globals._sequenceIndexes[5],SEQUENCE_TRIGGER_EXPIRE, 0, 101); } else { _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, -2); - int idx = _scene->_dynamicHotspots.add(NOUN_GUTS, 0xD, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_GUTS, VERB_WALKTO, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(66, 123), FACING_SOUTH); _vm->_sound->command(16); _globals[kCameFromCut] = true; @@ -656,7 +656,7 @@ void Scene803::step() { if (_game._trigger == 101) { _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, -2); - int idx = _scene->_dynamicHotspots.add(NOUN_GUTS, 0xD, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_GUTS, VERB_WALKTO, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(66, 123), FACING_SOUTH); _vm->_sound->command(16); _globals[kCameFromCut] = true; @@ -1097,7 +1097,7 @@ void Scene804::step() { void Scene805::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(NOUN_REMOVE); + _scene->addActiveVocab(VERB_REMOVE); _scene->addActiveVocab(NOUN_TARGET_MODULE); _scene->addActiveVocab(NOUN_SHIELD_MODULATOR); } @@ -1112,14 +1112,14 @@ void Scene805::enter() { if (_globals[kShieldModInstalled]) { _scene->_hotspots.activate(OBJ_SHIELD_MODULATOR, false); _globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 25); - int idx = _scene->_dynamicHotspots.add(NOUN_SHIELD_MODULATOR, 0x476, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_SHIELD_MODULATOR, VERB_REMOVE, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY); } if (_globals[kTargetModInstalled]) { _scene->_hotspots.activate(OBJ_TARGET_MODULE, false); _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 12); - int idx = _scene->_dynamicHotspots.add(NOUN_TARGET_MODULE, 0x476, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_TARGET_MODULE, VERB_REMOVE, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY); } @@ -1130,7 +1130,7 @@ void Scene805::step() { if (_game._trigger == 70) { _scene->_hotspots.activate(OBJ_SHIELD_MODULATOR, false); _globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 25); - int idx = _scene->_dynamicHotspots.add(NOUN_SHIELD_MODULATOR, 0x476, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_SHIELD_MODULATOR, VERB_REMOVE, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY); _globals[kShieldModInstalled] = true; _game._objects.setRoom(OBJ_SHIELD_MODULATOR, NOWHERE); @@ -1141,7 +1141,7 @@ void Scene805::step() { if (_game._trigger == 80) { _scene->_hotspots.activate(OBJ_TARGET_MODULE, false); _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 12); - int idx = _scene->_dynamicHotspots.add(NOUN_TARGET_MODULE, 0x476, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); + int idx = _scene->_dynamicHotspots.add(NOUN_TARGET_MODULE, VERB_REMOVE, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY); _globals[kTargetModInstalled] = true; _game._objects.setRoom(OBJ_TARGET_MODULE, NOWHERE); |