[Scummvm-cvs-logs] scummvm master -> 2878863fa486fdbf2cc2593a8c1ce633434e375e
bluegr
bluegr at gmail.com
Mon May 26 20:25:36 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2878863fa4 MADS: Add more friendly names for action verbs and nouns
Commit: 2878863fa486fdbf2cc2593a8c1ce633434e375e
https://github.com/scummvm/scummvm/commit/2878863fa486fdbf2cc2593a8c1ce633434e375e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-05-26T21:24:23+03:00
Commit Message:
MADS: Add more friendly names for action verbs and nouns
Changed paths:
engines/mads/nebular/game_nebular.cpp
engines/mads/nebular/nebular_scenes.h
engines/mads/nebular/nebular_scenes2.cpp
engines/mads/nebular/nebular_scenes3.cpp
engines/mads/nebular/nebular_scenes4.cpp
engines/mads/nebular/nebular_scenes5.cpp
engines/mads/nebular/nebular_scenes6.cpp
engines/mads/nebular/nebular_scenes7.cpp
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 51e06d0..f3b0856 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -296,9 +296,9 @@ void GameNebular::doObjectAction() {
dialogs.show(444);
} else if (action.isAction(VERB_EAT, NOUN_STUFFED_FISH)) {
dialogs.show(445);
- } else if (action.isAction(401, 289)) {
+ } else if (action.isAction(VERB_WEAR, NOUN_REBREATHER)) {
dialogs.show(scene._currentSceneId > 103 && scene._currentSceneId < 111 ? 446 : 447);
- } else if (action.isAction(306, 371)) {
+ } else if (action.isAction(VERB_SET, 371)) {
dialogs.show(448);
} else if (action.isAction(951, 35)) {
dialogs.show(449);
@@ -320,7 +320,7 @@ void GameNebular::doObjectAction() {
dialogs.show(456);
} else if (action.isAction(1189, OBJ_VASE)) {
dialogs.show(457);
- } else if (action.isAction(306, 369)) {
+ } else if (action.isAction(VERB_SET, 369)) {
dialogs.show(458);
} else if (action.isAction(1192, 774)) {
dialogs.show(459);
@@ -551,7 +551,7 @@ void GameNebular::doObjectAction() {
_globals[kDurafailRecharged] = _difficulty != 1 || _globals[kHandsetCellStatus] ? 1 : 2;
dialogs.show(425);
}
- } else if (action.isAction(306, 369)) {
+ } else if (action.isAction(VERB_SET, 369)) {
dialogs.show(427);
} else if (action.isAction(VERB_PUT, 42, 73) || action.isAction(VERB_PUT, 43, 73)) {
_objects.setRoom(OBJ_CHICKEN, PLAYER_INVENTORY);
@@ -578,7 +578,7 @@ void GameNebular::unhandledAction() {
if (action.isAction(VERB_THROW, NOUN_BOMB) || action.isAction(VERB_THROW, NOUN_BOMBS)
|| action.isAction(VERB_THROW, NOUN_TIMEBOMB) || action.isAction(VERB_THROW, NOUN_CHICKEN_BOMB))
_vm->_dialogs->show(42);
- else if (action.isAction(0x6C))
+ else if (action.isAction(VERB_DISASSEMBLE))
_vm->_dialogs->show(435);
else if ((action.isAction(VERB_EAT, NOUN_DEAD_FISH) || action.isAction(VERB_EAT, NOUN_STUFFED_FISH)) && _vm->_game->_objects.isInInventory(_vm->_game->_objects.getIdFromDesc(action._activeAction._objectNameId)))
_vm->_dialogs->show(12);
@@ -589,10 +589,10 @@ void GameNebular::unhandledAction() {
else if ((action.isAction(VERB_SHOOT) || action.isAction(VERB_HOSE_DOWN)) && action.isObject(NOUN_BLOWGUN)) {
if ((_scene._currentSceneId >= 104) && (_scene._currentSceneId <= 111))
_vm->_dialogs->show(38);
- else if (action.isAction(0x10D))
+ else if (action.isObject(NOUN_PIRANHA))
_vm->_dialogs->show(41);
- else if (action.isObject(NOUN_CHICKEN) || action.isAction(0x185) || action.isAction(0x14D)
- || action.isAction(0x1DD) || action.isAction(0x15F) || action.isObject(NOUN_CAPTIVE_CREATURE)) {
+ else if (action.isObject(NOUN_CHICKEN) || action.isObject(NOUN_VULTURE) || action.isObject(NOUN_SPIDER)
+ || action.isObject(NOUN_YELLOW_BIRD) || action.isObject(NOUN_SWOOPING_CREATURE) || action.isObject(NOUN_CAPTIVE_CREATURE)) {
_vm->_dialogs->show(40);
} else
_vm->_dialogs->show(39);
@@ -618,7 +618,7 @@ void GameNebular::unhandledAction() {
else
_vm->_dialogs->show(6);
} else if (action.isAction(VERB_LOOK)) {
- if (action.isAction(0x27) && (action._activeAction._indirectObjectId > 0))
+ if (action.isObject(NOUN_BINOCULARS) && (action._activeAction._indirectObjectId > 0))
_vm->_dialogs->show(10);
else if (randVal < 600)
_vm->_dialogs->show(7);
@@ -667,9 +667,9 @@ void GameNebular::unhandledAction() {
_vm->_dialogs->show(28);
else
_vm->_dialogs->show(29);
- } else if (!action.isAction(VERB_WALKTO) && !action.isAction(0x187) && !action.isAction(0x18C) && !action.isAction(0x1AD)
- && !action.isAction(0x15C) && !action.isAction(0x159) && !action.isAction(0x15A) && !action.isAction(0x15B)
- && !action.isAction(0x15E)) {
+ } else if (!action.isAction(VERB_WALKTO) && !action.isAction(VERB_WALK_ACROSS) && !action.isAction(VERB_WALK_TOWARDS) && !action.isAction(VERB_WALK_DOWN)
+ && !action.isAction(VERB_SWIM_TO) && !action.isAction(VERB_SWIM_ACROSS) && !action.isAction(VERB_SWIM_INTO) && !action.isAction(VERB_SWIM_THROUGH)
+ && !action.isAction(VERB_SWIM_UNDER)) {
if (randVal <= 100)
_vm->_dialogs->show(36);
else if (randVal <= 200)
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index 8df43e9..822aa56 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -49,10 +49,12 @@ enum Verb {
VERB_CLIMB_UP = 0x050,
VERB_CUT = 0x061,
VERB_DAMPEN = 0x064,
+ VERB_DISASSEMBLE = 0x06C,
VERB_DIVE_INTO = 0x06D,
VERB_DRINK = 0x072,
VERB_EAT = 0x075,
VERB_EXAMINE = 0x07D,
+ VERB_FILL = 0x085,
VERB_HOSE_DOWN = 0x0A6,
VERB_IGNITE = 0x0B4,
VERB_INFLATE = 0x0B5,
@@ -67,19 +69,26 @@ enum Verb {
VERB_PRESS = 0x11A,
VERB_PRY = 0x11C,
VERB_READ = 0x11F,
+ VERB_SET = 0x132,
+ VERB_SHARPEN = 0x134,
VERB_SHOOT = 0x13A,
VERB_SIT_IN = 0x13F,
VERB_SMELL = 0x147,
VERB_STARE_AT = 0x155,
+ VERB_SWIM_ACROSS = 0x159,
VERB_SWIM_INTO = 0x15A,
VERB_SWIM_THROUGH = 0x15B,
VERB_SWIM_TO = 0x15C,
VERB_SWIM_TOWARDS = 0x15D,
VERB_SWIM_UNDER = 0x15E,
+ VERB_TIE = 0x170,
VERB_UNLOCK = 0x17B,
+ VERB_WALK_ACROSS = 0x187,
VERB_WALK_INSIDE = 0x188,
+ VERB_WALK_OUTSIDE = 0x18A,
VERB_WALK_THROUGH = 0x18B,
VERB_WALK_TOWARDS = 0x18C,
+ VERB_WEAR = 0x191,
VERB_WALK_DOWN = 0x1AD,
VERB_LEAVE = 0x1CD,
VERB_EXIT_FROM = 0x1CE,
@@ -93,12 +102,16 @@ enum Verb {
VERB_CLIMB_INTO = 0x2F7,
VERB_STEP_INTO = 0x2F9,
VERB_CRAWL_TO = 0x2FB,
+ VERB_CRAWL_DOWN = 0x301,
VERB_SIT_ON = 0x30B,
VERB_WALK_ALONG = 0x312,
+ VERB_GET_INSIDE = 0x325,
VERB_WALK = 0x32F,
VERB_REFLECT = 0x365,
VERB_GET_INTO = 0x36A,
+ VERB_STEER_TOWARDS = 0x3B1,
VERB_ENTER = 0x3B8,
+ VERB_PUT_DOWN = 0x46F,
VERB_INSTALL = 0x474,
VERB_REMOVE = 0x476
};
@@ -236,7 +249,7 @@ enum Noun {
NOUN_FIELD_TO_NORTH = 0x82,
NOUN_FIELD_TO_SOUTH = 0x83,
NOUN_FIELD_TO_WEST = 0x84,
- NOUN_FILL = 0x85,
+ //NOUN_FILL = 0x85,
NOUN_FIRE_PIT = 0x86,
NOUN_FISHING_LINE = 0x87,
NOUN_FISHING_ROD = 0x88,
@@ -411,7 +424,7 @@ enum Noun {
NOUN_SECURITY_CARD = 0x131,
//NOUN_SET = 0x132,
NOUN_SHAKE_HANDS = 0x133,
- NOUN_SHARPEN = 0x134,
+ //NOUN_SHARPEN = 0x134,
NOUN_SHIELD_ACCESS_PANEL = 0x135,
NOUN_SHIELD_GENERATOR = 0x136,
NOUN_SHIELD_MODULATOR = 0x137,
@@ -1048,7 +1061,7 @@ enum Noun {
NOUN_DASH = 0x3AE,
NOUN_SPLASH = 0x3AF,
NOUN_DOCK_TO_SOUTH = 0x3B0,
- NOUN_STEER_TOWARDS = 0x3B1,
+ //NOUN_STEER_TOWARDS = 0x3B1,
NOUN_BUILDING_TO_NORTH = 0x3B2,
NOUN_VOLCANO_RIM = 0x3B3,
NOUN_OPEN_WATER_TO_SOUTH = 0x3B4,
@@ -1238,7 +1251,7 @@ enum Noun {
NOUN_NAME_PLATE = 0x46C,
NOUN_OLD_VASE = 0x46D,
NOUN_PORTRAIT = 0x46E,
- NOUN_PUT_DOWN = 0x46F,
+ //NOUN_PUT_DOWN = 0x46F,
NOUN_TALL_BUILDING = 0x470,
NOUN_OBNOXIOUS_DOG = 0x471,
NOUN_GUTS = 0x472,
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index f93ea39..3562a62 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1581,9 +1581,9 @@ void Scene207::preActions() {
_game._player._walkOffScreenSceneId = 208;
if ((_action.isAction(VERB_WALKTO)) || (_action.isAction(VERB_LOOK))) {
- if (_action.isAction(0x185)) {
+ if (_action.isObject(NOUN_VULTURE)) {
_vultureTime = -9999;
- } else if (_action.isAction(0x14D)) {
+ } else if (_action.isObject(NOUN_SPIDER)) {
_spiderTime = -9999;
}
}
@@ -3551,7 +3551,7 @@ void Scene209::actions() {
}
if (_action.isAction(VERB_THROW, NOUN_MONKEY) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) {
- if (!_action.isAction(0x114)) {
+ if (!_action.isObject(NOUN_POISON_DARTS)) {
_vm->_dialogs->show(20915);
}
_action._inProgress = false;
@@ -5102,7 +5102,7 @@ void Scene214::step() {
void Scene214::actions() {
if (_action._lookFlag)
_vm->_dialogs->show(21427);
- else if (_action.isAction(0x18A, 0xAA))
+ else if (_action.isAction(VERB_WALK_OUTSIDE, 0xAA))
_scene->_nextSceneId = 207;
else if (_action.isAction(VERB_TAKE, NOUN_POISON_DARTS) && (_game._trigger || _game._objects.isInRoom(OBJ_POISON_DARTS))) {
switch (_game._trigger) {
@@ -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(0x18A, 0xAA))
+ } else if (_action.isAction(VERB_WALK_OUTSIDE, 0xAA))
_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 d54ffbd..a5bf187 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -1153,7 +1153,7 @@ void Scene307::actions() {
_vm->_dialogs->show(30713);
else if (_action.isAction(VERB_LOOK, NOUN_TOILET))
_vm->_dialogs->show(30714);
- else if (_action.isAction(0x134, 0x12C))
+ else if (_action.isAction(VERB_SHARPEN, NOUN_SCALPEL))
_vm->_dialogs->show(30716);
else if (_action.isAction(VERB_LOOK, NOUN_CELL_WALL))
_vm->_dialogs->show(30717);
@@ -1926,7 +1926,7 @@ void Scene313::actions() {
_vm->_dialogs->show(31301);
}
_scene->_nextSceneId = 366;
- } else if (!_action.isAction(0x301, 0x2D4))
+ } else if (!_action.isAction(VERB_CRAWL_DOWN, NOUN_AIR_SHAFT))
return;
_action._inProgress = false;
@@ -3134,7 +3134,7 @@ void Scene319::enter() {
_slacheInitFl = true;
if (_globals[kRexHasMetSlache]) {
- handleSlacheDialogs(0x18A, 2, 9999999);
+ handleSlacheDialogs(VERB_WALK_OUTSIDE, 2, 9999999);
_slachePosY = 3;
} else {
handleSlacheDialogs(0x186, 4, 9999999);
@@ -4279,7 +4279,7 @@ void Scene352::preActions() {
if (_action.isAction(VERB_OPEN, NOUN_VAULT))
_game._player.walk(Common::Point(266, 111), FACING_NORTHEAST);
- if (_vaultOpenFl && !_action.isAction(0x1F8) && !_action.isAction(0x2F6) && !_action.isAction(0x2F5) && !_action.isAction(0x2F4)) {
+ if (_vaultOpenFl && !_action.isObject(NOUN_VAULT) && !_action.isObject(NOUN_LAMP) && !_action.isObject(NOUN_OTHER_STUFF) && !_action.isObject(NOUN_YOUR_STUFF)) {
if (_globals[kHaveYourStuff]) {
_commonSpriteIndex = _globals._spriteIndexes[13];
_commonSequenceIdx = _globals._sequenceIndexes[13];
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index b1b2b09..d803b62 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -2032,7 +2032,7 @@ void Scene402::preActions() {
_game._player._needToWalk = true;
if (_roxOnStool) {
- if (_action.isAction(VERB_LOOK) || _action.isAction(0x24A) || _action.isAction(VERB_TALKTO))
+ if (_action.isAction(VERB_LOOK) || _action.isObject(NOUN_BAR_STOOL) || _action.isAction(VERB_TALKTO))
_game._player._needToWalk = false;
if (_action.isAction(VERB_TAKE, NOUN_REPAIR_LIST) || _action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP))
@@ -2917,7 +2917,7 @@ void Scene408::enter() {
}
void Scene408::preActions() {
- if ((_action.isAction(VERB_TAKE) && !_action.isAction(0x167)) || _action.isAction(VERB_PULL, NOUN_PIN) || _action.isAction(VERB_OPEN, NOUN_CARTON))
+ if ((_action.isAction(VERB_TAKE) && !_action.isObject(NOUN_TARGET_MODULE)) || _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(OBJ_TARGET_MODULE)) || _action.isAction(VERB_LOOK, NOUN_CHEST))
@@ -3160,7 +3160,7 @@ void Scene410::step() {
}
void Scene410::preActions() {
- if (_action.isAction(VERB_TAKE) && !_action.isAction(0x48))
+ if (_action.isAction(VERB_TAKE) && !_action.isObject(NOUN_CHARGE_CASES))
_game._player._needToWalk = false;
if (_action.isAction(VERB_LOOK, NOUN_CHARGE_CASES) && _game._objects.isInRoom(OBJ_CHARGE_CASES))
@@ -3934,7 +3934,7 @@ void Scene411::actions() {
_vm->_dialogs->showItem(OBJ_FORMALDEHYDE, 41124);
if (_action.isAction(VERB_PUT, NOUN_KETTLE)) {
- if (_action.isAction(0x2D7) || _action.isAction(0x2D6) || _action.isAction(0x3A9) || _action.isAction(0x306)) {
+ if (_action.isObject(NOUN_PETROX) || _action.isObject(NOUN_FORMALDEHYDE) || _action.isObject(NOUN_LECITHIN) || _action.isObject(NOUN_ALIEN_LIQUOR)) {
_newIngredient = _game._objects.getIdFromDesc(_action._activeAction._objectNameId);
switch (_newIngredient) {
case (OBJ_ALIEN_LIQUOR):
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index a8c6b22..822fbdf 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -1994,10 +1994,10 @@ void Scene511::preActions() {
if (!_handingLine)
return;
- if (_action.isAction(VERB_LOOK) || _action.isAction(0x87) || _action.isAction(VERB_TALKTO))
+ if (_action.isAction(VERB_LOOK) || _action.isObject(NOUN_FISHING_LINE) || _action.isAction(VERB_TALKTO))
_game._player._needToWalk = false;
- if ((!_action.isAction(0x170, 0x87, 0x345) || !_action.isAction(0x19, 0x87, 0x345)) && _game._player._needToWalk) {
+ if ((!_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || !_action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_BOAT)) && _game._player._needToWalk) {
if (_game._trigger == 0) {
_game._player._readyToWalk = false;
_game._player._stepEnabled = false;
@@ -2085,7 +2085,7 @@ void Scene511::actions() {
} else {
_vm->_dialogs->show(51130);
}
- } else if (_action.isAction(0x170, 0x87, 0x345) || _action.isAction(0x19, 0x87, 0x345)) {
+ } else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_BOAT)) {
if (_globals[kBoatRaised])
_vm->_dialogs->show(51131);
else if (_globals[kLineStatus] == 1)
@@ -2141,8 +2141,8 @@ void Scene511::actions() {
else if (_action.isAction(VERB_UNLOCK, 0xFF, 0x37C) || _action.isAction(VERB_UNLOCK, 0x6F, 0x37C))
_vm->_dialogs->show(51119);
else if ( (_action.isAction(VERB_PUT) || _action.isAction(VERB_THROW))
- && (_action.isAction(0x171) || _action.isAction(0x2A) || _action.isAction(0x2B))
- && _action.isAction(0x37C))
+ && (_action.isObject(NOUN_TIMEBOMB) || _action.isObject(NOUN_BOMB) || _action.isObject(NOUN_BOMBS))
+ && _action.isObject(NOUN_DOME_ENTRANCE))
_vm->_dialogs->show(51120);
else if (_action.isAction(VERB_LOOK, NOUN_RESTAURANT)) {
if (_globals[kBoatRaised])
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 1821a72..6231550 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -149,7 +149,7 @@ void Scene601::step() {
void Scene601::actions() {
if (_action.isAction(VERB_WALK_THROUGH, NOUN_ENTRANCE))
_scene->_nextSceneId = 602;
- else if (_action.isAction(0x325, 0x324)) {
+ else if (_action.isAction(VERB_GET_INSIDE, NOUN_CAR)) {
switch (_game._trigger) {
case 0:
_game._player._stepEnabled = false;
@@ -688,9 +688,9 @@ void Scene603::actions() {
} else if (_action.isAction(VERB_LOOK, NOUN_COMPACT_CASE) && (_action._mainObjectSource == 4))
_vm->_dialogs->show(60329);
// For the next two checks, the second part of the check wasn't surrounded par parenthesis, which was obviously wrong
- else if (_action.isAction(VERB_LOOK) && (_action.isAction(0x31) || _action.isAction(0x3EA) || _action.isAction(0x3E8)))
+ else if (_action.isAction(VERB_LOOK) && (_action.isObject(NOUN_BRA) || _action.isObject(NOUN_BOA) || _action.isObject(NOUN_SLIP)))
_vm->_dialogs->show(60331);
- else if (_action.isAction(VERB_TAKE) && (_action.isAction(0x31) || _action.isAction(0x3EA) || _action.isAction(0x3E8)))
+ else if (_action.isAction(VERB_TAKE) && (_action.isObject(NOUN_BRA) || _action.isObject(NOUN_BOA) || _action.isObject(NOUN_SLIP)))
_vm->_dialogs->show(60332);
else
return;
@@ -904,7 +904,7 @@ void Scene604::handleBombActions() {
}
void Scene604::actions() {
- if (_action.isAction(0x325, 0x324)) {
+ if (_action.isAction(VERB_GET_INSIDE, NOUN_CAR)) {
switch (_game._trigger) {
case 0:
_game._player._stepEnabled = false;
@@ -943,9 +943,9 @@ void Scene604::actions() {
break;
}
} else if ((_action.isAction(VERB_PUT, NOUN_LEDGE) || _action.isAction(VERB_PUT, NOUN_VIEWPORT) || _action.isAction(VERB_THROW, NOUN_VIEWPORT))
- && (_action.isAction(0x2A) || _action.isAction(0x2B)))
+ && (_action.isObject(NOUN_BOMB) || _action.isObject(NOUN_BOMBS)))
_vm->_dialogs->show(60420);
- else if (_action.isAction(VERB_PUT, NOUN_TIMEBOMB, 0x3F6) || _action.isAction(VERB_PUT, NOUN_TIMEBOMB, 0x181)) {
+ else if (_action.isAction(VERB_PUT, NOUN_TIMEBOMB, NOUN_LEDGE) || _action.isAction(VERB_PUT, NOUN_TIMEBOMB, NOUN_VIEWPORT)) {
_bombMode = 1;
if ((_game._difficulty == DIFFICULTY_HARD) || _globals[kWarnedFloodCity])
handleBombActions();
@@ -1393,7 +1393,7 @@ void Scene607::preActions() {
void Scene607::actions() {
if (_action.isAction(VERB_WALK_THROUGH, NOUN_SIDE_ENTRANCE))
_scene->_nextSceneId = 608;
- else if (_action.isAction(0x325, 0x324)) {
+ else if (_action.isAction(VERB_GET_INSIDE, NOUN_CAR)) {
switch (_game._trigger) {
case 0:
_game._player._stepEnabled = false;
@@ -1490,7 +1490,7 @@ void Scene607::actions() {
_vm->_dialogs->show(60728);
else if (_action.isAction(VERB_WALK_DOWN, NOUN_STREET))
_vm->_dialogs->show(60730);
- else if (_action.isAction(0x3FF) && (_action.isAction(VERB_OPEN) || _action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL)))
+ else if (_action.isObject(NOUN_GARAGE_DOOR) && (_action.isAction(VERB_OPEN) || _action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL)))
_vm->_dialogs->show(60731);
else
return;
@@ -2466,11 +2466,11 @@ void Scene608::actions() {
_vm->_dialogs->show(60812);
else
_vm->_dialogs->show(60811);
- } else if (_action.isAction(VERB_LOOK) && (_action.isAction(0x412) || _action.isAction(0x408) || _action.isAction(0x414)
- || _action.isAction(0x40D) || _action.isAction(0x41C)))
+ } else if (_action.isAction(VERB_LOOK) && (_action.isObject(NOUN_MUFFLER) || _action.isObject(NOUN_CAR_SEAT) || _action.isObject(NOUN_HUBCAP)
+ || _action.isObject(NOUN_COILS) || _action.isObject(NOUN_QUARTER_PANEL)))
_vm->_dialogs->show(60813);
- else if (_action.isAction(VERB_TAKE) && (_action.isAction(0x412) || _action.isAction(0x408) || _action.isAction(0x414)
- || _action.isAction(0x40D) || _action.isAction(0x41C)))
+ else if (_action.isAction(VERB_TAKE) && (_action.isObject(NOUN_MUFFLER) || _action.isObject(NOUN_CAR_SEAT) || _action.isObject(NOUN_HUBCAP)
+ || _action.isObject(NOUN_COILS) || _action.isObject(NOUN_QUARTER_PANEL)))
_vm->_dialogs->show(60814);
else if (_action.isAction(VERB_LOOK, NOUN_GARAGE_FLOOR) || _action.isAction(VERB_LOOK, NOUN_FRONT_OF_GARAGE) || _action.isAction(VERB_LOOK, NOUN_REAR_OF_GARAGE)) {
if (_dogActiveFl)
@@ -2790,7 +2790,7 @@ void Scene609::actions() {
} else if (_action.isAction(VERB_UNLOCK, 0x6F, 0x425)) {
_videoDoorMode = 1;
enterStore();
- } else if (_action.isAction(0x325, 0x324)) {
+ } else if (_action.isAction(VERB_GET_INSIDE, NOUN_CAR)) {
switch (_game._trigger) {
case 0:
_game._player._stepEnabled = false;
@@ -3046,10 +3046,10 @@ void Scene610::actions() {
else if (_action.isAction(VERB_PUT, NOUN_RETURN_SLOT)
&& _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId)))
_vm->_dialogs->show(61029);
- else if ( _action.isAction(0x44F) || _action.isAction(0x444) || _action.isAction(0x430)
- || _action.isAction(0x44C) || _action.isAction(0x44D) || _action.isAction(0x446)
- || _action.isAction(0x497) || _action.isAction(0x449) || _action.isAction(0x44E)
- || _action.isAction(0x450) || _action.isAction(0x42C)) {
+ else if ( _action.isObject(NOUN_CLASSIC_VIDEOS) || _action.isObject(NOUN_MORE_CLASSIC_VIDEOS) || _action.isObject(NOUN_DRAMA_VIDEOS)
+ || _action.isObject(NOUN_NEW_RELEASE_VIDEOS) || _action.isObject(NOUN_PORNO_VIDEOS) || _action.isObject(NOUN_EDUCATIONAL_VIDEOS)
+ || _action.isObject(NOUN_INSTRUCTIONAL_VIDEOS) || _action.isObject(NOUN_WORKOUT_VIDEOS) || _action.isObject(NOUN_FOREIGN_VIDEOS)
+ || _action.isObject(NOUN_ADVENTURE_VIDEOS) || _action.isObject(NOUN_COMEDY_VIDEOS)) {
if (_action.isAction(VERB_LOOK))
_vm->_dialogs->show(61030);
else if (_action.isAction(VERB_TAKE))
@@ -4441,7 +4441,7 @@ void Scene611::actions() {
_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(nextQuote));
_scene->_sequences.addTimer(120, 90);
}
- } else if ((_action.isAction(VERB_WALKTO) || _action.isAction(VERB_LOOK)) && _action.isAction(0x275)) {
+ } else if ((_action.isAction(VERB_WALKTO) || _action.isAction(VERB_LOOK)) && _action.isObject(NOUN_RAT)) {
switch (_game._trigger) {
case 0:
_scene->_kernelMessages.reset();
@@ -4633,7 +4633,7 @@ void Scene612::step() {
}
void Scene612::actions() {
- if (_action.isAction(0x325, 0x324)) {
+ if (_action.isAction(VERB_GET_INSIDE, NOUN_CAR)) {
switch (_game._trigger) {
case 0:
_game._player._stepEnabled = false;
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 08b85bf..6054847 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(0x3B1, 0x3B0)) {
+ else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B0)) {
_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(0x3B1, 0x3B2)) {
+ } else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B2)) {
_game._player._stepEnabled = false;
if (_globals[kMonsterAlive]) {
_startMonsterTimer = false;
@@ -1078,7 +1078,7 @@ void Scene703::actions() {
_scene->freeAnimation();
_monsterMode = 2;
_scene->loadAnimation(formAnimName('C', -1));
- } else if (_action.isAction(VERB_PUT, NOUN_BOTTLE, 0x18F) || _action.isAction(0x85, 0x2E, 0x18F)) {
+ } else if (_action.isAction(VERB_PUT, NOUN_BOTTLE, NOUN_WATER) || _action.isAction(VERB_FILL, NOUN_BOTTLE, NOUN_WATER)) {
if (_globals[kBottleStatus] != 4) {
handleBottleInterface();
_dialog1.start();
@@ -1414,13 +1414,13 @@ void Scene704::step() {
void Scene704::actions() {
if (_game._screenObjects._inputMode == 1)
handleFillBottle(_action._activeAction._verbId);
- else if (_action.isAction(0x3B1, 0x3B4)) {
+ else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B4)) {
_game._player._stepEnabled = false;
if (_boatDirection == 1)
_animationMode = 5;
else
_animationMode = 3;
- } else if (_action.isAction(0x3B1, 0x3B2)) {
+ } else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B2)) {
_game._player._stepEnabled = false;
if (_boatDirection == 2)
_animationMode = 4;
@@ -1436,7 +1436,7 @@ void Scene704::actions() {
_animationMode = 7;
}
}
- } else if (_action.isAction(VERB_PUT, NOUN_BOTTLE, 0x18F) || _action.isAction(0x85, 0x2E, 0x18F)) {
+ } else if (_action.isAction(VERB_PUT, NOUN_BOTTLE, NOUN_WATER) || _action.isAction(VERB_FILL, NOUN_BOTTLE, NOUN_WATER)) {
if (_game._objects.isInInventory(OBJ_BOTTLE)) {
if (_globals[kBottleStatus] != 4) {
_takeBottleFl = false;
@@ -1664,7 +1664,7 @@ void Scene705::step() {
void Scene705::actions() {
if (_game._screenObjects._inputMode == 1)
handleFillBottle(_action._activeAction._verbId);
- else if (_action.isAction(0x3B1, 0x3B4)) {
+ else if (_action.isAction(VERB_STEER_TOWARDS, 0x3B4)) {
switch (_game._trigger) {
case 0:
_game._player._stepEnabled = false;
@@ -1710,7 +1710,7 @@ void Scene705::actions() {
default:
break;
}
- } else if (_action.isAction(0x85, 0x2E, 0x18F) || _action.isAction(VERB_PUT, NOUN_BOTTLE, 0x18F)) {
+ } else if (_action.isAction(VERB_FILL, NOUN_BOTTLE, NOUN_WATER) || _action.isAction(VERB_PUT, NOUN_BOTTLE, NOUN_WATER)) {
if (_globals[kBottleStatus] != 4) {
handleBottleInterface();
_dialog1.start();
@@ -2106,7 +2106,7 @@ void Scene710::step() {
}
void Scene710::actions() {
- if (_action.isAction(0x46F, 0x27)) {
+ if (_action.isAction(VERB_PUT_DOWN, 0x27)) {
_game._player._stepEnabled = false;
if (_game._globals[kCityFlooded])
@@ -2319,10 +2319,10 @@ void Scene751::preActions() {
if (!_rexHandingLine)
return;
- if (_action.isAction(VERB_LOOK) || _action.isAction(0x87) || _action.isAction(VERB_TALKTO))
+ 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(0x170, 0x87, 0x467) || !_action.isAction(0x19, 0x87, 0x467))
+ 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))
&& (_game._player._needToWalk)) {
switch (_game._trigger) {
case 0:
@@ -2419,7 +2419,7 @@ void Scene751::actions() {
default:
break;
}
- } else if (_action.isAction(VERB_PUT, NOUN_FISHING_LINE, 0x467) || _action.isAction(0x170, 0x87, 0x467) || _action.isAction(0x19, 0x87, 0x467)) {
+ } 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)) {
if (_globals[kLineStatus] == 1) {
switch (_game._trigger) {
case 0:
@@ -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(0x170, 0x87, 0x316) || _action.isAction(0x19, 0x87, 0x316))
+ else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, 0x316) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, 0x316))
_vm->_dialogs->show(75123);
else
return;
More information about the Scummvm-git-logs
mailing list