diff options
author | Filippos Karapetis | 2014-05-20 12:31:10 +0300 |
---|---|---|
committer | Filippos Karapetis | 2014-05-20 12:31:10 +0300 |
commit | c548b70e914acee473bd1ec427cabddcc0258e7d (patch) | |
tree | 9583e8e3b4478522f9b870ec8b5f3dafcd7e5e4c | |
parent | 3aa9dc3947900799bf69d5918eb36cc5d855506f (diff) | |
download | scummvm-rg350-c548b70e914acee473bd1ec427cabddcc0258e7d.tar.gz scummvm-rg350-c548b70e914acee473bd1ec427cabddcc0258e7d.tar.bz2 scummvm-rg350-c548b70e914acee473bd1ec427cabddcc0258e7d.zip |
MADS: Add more friendly names for nouns
-rw-r--r-- | engines/mads/nebular/nebular_scenes1.cpp | 62 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 28 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes3.cpp | 46 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes4.cpp | 54 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes5.cpp | 82 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes6.cpp | 72 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes7.cpp | 18 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes8.cpp | 16 |
8 files changed, 189 insertions, 189 deletions
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index 04c646f2cf..5187b78f53 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -160,7 +160,7 @@ void Scene101::enter() { _globals._sequenceIndexes[9] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 6, 0, 10, 4); _globals._sequenceIndexes[10] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[10], false, 6, 0, 32, 47); - _scene->_hotspots.activate(0x137, false); + _scene->_hotspots.activate(NOUN_SHIELD_MODULATOR, false); _panelOpened = false; // HACK: set the prior scene to 102 for now when the game starts, to avoid Rex's getting up animation @@ -180,7 +180,7 @@ void Scene101::enter() { _game._player._facing = FACING_NORTHEAST; _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(0x47, false); + _scene->_hotspots.activate(NOUN_CHAIR, false); _chairHotspotId = _scene->_dynamicHotspots.add(0x47, 0x13F, -1, Common::Rect(159, 84, 159 + 33, 84 + 36)); if (_scene->_priorSceneId == 112) sayDang(); @@ -317,7 +317,7 @@ void Scene101::preActions() { case 1: _game._player._stepEnabled = true; _panelOpened = false; - _scene->_hotspots.activate(0x137, false); + _scene->_hotspots.activate(NOUN_SHIELD_MODULATOR, false); break; } } @@ -378,7 +378,7 @@ void Scene101::actions() { if (((_action.isAction(VERB_WALKTO, NOUN_SHIELD_ACCESS_PANEL) || _action.isAction(VERB_OPEN, NOUN_SHIELD_ACCESS_PANEL))) && !_panelOpened) { switch (_game._trigger) { case 0: - _shieldSpriteIdx = _game._objects.isInRoom(0x18) ? 13 : 14; + _shieldSpriteIdx = _game._objects.isInRoom(OBJ_SHIELD_MODULATOR) ? 13 : 14; _globals._sequenceIndexes[13] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[_shieldSpriteIdx], false, 6, 1, 0, 0); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 1); _game._player._stepEnabled = false; @@ -391,8 +391,8 @@ void Scene101::actions() { _scene->_sequences.setAnimRange(_globals._sequenceIndexes[13], -2, -2); _game._player._stepEnabled = true; _panelOpened = true; - if (_game._objects.isInRoom(0x18)) - _scene->_hotspots.activate(0x137, true); + if (_game._objects.isInRoom(OBJ_SHIELD_MODULATOR)) + _scene->_hotspots.activate(NOUN_SHIELD_MODULATOR, true); break; } _action._inProgress = false; @@ -595,7 +595,7 @@ void Scene101::actions() { return; } - if ((_action.isAction(VERB_LOOK) || _action.isAction(VERB_PLAY)) && _action.isObject(0x17E)) { + if ((_action.isAction(VERB_LOOK) || _action.isAction(VERB_PLAY)) && _action.isObject(NOUN_VIDEO_GAME)) { _vm->_dialogs->show(10124); _action._inProgress = false; return; @@ -657,9 +657,9 @@ void Scene102::enter() { if (_game._objects.isInRoom(OBJ_BINOCULARS)) _globals._sequenceIndexes[9] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 24, 0, 0, 24); else - _scene->_hotspots.activate(0x27, false); + _scene->_hotspots.activate(NOUN_BINOCULARS, false); - _scene->_hotspots.activate(0x35, false); + _scene->_hotspots.activate(NOUN_BURGER, false); if (_globals[kMedicineCabinetOpen]) { _globals._sequenceIndexes[8] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[8], false, 6, 0, 0); @@ -758,10 +758,10 @@ void Scene102::step() { } void Scene102::preActions() { - if (_action.isObject(0x122) || _action.isObject(0x117)) + if (_action.isObject(NOUN_REFRIGERATOR) || _action.isObject(NOUN_POSTER)) _game._player._needToWalk = _game._player._readyToWalk; - if (_fridgeOpenedFl && !_action.isObject(0x122)) { + if (_fridgeOpenedFl && !_action.isObject(NOUN_REFRIGERATOR)) { switch (_game._trigger) { case 0: if (_game._player._needToWalk) { @@ -777,7 +777,7 @@ void Scene102::preActions() { case 1: if (_game._objects.isInRoom(OBJ_BURGER)) { _scene->_sequences.remove(_globals._sequenceIndexes[10]); - _scene->_hotspots.activate(0x35, false); + _scene->_hotspots.activate(NOUN_BURGER, false); } _fridgeOpenedFl = false; _game._player._stepEnabled = true; @@ -833,7 +833,7 @@ void Scene102::actions() { _game._player._stepEnabled = true; justOpenedFl = true; if (_game._objects.isInRoom(OBJ_BURGER)) - _scene->_hotspots.activate(0x35, true); + _scene->_hotspots.activate(NOUN_BURGER, true); break; } } @@ -970,7 +970,7 @@ void Scene102::actions() { return; } - if ((_action.isObject(NOUN_LADDER) || _action.isObject(0xA3)) && (_action.isAction(VERB_LOOK) || _action.isAction(VERB_CLIMB_UP) || _action.isAction(VERB_CLIMB_THROUGH))) { + if ((_action.isObject(NOUN_LADDER) || _action.isObject(NOUN_HATCHWAY)) && (_action.isAction(VERB_LOOK) || _action.isAction(VERB_CLIMB_UP) || _action.isAction(VERB_CLIMB_THROUGH))) { if (_game._objects.isInInventory(OBJ_REBREATHER)) { if (!_action.isAction(VERB_CLIMB_UP) && !_action.isAction(VERB_CLIMB_THROUGH)) { _vm->_dialogs->show(10231); @@ -984,7 +984,7 @@ void Scene102::actions() { } } - if ((_action.isObject(NOUN_LADDER) || _action.isObject(0xA3)) && (_action.isAction(VERB_CLIMB_UP) || _action.isAction(VERB_CLIMB_THROUGH)) ) { + if ((_action.isObject(NOUN_LADDER) || _action.isObject(NOUN_HATCHWAY)) && (_action.isAction(VERB_CLIMB_UP) || _action.isAction(VERB_CLIMB_THROUGH)) ) { switch (_game._trigger) { case 0: _scene->loadAnimation(formAnimName('A', -1), 1); @@ -1146,7 +1146,7 @@ void Scene102::actions() { case 1: _game._objects.addToInventory(OBJ_BINOCULARS); _scene->_sequences.remove(_globals._sequenceIndexes[9]); - _scene->_hotspots.activate(0x27, false); + _scene->_hotspots.activate(NOUN_BINOCULARS, false); _game._player._visible = true; _game._player._stepEnabled = true; _vm->_sound->command(22); @@ -1162,7 +1162,7 @@ void Scene102::actions() { _vm->_dialogs->showItem(OBJ_BURGER, 10235); _scene->_sequences.remove(_globals._sequenceIndexes[10]); _game._objects.addToInventory(OBJ_BURGER); - _scene->_hotspots.activate(0x35, false); + _scene->_hotspots.activate(NOUN_BURGER, false); _vm->_sound->command(22); _game._player._visible = true; _game._player._stepEnabled = true; @@ -1177,7 +1177,7 @@ void Scene102::actions() { return; } - if ((_action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL)) && _action.isObject(0x194)) { + if ((_action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL)) && _action.isObject(NOUN_WEIGHT_MACHINE)) { _vm->_dialogs->show(10225); _action._inProgress = false; return; @@ -1849,7 +1849,7 @@ void Scene105::preActions() { if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_OPEN_AREA_TO_SOUTH)) _game._player._walkOffScreenSceneId = 107; - if (_action.isObject(0xE0) && (_action.isAction(VERB_TALKTO) || _action.isAction(VERB_LOOK))) + if (_action.isObject(NOUN_MINE) && (_action.isAction(VERB_TALKTO) || _action.isAction(VERB_LOOK))) _game._player._needToWalk = false; } @@ -2085,7 +2085,7 @@ void Scene106::actions() { _vm->_dialogs->show(10605); else if (_action.isAction(VERB_LOOK, NOUN_PILE_OF_ROCKS) || _action.isAction(VERB_LOOK_AT, NOUN_PILE_OF_ROCKS)) _vm->_dialogs->show(10606); - else if (_action.isObject(0x109) && (_action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL) || _action.isAction(VERB_TAKE))) + else if (_action.isObject(NOUN_PILE_OF_ROCKS) && (_action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL) || _action.isAction(VERB_TAKE))) _vm->_dialogs->show(10607); else if (_action.isAction(VERB_LOOK, NOUN_SHIP) || _action.isAction(VERB_LOOK_AT, NOUN_SHIP)) _vm->_dialogs->show(10608); @@ -2119,7 +2119,7 @@ void Scene107::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xDA); + _scene->addActiveVocab(NOUN_MANTA_RAY); } void Scene107::enter() { @@ -2333,8 +2333,8 @@ Scene109::Scene109(MADSEngine *vm) : Scene1xx(vm) { } void Scene109::setup() { - _scene->addActiveVocab(0x66); - _scene->addActiveVocab(0xE5); + _scene->addActiveVocab(NOUN_DEAD_PURPLE_MONSTER); + _scene->addActiveVocab(NOUN_MONSTER_SLUDGE); setPlayerSpritesPrefix(); setAAName(); @@ -2489,8 +2489,8 @@ void Scene109::preActions() { _game._player._walkOffScreenSceneId = 108; if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE) || _action.isAction(VERB_PUT)) - && (_action.isObject(0x146) || _action.isObject(0x178)) - && (_action.isObject(0x65) || _action.isObject(0x157) || _action.isObject(0x35))) { + && (_action.isObject(NOUN_SMALL_HOLE) || _action.isObject(NOUN_TUNNEL)) + && (_action.isObject(NOUN_DEAD_FISH) || _action.isObject(NOUN_STUFFED_FISH) || _action.isObject(NOUN_BURGER))) { int idx = _game._objects.getIdFromDesc(_action._activeAction._objectNameId); if ((idx >= 0) && _game._objects.isInInventory(idx)) { _game._player._prepareWalkPos = Common::Point(106, 38); @@ -2501,7 +2501,7 @@ void Scene109::preActions() { } if ((_action.isAction(VERB_SWIM_INTO, NOUN_TUNNEL) || _action.isAction(VERB_SWIM_TO, NOUN_SMALL_HOLE)) - && (!_globals[kHoovicAlive] || _globals[kHoovicSated]) && (_action.isObject(0x178))) + && (!_globals[kHoovicAlive] || _globals[kHoovicSated]) && (_action.isObject(NOUN_TUNNEL))) _game._player._walkOffScreenSceneId = 110; _hungryFl = false; @@ -2515,7 +2515,7 @@ void Scene109::actions() { } if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE)) && (_action.isTarget(0x146) || _action.isTarget(0x178))) { - if (_action.isObject(0x65) || _action.isObject(0x157) || _action.isObject(0x35)) { + 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) { if ((_game._objects.isInInventory(_throwingObjectId) && _globals[kHoovicAlive]) || _rexThrowingObject) { @@ -2692,7 +2692,7 @@ void Scene109::actions() { _vm->_dialogs->show(10901); else if (_action.isAction(VERB_LOOK, NOUN_CORAL)) _vm->_dialogs->show(10902); - else if ((_action.isAction(VERB_TAKE) || _action.isAction(VERB_PULL)) && _action.isObject(0x5A)) + else if ((_action.isAction(VERB_TAKE) || _action.isAction(VERB_PULL)) && _action.isObject(NOUN_CORAL)) _vm->_dialogs->show(10903); else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) _vm->_dialogs->show(10904); @@ -2737,7 +2737,7 @@ void Scene110::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x5B); + _scene->addActiveVocab(NOUN_CRAB); } void Scene110::enter() { @@ -2861,7 +2861,7 @@ void Scene110::synchronize(Common::Serializer &s) { /*------------------------------------------------------------------------*/ void Scene111::setup() { - _scene->addActiveVocab(0x1F); + _scene->addActiveVocab(NOUN_BATS); setPlayerSpritesPrefix(); setAAName(); @@ -2992,7 +2992,7 @@ void Scene111::actions() { _vm->_dialogs->show(11104); else if (_action.isAction(VERB_LOOK, NOUN_LARGE_STALAGMITE)) _vm->_dialogs->show(11105); - else if ((_action.isAction(VERB_PULL) || _action.isAction(VERB_TAKE)) && (_action.isObject(0x153) || _action.isObject(0xC8))) + else if ((_action.isAction(VERB_PULL) || _action.isAction(VERB_TAKE)) && (_action.isObject(NOUN_STALAGMITES) || _action.isObject(NOUN_LARGE_STALAGMITE))) _vm->_dialogs->show(11106); else return; diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 173c641240..083b649a1a 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -1353,7 +1353,7 @@ void Scene205::actions() { } else if (_action.isAction(VERB_TAKE, NOUN_CHICKEN_ON_SPIT) && _globals[kChickenPermitted] && _game._objects.isInRoom(OBJ_CHICKEN)) { _game._objects.addToInventory(OBJ_CHICKEN); _scene->_sequences.remove(_globals._sequenceIndexes[4]); - _scene->_hotspots.activate(0x1C2, false); + _scene->_hotspots.activate(NOUN_CHICKEN_ON_SPIT, false); _vm->_dialogs->showItem(OBJ_CHICKEN, 812); } else if (_action.isAction(VERB_TAKE, NOUN_CHICKEN_ON_SPIT) && (!_globals[kChickenPermitted])) _scene->_kernelMessages.add(Common::Point(186, 27), 0xFBFA, 32, 0, 120, _game.getQuote(0x80)); @@ -1409,9 +1409,9 @@ void Scene205::synchronize(Common::Serializer &s) { void Scene207::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x185); + _scene->addActiveVocab(NOUN_VULTURE); _scene->addActiveVocab(VERB_WALKTO); - _scene->addActiveVocab(0x14D); + _scene->addActiveVocab(NOUN_SPIDER); _scene->addActiveVocab(VERB_WALKTO); } @@ -1896,7 +1896,7 @@ void Scene208::synchronize(Common::Serializer &s) { void Scene209::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x10F); + _scene->addActiveVocab(NOUN_PLANT_STALK); } void Scene209::handlePause() { @@ -3517,7 +3517,7 @@ void Scene209::synchronize(Common::Serializer &s) { void Scene210::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x70); + _scene->addActiveVocab(NOUN_DOORWAY); _scene->addActiveVocab(VERB_WALK_THROUGH); } @@ -4517,7 +4517,7 @@ void Scene211::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x144); + _scene->addActiveVocab(NOUN_SLITHERING_SNAKE); } void Scene211::enter() { @@ -4793,7 +4793,7 @@ void Scene212::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x19D); + _scene->addActiveVocab(NOUN_BOUNCING_REPTILE); } void Scene212::enter() { @@ -4822,7 +4822,7 @@ void Scene212::preActions() { void Scene212::actions() { if (_action._lookFlag) _vm->_dialogs->show(21209); - else if (_action.isAction(VERB_WALK_TOWARDS) && (_action.isObject(0x82) || _action.isObject(0xE8))) + else if (_action.isAction(VERB_WALK_TOWARDS) && (_action.isObject(NOUN_FIELD_TO_NORTH) || _action.isObject(NOUN_MOUNTAINS))) _scene->_nextSceneId = 208; else if (_action.isAction(VERB_WALK_TOWARDS, NOUN_CAVE)) _scene->_nextSceneId = 111; @@ -4916,8 +4916,8 @@ void Scene213::actions() { void Scene214::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x1C3); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_CAPTIVE_CREATURE); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene214::enter() { @@ -4934,7 +4934,7 @@ void Scene214::enter() { _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[1], Common::Point(103, 86)); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 11); } else { - _scene->_hotspots.activate(0x114, false); + _scene->_hotspots.activate(NOUN_POISON_DARTS, false); } if (_game._objects.isInRoom(OBJ_BLOWGUN)) { @@ -4942,7 +4942,7 @@ void Scene214::enter() { _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(90, 87)); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 13); } else { - _scene->_hotspots.activate(0x29, false); + _scene->_hotspots.activate(NOUN_BLOWGUN, false); } if (_scene->_priorSceneId != -2) @@ -5010,7 +5010,7 @@ void Scene214::actions() { _scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 2); _scene->_sequences.remove(_globals._sequenceIndexes[1]); _game._objects.addToInventory(OBJ_POISON_DARTS); - _scene->_hotspots.activate(0x114, false); + _scene->_hotspots.activate(NOUN_POISON_DARTS, false); break; case 2: @@ -5039,7 +5039,7 @@ void Scene214::actions() { _scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 2); _scene->_sequences.remove(_globals._sequenceIndexes[2]); _game._objects.addToInventory(OBJ_BLOWGUN); - _scene->_hotspots.activate(0x29, false); + _scene->_hotspots.activate(NOUN_BLOWGUN, false); break; case 2: diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index 74bc582249..95fdd0031a 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -470,8 +470,8 @@ void Scene304::synchronize(Common::Serializer &s) { void Scene307::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x11); - _scene->addActiveVocab(0x2F7); + _scene->addActiveVocab(NOUN_AIR_VENT); + _scene->addActiveVocab(NOUN_CLIMB_INTO); } void Scene307::handleRexDialog(int quote) { @@ -2510,9 +2510,9 @@ void Scene318::enter() { _scene->loadAnimation(formAnimName('f', -1)); _scene->_activeAnimation->_resetFlag = true; } else if (!_globals[kHasSeenProfPyro]) { - _scene->_hotspots.activate(0x3A2, false); - _scene->_hotspots.activate(0x3A1, false); - _scene->_hotspots.activate(0x165, false); + _scene->_hotspots.activate(NOUN_PROFESSORS_GURNEY, false); + _scene->_hotspots.activate(NOUN_PROFESSOR, false); + _scene->_hotspots.activate(NOUN_TAPE_PLAYER, false); } if (_game._objects.isInRoom(OBJ_SCALPEL)) { @@ -2542,7 +2542,7 @@ void Scene318::enter() { } _lastFrame = 0; - _scene->_hotspots.activate(0x307, false); + _scene->_hotspots.activate(NOUN_INTERN, false); if (_scene->_priorSceneId != -2) { _dialogFl = false; @@ -2572,7 +2572,7 @@ void Scene318::enter() { _dialogFl = false; } else { _scene->loadAnimation(formAnimName('b', -1), 61); - _scene->_hotspots.activate(0x307, true); + _scene->_hotspots.activate(NOUN_INTERN, true); } if (_dialogFl) { @@ -2658,7 +2658,7 @@ void Scene318::step() { if (nextFrame == 184) { handleInternDialog(0x1D1, 3, 240); - _scene->_hotspots.activate(0x307, false); + _scene->_hotspots.activate(NOUN_INTERN, false); _internVisibleFl = false; } break; @@ -3642,10 +3642,10 @@ void Scene320::actions() { if (_action._lookFlag) _vm->_dialogs->show(32011); else if ((_action.isAction(VERB_PRESS) || _action.isAction(VERB_PUSH)) && - (_action.isObject(0x2E8) || _action.isObject(0x2E9) || _action.isObject(0x2EA) || _action.isObject(0x2EB) || - _action.isObject(0x2DE) || _action.isObject(0x2DD) || _action.isObject(0x2E0) || _action.isObject(0x2E1) || - _action.isObject(0x2E2) || _action.isObject(0x2E3) || _action.isObject(0x2E4) || _action.isObject(0x2E5) || - _action.isObject(0x2E6) || _action.isObject(0x2E7) + (_action.isObject(NOUN_LEFT_1_KEY) || _action.isObject(NOUN_LEFT_2_KEY) || _action.isObject(NOUN_LEFT_3_KEY) || _action.isObject(NOUN_LEFT_4_KEY) || + _action.isObject(NOUN_GREEN_BUTTON) || _action.isObject(NOUN_RED_BUTTON) || _action.isObject(NOUN_RIGHT_1_KEY) || _action.isObject(NOUN_RIGHT_2_KEY) || + _action.isObject(NOUN_RIGHT_3_KEY) || _action.isObject(NOUN_RIGHT_4_KEY) || _action.isObject(NOUN_RIGHT_5_KEY) || _action.isObject(NOUN_RIGHT_6_KEY) || + _action.isObject(NOUN_RIGHT_7_KEY) || _action.isObject(NOUN_RIGHT_8_KEY) )) { switch (_game._trigger) { case 0: @@ -3868,7 +3868,7 @@ void Scene351::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene351::enter() { @@ -3879,11 +3879,11 @@ void Scene351::enter() { _globals._spriteIndexes[2] = _scene->_sprites.addSprites("*ROXRC_7"); _globals._spriteIndexes[3] = _scene->_sprites.addSprites("*RXRD_7"); - if (_game._objects.isInRoom(0xF)) { + if (_game._objects.isInRoom(OBJ_CREDIT_CHIP)) { _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 4); } else - _scene->_hotspots.activate(0x5C, false); + _scene->_hotspots.activate(NOUN_CREDIT_CHIP, false); if (_scene->_priorSceneId == 352) _game._player._playerPos = Common::Point(148, 152); @@ -3978,7 +3978,7 @@ void Scene351::actions() { break; case 1: - _scene->_hotspots.activate(0x5C, false); + _scene->_hotspots.activate(NOUN_CREDIT_CHIP, false); _scene->_sequences.remove(_globals._sequenceIndexes[1]); _game._objects.addToInventory(OBJ_CREDIT_CHIP); break; @@ -4027,10 +4027,10 @@ void Scene352::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x2F4); - _scene->addActiveVocab(0x2F5); - _scene->addActiveVocab(0x2F6); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_YOUR_STUFF); + _scene->addActiveVocab(NOUN_OTHER_STUFF); + _scene->addActiveVocab(NOUN_LAMP); } void Scene352::putArmDown(bool corridorExit, bool doorwayExit) { @@ -4815,7 +4815,7 @@ void Scene358::actions() { void Scene359::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene359::enter() { @@ -5464,7 +5464,7 @@ void Scene388::enter() { _scene->_userInterface.setup(kInputLimitedSentences); if (_globals[kAfterHavoc]) - _scene->_hotspots.activate(0x303, false); + _scene->_hotspots.activate(NOUN_SAUROPOD, false); else { _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('b', 0)); _globals._sequenceIndexes[0] = _scene->_sequences.startCycle(_globals._spriteIndexes[0], false, 1); @@ -5529,7 +5529,7 @@ void Scene389::enter() { _circularQuoteId = 0x159; if (_globals[kAfterHavoc]) - _scene->_hotspots.activate(0x304, false); + _scene->_hotspots.activate(NOUN_MONSTER, false); else { _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('m', -1)); _globals._sequenceIndexes[0] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[0], false, 6, 0, 0, 0); diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp index dd196b4059..5a68887b8d 100644 --- a/engines/mads/nebular/nebular_scenes4.cpp +++ b/engines/mads/nebular/nebular_scenes4.cpp @@ -235,15 +235,15 @@ void Scene402::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x30E); - _scene->addActiveVocab(0x306); - _scene->addActiveVocab(0x72); - _scene->addActiveVocab(0x27); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x5C); - _scene->addActiveVocab(0x4); - _scene->addActiveVocab(0x124); - _scene->addActiveVocab(0xD1); + _scene->addActiveVocab(NOUN_BARTENDER); + _scene->addActiveVocab(NOUN_ALIEN_LIQUOR); + _scene->addActiveVocab(NOUN_DRINK); + _scene->addActiveVocab(NOUN_BINOCULARS); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_CREDIT_CHIP); + _scene->addActiveVocab(NOUN_TAKE); + _scene->addActiveVocab(NOUN_REPAIR_LIST); + _scene->addActiveVocab(NOUN_LOOK_AT); } void Scene402::synchronize(Common::Serializer &s) { @@ -2849,8 +2849,8 @@ void Scene407::synchronize(Common::Serializer &s) { void Scene408::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x167); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_TARGET_MODULE); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene408::enter() { @@ -2873,7 +2873,7 @@ void Scene408::preActions() { if ((_action.isAction(VERB_TAKE) && !_action.isAction(0x167)) || _action.isAction(VERB_PULL, NOUN_PIN) || _action.isAction(VERB_OPEN, NOUN_CARTON)) _game._player._needToWalk = false; - if ((_action.isAction(VERB_LOOK, NOUN_TARGET_MODULE) && _game._objects.isInRoom(0x17)) || _action.isAction(VERB_LOOK, NOUN_CHEST)) + if ((_action.isAction(VERB_LOOK, NOUN_TARGET_MODULE) && _game._objects.isInRoom(OBJ_TARGET_MODULE)) || _action.isAction(VERB_LOOK, NOUN_CHEST)) _game._player._needToWalk = true; } @@ -3069,7 +3069,7 @@ void Scene410::enter() { if (_game._objects.isInRoom(OBJ_CHARGE_CASES)) _globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1); else - _scene->_hotspots.activate(0x48, false); + _scene->_hotspots.activate(NOUN_CHARGE_CASES, false); if (_scene->_priorSceneId != -2) { _game._player._playerPos = Common::Point(155, 150); @@ -3144,7 +3144,7 @@ void Scene410::actions() { case 1: _scene->_sequences.remove(_globals._sequenceIndexes[1]); - _scene->_hotspots.activate(0x48, false); + _scene->_hotspots.activate(NOUN_CHARGE_CASES, false); _game._objects.addToInventory(OBJ_CHARGE_CASES); _vm->_dialogs->showItem(OBJ_CHARGE_CASES, 41032); break; @@ -3464,11 +3464,11 @@ void Scene411::giveToRex(int object) { void Scene411::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x306); - _scene->addActiveVocab(0x2D6); - _scene->addActiveVocab(0x2D7); - _scene->addActiveVocab(0x3A9); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_ALIEN_LIQUOR); + _scene->addActiveVocab(NOUN_FORMALDEHYDE); + _scene->addActiveVocab(NOUN_PETROX); + _scene->addActiveVocab(NOUN_LECITHIN); } void Scene411::enter() { @@ -3507,11 +3507,11 @@ void Scene411::enter() { _dialog4.setup(0x5E, 0x255, 0x261, 0x25D, 0x259, 0x262, -1); if (_globals[kNextIngredient] >= 4 && _game._objects[OBJ_CHARGE_CASES].getQuality(3)) { - _scene->_hotspots.activate(0x3AB, false); - _scene->_hotspots.activate(0x30D, true); + _scene->_hotspots.activate(NOUN_EXPLOSIVES, false); + _scene->_hotspots.activate(NOUN_KETTLE, true); } else { - _scene->_hotspots.activate(0x30D, false); - _scene->_hotspots.activate(0x3AB, true); + _scene->_hotspots.activate(NOUN_KETTLE, false); + _scene->_hotspots.activate(NOUN_EXPLOSIVES, true); } if (_globals[kNextIngredient] >= 4 && _game._objects[OBJ_CHARGE_CASES].getQuality(3)) { @@ -3649,8 +3649,8 @@ void Scene411::step() { if (_makeMushroomCloud) { _globals._sequenceIndexes[9] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 5, 1, 0, 0); _makeMushroomCloud = false; - _scene->_hotspots.activate(0x3AB, false); - _scene->_hotspots.activate(0x30D, true); + _scene->_hotspots.activate(NOUN_EXPLOSIVES, false); + _scene->_hotspots.activate(NOUN_KETTLE, true); } break; @@ -3736,8 +3736,8 @@ void Scene411::actions() { break; case 111: - _scene->_hotspots.activate(0x30D, true); - _scene->_hotspots.activate(0x3AB, false); + _scene->_hotspots.activate(NOUN_KETTLE, true); + _scene->_hotspots.activate(NOUN_EXPLOSIVES, false); _scene->_sequences.remove(_globals._sequenceIndexes[4]); _scene->_sequences.remove(_globals._sequenceIndexes[10]); diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp index b218784275..b55262c135 100644 --- a/engines/mads/nebular/nebular_scenes5.cpp +++ b/engines/mads/nebular/nebular_scenes5.cpp @@ -95,8 +95,8 @@ void Scene5xx::sceneEntrySound() { void Scene501::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x6E); - _scene->addActiveVocab(0x18B); + _scene->addActiveVocab(NOUN_DOOR); + _scene->addActiveVocab(NOUN_WALK_THROUGH); } void Scene501::synchronize(Common::Serializer &s) { @@ -283,7 +283,7 @@ void Scene501::step() { } void Scene501::preActions() { - if (_action.isAction(VERB_WALK_DOWN) && (_action.isObject(0x321) || _action.isObject(0x322))) + if (_action.isAction(VERB_WALK_DOWN) && (_action.isObject(NOUN_STREET_TO_EAST) || _action.isObject(NOUN_SIDEWALK_TO_EAST))) _game._player._walkOffScreenSceneId = 551; } @@ -526,8 +526,8 @@ void Scene502::actions() { void Scene503::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x6A); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_DETONATORS); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene503::enter() { @@ -1099,9 +1099,9 @@ void Scene505::actions() { void Scene506::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x242); - _scene->addActiveVocab(0x336); - _scene->addActiveVocab(0x37D); + _scene->addActiveVocab(NOUN_WALK_INTO); + _scene->addActiveVocab(NOUN_SOFTWARE_STORE); + _scene->addActiveVocab(NOUN_LABORATORY); } void Scene506::enter() { @@ -1361,8 +1361,8 @@ void Scene506::actions() { void Scene507::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x106); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_PENLIGHT); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene507::enter() { @@ -1472,9 +1472,9 @@ void Scene507::actions() { void Scene508::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x364); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x343); + _scene->addActiveVocab(NOUN_SPINACH_PATCH_DOLL); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_LASER_BEAM); } void Scene508::enter() { @@ -1497,8 +1497,8 @@ void Scene508::enter() { _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, -2); int idx = _scene->_dynamicHotspots.add(0x343, VERB_WALKTO, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(57, 116), FACING_NORTHEAST); - _scene->_hotspots.activate(0x342, false); - _scene->_hotspots.activate(0x343, false); + _scene->_hotspots.activate(NOUN_HOLE, false); + _scene->_hotspots.activate(NOUN_LASER_BEAM, false); } else { _scene->changeVariant(1); _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -2); @@ -1512,8 +1512,8 @@ void Scene508::enter() { _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 6); if (_globals[kLaserHoleIsThere]) { _globals._sequenceIndexes[7] = _scene->_sequences.startCycle(_globals._spriteIndexes[7], false, -2); - _scene->_hotspots.activate(0x342, true); - _scene->_hotspots.activate(0x343, true); + _scene->_hotspots.activate(NOUN_HOLE, true); + _scene->_hotspots.activate(NOUN_LASER_BEAM, true); } _vm->_sound->command(21); } @@ -1572,8 +1572,8 @@ void Scene508::handlePedestral() { case 2: _globals._sequenceIndexes[7] = _scene->_sequences.startCycle(_globals._spriteIndexes[7], false, -2); - _scene->_hotspots.activate(0x342, true); - _scene->_hotspots.activate(0x343, true); + _scene->_hotspots.activate(NOUN_HOLE, true); + _scene->_hotspots.activate(NOUN_LASER_BEAM, true); break; case 3: @@ -1731,9 +1731,9 @@ void Scene508::actions() { void Scene511::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x345); - _scene->addActiveVocab(0x87); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_BOAT); + _scene->addActiveVocab(NOUN_FISHING_LINE); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene511::enter() { @@ -1747,10 +1747,10 @@ void Scene511::enter() { _globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('b', 0)); _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 3); - _scene->_hotspots.activate(0x345, false); + _scene->_hotspots.activate(NOUN_BOAT, false); int idx = _scene->_dynamicHotspots.add(0x345, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0)); _scene->_dynamicHotspots.setPosition(idx, Common::Point(75, 124), FACING_NORTH); - _scene->_hotspots.activate(0x347, false); + _scene->_hotspots.activate(NOUN_ROPE, false); } else { _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('b', 2)); _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('b', 3)); @@ -1765,8 +1765,8 @@ void Scene511::enter() { _globals._sequenceIndexes[6] = _scene->_sequences.startCycle(_globals._spriteIndexes[6], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[6],5); - _scene->_hotspots.activate(0x347, true); - _scene->_hotspots.activate(0x345, true); + _scene->_hotspots.activate(NOUN_ROPE, true); + _scene->_hotspots.activate(NOUN_BOAT, true); _scene->changeVariant(1); } @@ -2052,10 +2052,10 @@ void Scene511::actions() { void Scene512::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x88); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0xFF); - _scene->addActiveVocab(0x366); + _scene->addActiveVocab(NOUN_FISHING_ROD); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_PADLOCK_KEY); + _scene->addActiveVocab(NOUN_REGISTER_DRAWER); } void Scene512::enter() { @@ -2076,7 +2076,7 @@ void Scene512::enter() { if (!_game._visitedScenes._sceneRevisited) _globals[kRegisterOpen] = false; - _scene->_hotspots.activate(0xFF, false); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, false); if (_game._difficulty == DIFFICULTY_EASY) { if (_game._objects[OBJ_PADLOCK_KEY]._roomNumber == _scene->_currentSceneId) { _globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 10, 0, 0, 0); @@ -2087,20 +2087,20 @@ void Scene512::enter() { if (_globals[kRegisterOpen]) { _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 3); - _scene->_hotspots.activate(0xFF, false); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, false); } } else if (_globals[kRegisterOpen]) { if (_game._objects[OBJ_PADLOCK_KEY]._roomNumber == _scene->_currentSceneId) { - _scene->_hotspots.activate(0xFF, true); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, true); _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[5], 3); } else { - _scene->_hotspots.activate(0xFF, false); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, false); _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 3); } } else - _scene->_hotspots.activate(0xFF, false); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, false); if (_scene->_priorSceneId != -2) { _game._player._playerPos = Common::Point(144, 152); @@ -2190,7 +2190,7 @@ void Scene512::actions() { case 5: _globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 14, 0, 0, 0); _scene->_sequences.setDepth(_globals._sequenceIndexes[5], 3); - _scene->_hotspots.activate(0xFF, true); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, true); _scene->_sequences.addTimer(60, 6); break; @@ -2227,7 +2227,7 @@ void Scene512::actions() { _scene->_sequences.remove(_globals._sequenceIndexes[5]); _globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 12, 1, 0, 0); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 3); - _scene->_hotspots.activate(0xFF, false); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, false); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 2); } break; @@ -2268,7 +2268,7 @@ void Scene512::actions() { _scene->_sequences.remove(_globals._sequenceIndexes[5]); _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 3); - _scene->_hotspots.activate(0xFF, false); + _scene->_hotspots.activate(NOUN_PADLOCK_KEY, false); } _vm->_sound->command(9); _game._objects.addToInventory(OBJ_PADLOCK_KEY); @@ -2346,8 +2346,8 @@ void Scene512::actions() { void Scene513::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x367); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_ELEVATOR_DOOR); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene513::enter() { @@ -2690,7 +2690,7 @@ void Scene551::step() { } void Scene551::preActions() { - if (_action.isAction(VERB_WALK_DOWN) && (_action.isObject(0x360) || _action.isObject(0x361))) + if (_action.isAction(VERB_WALK_DOWN) && (_action.isObject(NOUN_STREET_TO_WEST) || _action.isObject(NOUN_SIDEWALK_TO_WEST))) _game._player._walkOffScreenSceneId = 501; } diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp index acadb820b4..6cea5cb63a 100644 --- a/engines/mads/nebular/nebular_scenes6.cpp +++ b/engines/mads/nebular/nebular_scenes6.cpp @@ -86,8 +86,8 @@ void Scene6xx::sceneEntrySound() { void Scene601::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x343); - _scene->addActiveVocab(0xD1); + _scene->addActiveVocab(NOUN_LASER_BEAM); + _scene->addActiveVocab(NOUN_LOOK_AT); } void Scene601::enter() { @@ -220,9 +220,9 @@ void Scene601::actions() { void Scene602::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x3D3); - _scene->addActiveVocab(0x343); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_SAFE); + _scene->addActiveVocab(NOUN_LASER_BEAM); } void Scene602::enter() { @@ -244,7 +244,7 @@ void Scene602::enter() { _scene->_dynamicHotspots.setPosition(idx, Common::Point(80, 134), FACING_NORTHEAST); _scene->changeVariant(1); } else - _scene->_hotspots.activate(0x342, false); + _scene->_hotspots.activate(NOUN_HOLE, false); if (_globals[kSafeStatus] == 0) { _lastSpriteIdx = _globals._spriteIndexes[2]; @@ -270,9 +270,9 @@ void Scene602::enter() { _globals._sequenceIndexes[6] = _scene->_sequences.startCycle(_globals._spriteIndexes[6], false, -1); _scene->_sequences.setDepth(_globals._sequenceIndexes[6], 15); if (_globals[kSafeStatus] == 0 || _globals[kSafeStatus] == 2) - _scene->_hotspots.activate(0x6F, false); + _scene->_hotspots.activate(NOUN_DOOR_KEY, false); } else - _scene->_hotspots.activate(0x6F, false); + _scene->_hotspots.activate(NOUN_DOOR_KEY, false); if (_scene->_priorSceneId == 603) { _game._player._playerPos = Common::Point(228, 126); @@ -320,7 +320,7 @@ void Scene602::handleSafeActions() { _lastSequenceIdx = _scene->_sequences.addSpriteCycle(_lastSpriteIdx, false, 12, 1, 0, 0); _scene->_sequences.setDepth(_lastSequenceIdx, 14); if (_game._objects[OBJ_DOOR_KEY]._roomNumber == _scene->_currentSceneId) - _scene->_hotspots.activate(0x6F, true); + _scene->_hotspots.activate(NOUN_DOOR_KEY, true); _scene->_sequences.addSubEntry(_lastSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 2); @@ -335,7 +335,7 @@ void Scene602::handleSafeActions() { _lastSequenceIdx = _scene->_sequences.startReverseCycle(_lastSpriteIdx, false, 12, 1, 0, 0); _scene->_sequences.setDepth(_lastSequenceIdx, 14); if (_game._objects[OBJ_DOOR_KEY]._roomNumber == _scene->_currentSceneId) - _scene->_hotspots.activate(0x6F, false); + _scene->_hotspots.activate(NOUN_DOOR_KEY, false); _scene->_sequences.addSubEntry(_lastSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 2); } @@ -453,7 +453,7 @@ void Scene602::actions() { case 1: _scene->_sequences.remove(_globals._sequenceIndexes[6]); - _scene->_hotspots.activate(0x6F, false); + _scene->_hotspots.activate(NOUN_DOOR_KEY, false); _vm->_sound->command(9); _game._objects.addToInventory(OBJ_DOOR_KEY); break; @@ -533,9 +533,9 @@ void Scene602::actions() { void Scene603::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x57); - _scene->addActiveVocab(0x3A8); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_COMPACT_CASE); + _scene->addActiveVocab(NOUN_NOTE); } void Scene603::enter() { @@ -675,9 +675,9 @@ void Scene603::actions() { void Scene604::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x468); + _scene->addActiveVocab(NOUN_SEA_MONSTER); _scene->addActiveVocab(VERB_WALKTO); - _scene->addActiveVocab(0x171); + _scene->addActiveVocab(NOUN_TIMEBOMB); } void Scene604::enter() { @@ -988,7 +988,7 @@ void Scene605::actions() { void Scene607::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x471); + _scene->addActiveVocab(NOUN_OBNOXIOUS_DOG); _scene->addActiveVocab(VERB_WALKTO); } @@ -1017,7 +1017,7 @@ void Scene607::enter() { _dogEatsRex = false; _dogTimer = 0; } else - _scene->_hotspots.activate(0x471, false); + _scene->_hotspots.activate(NOUN_OBNOXIOUS_DOG, false); _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4); @@ -1076,7 +1076,7 @@ void Scene607::step() { _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 6); _dogBarking = false; _globals[kDogStatus] = 1; - _scene->_hotspots.activate(0x471, true); + _scene->_hotspots.activate(NOUN_OBNOXIOUS_DOG, true); } if (!_dogEatsRex && (_game._difficulty != DIFFICULTY_EASY) && !_animationActive && (_globals[kDogStatus] == 1) @@ -1247,7 +1247,7 @@ void Scene607::handleThrowingBone() { _game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount; if (_animationMode != 1) - _scene->_hotspots.activate(0x471, false); + _scene->_hotspots.activate(NOUN_OBNOXIOUS_DOG, false); else { _globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 6); @@ -1421,10 +1421,10 @@ void Scene607::actions() { void Scene608::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x115); - _scene->addActiveVocab(0x324); - _scene->addActiveVocab(0x471); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_POLYCEMENT); + _scene->addActiveVocab(NOUN_CAR); + _scene->addActiveVocab(NOUN_OBNOXIOUS_DOG); } void Scene608::resetDogVariables() { @@ -2438,7 +2438,7 @@ void Scene609::step() { break; case 61: - _scene->_hotspots.activate(0x425, false); + _scene->_hotspots.activate(NOUN_VIDEO_STORE_DOOR, false); _game._player.walk(Common::Point(101, 100), FACING_EAST); _scene->_sequences.addTimer(180, 62); break; @@ -2446,7 +2446,7 @@ void Scene609::step() { case 62: _scene->_sequences.remove( _globals._sequenceIndexes[2]); _globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0); - _scene->_hotspots.activate(0x425, true); + _scene->_hotspots.activate(NOUN_VIDEO_STORE_DOOR, true); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 9); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 63); break; @@ -2550,7 +2550,7 @@ void Scene609::enterStore() { break; case 6: - _scene->_hotspots.activate(0x425, false); + _scene->_hotspots.activate(NOUN_VIDEO_STORE_DOOR, false); if (_videoDoorMode == 1) { _scene->_kernelMessages.reset(); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 180, _game.getQuote(0x307)); @@ -2567,7 +2567,7 @@ void Scene609::enterStore() { break; case 8: - _scene->_hotspots.activate(0x425, true); + _scene->_hotspots.activate(NOUN_VIDEO_STORE_DOOR, true); _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, -1); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 9); _globals[kBeenInVideoStore] = true; @@ -2704,8 +2704,8 @@ void Scene609::actions() { void Scene610::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x108); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_PHONE_HANDSET); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene610::enter() { @@ -2887,8 +2887,8 @@ void Scene610::actions() { void Scene611::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x275); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_RAT); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene611::handleRatMoves() { @@ -3756,7 +3756,7 @@ void Scene611::enter() { _stickFingerFl = false; } else { _hermitMode = 0; - _scene->_hotspots.activate(0x45A, false); + _scene->_hotspots.activate(NOUN_HERMIT, false); } // CHECKME: The last line of the block looks extremely useless @@ -4117,7 +4117,7 @@ void Scene611::step() { _startTradingFl = false; _nextFrame = 52; _globals[kHasTalkedToHermit] = true; - _scene->_hotspots.activate(0x45A, false); + _scene->_hotspots.activate(NOUN_HERMIT, false); } else { _game._player._stepEnabled = true; _hermitMode = 1; @@ -4262,8 +4262,8 @@ void Scene611::actions() { void Scene612::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x87); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_FISHING_LINE); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene612::handleWinchMovement() { diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp index a4dd432f11..c0755e83aa 100644 --- a/engines/mads/nebular/nebular_scenes7.cpp +++ b/engines/mads/nebular/nebular_scenes7.cpp @@ -646,7 +646,7 @@ void Scene703::enter() { _boatFrame = -1; if (!_globals[kMonsterAlive]) - _scene->_hotspots.activate(0x468, false); + _scene->_hotspots.activate(NOUN_SEA_MONSTER, false); if (_scene->_priorSceneId == 704) { _game._player._stepEnabled = false; @@ -960,7 +960,7 @@ void Scene703::step() { break; case 126: - _scene->_hotspots.activate(0x468, false); + _scene->_hotspots.activate(NOUN_SEA_MONSTER, false); _globals[kMonsterAlive] = false; _scene->freeAnimation(); _monsterMode = 0; @@ -1073,8 +1073,8 @@ void Scene703::actions() { void Scene704::setup() { _game._player._spritesPrefix = ""; setAAName(); - _scene->addActiveVocab(0x2E); - _scene->addActiveVocab(0xD1); + _scene->addActiveVocab(NOUN_BOTTLE); + _scene->addActiveVocab(NOUN_LOOK_AT); } void Scene704::handleBottleInterface() { @@ -1676,9 +1676,9 @@ void Scene705::actions() { void Scene706::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x2E); - _scene->addActiveVocab(0x17D); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_BOTTLE); + _scene->addActiveVocab(NOUN_VASE); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene706::handleRexDeath() { @@ -2085,8 +2085,8 @@ void Scene711::actions() { void Scene751::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x87); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_FISHING_LINE); + _scene->addActiveVocab(NOUN_WALK_TO); } void Scene751::enter() { diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp index 3604c8bde1..9c53855878 100644 --- a/engines/mads/nebular/nebular_scenes8.cpp +++ b/engines/mads/nebular/nebular_scenes8.cpp @@ -305,9 +305,9 @@ void Scene801::actions() { void Scene802::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x137); - _scene->addActiveVocab(0xD); - _scene->addActiveVocab(0x123); + _scene->addActiveVocab(NOUN_SHIELD_MODULATOR); + _scene->addActiveVocab(NOUN_WALK_TO); + _scene->addActiveVocab(NOUN_REMOTE); } void Scene802::enter() { @@ -513,8 +513,8 @@ void Scene802::actions() { void Scene803::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x472); - _scene->addActiveVocab(0xD); + _scene->addActiveVocab(NOUN_GUTS); + _scene->addActiveVocab(NOUN_WALK_TO); if ((!_globals[kFromCockpit] && _globals[kReturnFromCut] && !_globals[kBeamIsUp]) || (_globals[kFromCockpit] && !_globals[kExitShip])) { @@ -1060,9 +1060,9 @@ void Scene804::step() { void Scene805::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(0x476); - _scene->addActiveVocab(0x167); - _scene->addActiveVocab(0x137); + _scene->addActiveVocab(NOUN_REMOVE); + _scene->addActiveVocab(NOUN_TARGET_MODULE); + _scene->addActiveVocab(NOUN_SHIELD_MODULATOR); } void Scene805::enter() { |