diff options
author | Filippos Karapetis | 2014-05-20 06:47:18 +0300 |
---|---|---|
committer | Filippos Karapetis | 2014-05-20 06:47:18 +0300 |
commit | 59d7f8bfc00456eb34357d2eba12223f80c0f0f9 (patch) | |
tree | e53a3fa47108c30bdce939020ebbd806a113497b /engines/mads | |
parent | e409f4dedd989b49184a865f59dc152e85303489 (diff) | |
download | scummvm-rg350-59d7f8bfc00456eb34357d2eba12223f80c0f0f9.tar.gz scummvm-rg350-59d7f8bfc00456eb34357d2eba12223f80c0f0f9.tar.bz2 scummvm-rg350-59d7f8bfc00456eb34357d2eba12223f80c0f0f9.zip |
MADS: Replace most of the action nouns with their friendly names
Diffstat (limited to 'engines/mads')
-rw-r--r-- | engines/mads/nebular/nebular_scenes.h | 1274 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes1.cpp | 274 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 378 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes3.cpp | 520 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes4.cpp | 506 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes5.cpp | 378 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes6.cpp | 364 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes7.cpp | 150 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes8.cpp | 140 |
9 files changed, 2547 insertions, 1437 deletions
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h index 75e00773cb..d97fa4b284 100644 --- a/engines/mads/nebular/nebular_scenes.h +++ b/engines/mads/nebular/nebular_scenes.h @@ -98,93 +98,1203 @@ enum Verb { }; enum Noun { - NOUN_BIG_LEAVES = 0x23, - NOUN_BINOCULARS = 0x27, - NOUN_BLOWGUN = 0x29, - NOUN_BOMB = 0x2A, - NOUN_BOMBS = 0x2B, - NOUN_BONE = 0x2C, - NOUN_BONES = 0x2D, - NOUN_BURGER = 0x35, - NOUN_CHAIR = 0x47, - NOUN_CHICKEN = 0x49, - NOUN_CHICKEN_BOMB = 0x4A, - NOUN_CONTROL_PANEL = 0x59, - NOUN_DEAD_FISH = 0x65, - NOUN_DOOR = 0x6E, - NOUN_DRAWER = 0x71, - NOUN_ENTER_KEY = 0x7A, - NOUN_FISHING_LINE = 0x87, - NOUN_FISHING_ROD = 0x88, - NOUN_FRONT_WINDOW = 0x8E, - NOUN_FUZZY_DICE = 0x91, - NOUN_HOTPANTS = 0x0A7, - NOUN_HULL = 0x0A8, - NOUN_ID_CARD = 0x0B3, - NOUN_JUNGLE = 0x0B8, - NOUN_KEYPAD = 0x0C4, - NOUN_LADDER = 0x0C7, - NOUN_LIFE_SUPPORT_SECTION = 0x0CC, - NOUN_LOG = 0x0D0, - NOUN_MONKEY = 0x0E3, - NOUN_OUTER_HULL = 0x0F8, - NOUN_OUTSIDE = 0x0F9, - NOUN_PIRANHA = 0x10D, - NOUN_PLANT_STALK = 0x10F, - NOUN_REFRIGERATOR = 0x122, - NOUN_ROBO_KITCHEN = 0x127, - NOUN_ROCK = 0x128, - NOUN_ROCKS = 0x129, - NOUN_SHIELD_ACCESS_PANEL = 0x135, - NOUN_SHIELD_MODULATOR = 0x137, - NOUN_SKULL = 0x140, - NOUN_TELEPORTER = 0x16C, - NOUN_BROKEN_LADDER = 0x1C9, - NOUN_STUFFED_FISH = 0x157, - NOUN_15F = 0x15F, - NOUN_TIMEBOMB = 0x171, - NOUN_TWINKIFRUIT = 0x17A, - NOUN_VIEW_SCREEN = 0x180, - NOUN_VIEWPORT = 0x181, - NOUN_DEEP_PIT = 0x19E, - NOUN_HUGE_LEGS = 0x1A8, - NOUN_LEAF_COVERED_PIT = 0x1A9, + NOUN_GAME = 0x1, + NOUN_QSAVE = 0x2, + NOUN_LOOK = 0x3, + NOUN_TAKE = 0x4, + NOUN_PUSH = 0x5, + NOUN_OPEN = 0x6, + NOUN_PUT = 0x7, + NOUN_TALK_TO = 0x8, + NOUN_GIVE = 0x9, + NOUN_PULL = 0xA, + NOUN_CLOSE = 0xB, + NOUN_THROW = 0xC, + NOUN_WALK_TO = 0xD, + NOUN_ACTIVATE = 0xE, + NOUN_ADMIRE = 0xF, + NOUN_ADSM = 0x10, + NOUN_AIR_VENT = 0x11, + NOUN_ALOE_PLANT = 0x12, + NOUN_ANEMONE = 0x13, + NOUN_ANOMOMETER = 0x14, + NOUN_AREA_AROUND_HUT = 0x15, + NOUN_AREA_TO_SOUTH = 0x16, + NOUN_AREA_TO_WEST = 0x17, + NOUN_AROMATIC_MEAT = 0x18, + NOUN_ATTACH = 0x19, + NOUN_AUDIO_TAPE = 0x1A, + NOUN_AUXILIARY_POWER = 0x1B, + NOUN_BADMITTON_BRAT = 0x1C, + NOUN_BAG = 0x1D, + NOUN_BAMBOO_TREE = 0x1E, + NOUN_BATS = 0x1F, + NOUN_BAWLEMER_ORIOLE_HUN = 0x20, + NOUN_BEAR_RUG = 0x21, + NOUN_BEASTLY_TROPHY = 0x22, + NOUN_BIG_LEAVES = 0x23, + NOUN_BIG_PIPES = 0x24, + NOUN_BIG_SKY = 0x25, + NOUN_BIG_STONE = 0x26, + NOUN_BINOCULARS = 0x27, + NOUN_BIRDIES = 0x28, + NOUN_BLOWGUN = 0x29, + NOUN_BOMB = 0x2A, + NOUN_BOMBS = 0x2B, + NOUN_BONE = 0x2C, + NOUN_BONES = 0x2D, + NOUN_BOTTLE = 0x2E, + NOUN_BOULDER = 0x2F, + NOUN_BOULDERS = 0x30, + NOUN_BRA = 0x31, + NOUN_BREAK = 0x32, + NOUN_BREATHE_AIR = 0x33, + NOUN_BULKHEAD = 0x34, + NOUN_BURGER = 0x35, + NOUN_BURN = 0x36, + NOUN_BURNT_OUT_WARP_COIL = 0x37, + NOUN_BUSH_LIKE_FORMATION = 0x38, + NOUN_BUSHES = 0x39, + NOUN_BUSHY_FERN = 0x3A, + NOUN_CACTUS = 0x3B, + NOUN_CARD = 0x3C, + NOUN_CAST = 0x3D, + NOUN_CAULDRON = 0x3E, + NOUN_CAVE = 0x3F, + NOUN_CAVE_CEILING = 0x40, + NOUN_CAVE_ENTRANCE = 0x41, + NOUN_CAVE_EXIT = 0x42, + NOUN_CAVE_FLOOR = 0x43, + NOUN_CAVE_TO_EAST = 0x44, + NOUN_CAVE_WALL = 0x45, + NOUN_CEILING = 0x46, + NOUN_CHAIR = 0x47, + NOUN_CHARGE_CASES = 0x48, + NOUN_CHICKEN = 0x49, + NOUN_CHICKEN_BOMB = 0x4A, + NOUN_CLEARING_TO_EAST = 0x4B, + NOUN_CLEARING_TO_SOUTH = 0x4C, + NOUN_CLIFF_FACE = 0x4D, + NOUN_CLIMB_DOWN = 0x4E, + NOUN_CLIMB_THROUGH = 0x4F, + NOUN_CLIMB_UP = 0x50, + NOUN_CLOCK = 0x51, + NOUN_CLOSET = 0x52, + NOUN_CLOTHESLINE = 0x53, + NOUN_CLUMP_OF_TREES = 0x54, + NOUN_COAL = 0x55, + NOUN_COCOANUT = 0x56, + NOUN_COMPACT_CASE = 0x57, + NOUN_COMPUTER_GAME = 0x58, + NOUN_CONTROL_PANEL = 0x59, + NOUN_CORAL = 0x5A, + NOUN_CRAB = 0x5B, + NOUN_CREDIT_CHIP = 0x5C, + NOUN_CUMULOUS_CLOUD = 0x5D, + NOUN_CURIOUS_WEED_PATCH = 0x5E, + NOUN_CURTAIN = 0x5F, + NOUN_CURTAINS = 0x60, + NOUN_CUT = 0x61, + NOUN_DAMAGE_CONTROL = 0x62, + NOUN_DAMAGE_CONTROL_PANEL = 0x63, + NOUN_DAMPEN = 0x64, + NOUN_DEAD_FISH = 0x65, + NOUN_DEAD_PURPLE_MONSTER = 0x66, + NOUN_DECLIVITOUS_CHASM = 0x67, + NOUN_DEEP_DARK_FOREST = 0x68, + NOUN_DENSE_FOREST = 0x69, + NOUN_DETONATORS = 0x6A, + NOUN_DINO_MITE = 0x6B, + NOUN_DISASSEMBLE = 0x6C, + NOUN_DIVE_INTO = 0x6D, + NOUN_DOOR = 0x6E, + NOUN_DOOR_KEY = 0x6F, + NOUN_DOORWAY = 0x70, + NOUN_DRAWER = 0x71, + NOUN_DRINK = 0x72, + NOUN_DURAFAIL_CELLS = 0x73, + NOUN_EASTERN_CLIFF_FACE = 0x74, + NOUN_EAT = 0x75, + NOUN_EJECT = 0x76, + NOUN_EMPTY = 0x77, + NOUN_ENGINEERING_CONTROLS = 0x78, + NOUN_ENGINEERING_SECTION = 0x79, + NOUN_ENTER_KEY = 0x7A, + NOUN_ESCAPE_HATCH = 0x7B, + NOUN_ESTROTOXIN = 0x7C, + NOUN_EXAMINE = 0x7D, + NOUN_EXPERIMENT_CAGE = 0x7E, + NOUN_EXTINGUISH = 0x7F, + NOUN_FACE_ID = 0x80, + NOUN_FERN = 0x81, + NOUN_FIELD_TO_NORTH = 0x82, + NOUN_FIELD_TO_SOUTH = 0x83, + NOUN_FIELD_TO_WEST = 0x84, + NOUN_FILL = 0x85, + NOUN_FIRE_PIT = 0x86, + NOUN_FISHING_LINE = 0x87, + NOUN_FISHING_ROD = 0x88, + NOUN_FLOOR = 0x89, + NOUN_FLOOR_OF_HUT = 0x8A, + NOUN_FLOOR_TILE = 0x8B, + NOUN_FONDLE = 0x8C, + NOUN_FOREST_TO_EAST = 0x8D, + NOUN_FRONT_WINDOW = 0x8E, + NOUN_FUNGOIDS = 0x8F, + NOUN_FURNACE = 0x90, + NOUN_FUZZY_DICE = 0x91, + NOUN_GAZE = 0x92, + NOUN_GAZE_AT = 0x93, + NOUN_GAZE_IN = 0x94, + NOUN_GLANCE_AT = 0x95, + NOUN_GLOVE = 0x96, + NOUN_GNARLY_SHRUB = 0x97, + NOUN_GNAW_ON = 0x98, + NOUN_GORGE_ON = 0x99, + NOUN_GRAIN_ALCHOHOL = 0x9A, + NOUN_GRASSLAND_TO_EAST = 0x9B, + NOUN_GRASSLAND_TO_SOUTH = 0x9C, + NOUN_GRASSY_AREA = 0x9D, + NOUN_GRASSY_AREA_TO_NORTH = 0x9E, + NOUN_GRASSY_KNOLL = 0x9F, + NOUN_GRIND = 0xA0, + NOUN_GROOVILACTIC_TREE = 0xA1, + NOUN_GUARDS_ARM = 0xA2, + NOUN_HATCHWAY = 0xA3, + NOUN_HOOK_UP = 0xA4, + NOUN_HORIZON = 0xA5, + NOUN_HOSE_DOWN = 0xA6, + NOUN_HOTPANTS = 0xA7, + NOUN_HULL = 0xA8, + NOUN_HURL = 0xA9, + NOUN_HUT = 0xAA, + NOUN_HUT_AREA = 0xAB, + NOUN_HUT_TO_EAST = 0xAC, + NOUN_HUT_TO_SOUTH = 0xAD, + NOUN_HUT_TO_THE_SOUTH = 0xAE, + NOUN_HUT_TO_WEST = 0xAF, + NOUN_HUTS_TO_NORTH = 0xB0, + NOUN_HYDROSPANNER = 0xB1, + NOUN_HYPERDRIVE_JUMP_UNIT = 0xB2, + NOUN_ID_CARD = 0xB3, + NOUN_IGNITE = 0xB4, + NOUN_INFLATE = 0xB5, + NOUN_INSERT = 0xB6, + NOUN_INSPECT = 0xB7, + NOUN_JUNGLE = 0xB8, + NOUN_JUNGLE_TO_EAST = 0xB9, + NOUN_JUNGLE_TO_WEST = 0xBA, + NOUN_KEY_1 = 0xBB, + NOUN_KEY_2 = 0xBC, + NOUN_KEY_3 = 0xBD, + NOUN_KEY_4 = 0xBE, + NOUN_KEY_5 = 0xBF, + NOUN_KEY_6 = 0xC0, + NOUN_KEY_7 = 0xC1, + NOUN_KEY_8 = 0xC2, + NOUN_KEY_9 = 0xC3, + NOUN_KEYPAD = 0xC4, + NOUN_KNEELING_WOMAN = 0xC5, + NOUN_KNIFE = 0xC6, + NOUN_LADDER = 0xC7, + NOUN_LARGE_STALAGMITE = 0xC8, + NOUN_LEER_AT = 0xC9, + NOUN_LIBRARY_COMPUTER = 0xCA, + NOUN_LICK = 0xCB, + NOUN_LIFE_SUPPORT_SECTION = 0xCC, + NOUN_LIGHT = 0xCD, + NOUN_LOAD = 0xCE, + NOUN_LOCK = 0xCF, + NOUN_LOG = 0xD0, + NOUN_LOOK_AT = 0xD1, + NOUN_LOOK_IN = 0xD2, + NOUN_LOOK_THROUGH = 0xD3, + NOUN_LOUNGE_AREA = 0xD4, + NOUN_LOVE_ALTAR = 0xD5, + NOUN_LOWLANDS = 0xD6, + NOUN_MACHINE = 0xD7, + NOUN_MAGNET = 0xD8, + NOUN_MAIN_AIRLOCK = 0xD9, + NOUN_MANTA_RAY = 0xDA, + NOUN_MARSHY_WETLANDS = 0xDB, + NOUN_MATCH = 0xDC, + NOUN_MEDICAL_WASTE = 0xDD, + NOUN_MEDICINE_CABINET = 0xDE, + NOUN_MEN_WHO_CAME_BEFORE = 0xDF, + NOUN_MINE = 0xE0, + NOUN_MIRROR = 0xE1, + NOUN_MONITOR = 0xE2, + NOUN_MONKEY = 0xE3, + NOUN_MONKEY_LIVER_JUICE = 0xE4, + NOUN_MONSTER_SLUDGE = 0xE5, + NOUN_MOUNTAIN = 0xE6, + NOUN_MOUNTAIN_RANGE = 0xE7, + NOUN_MOUNTAINS = 0xE8, + NOUN_MTAM = 0xE9, + NOUN_MUSHROOMS = 0xEA, + NOUN_NAVIGATION_CONTROLS = 0xEB, + NOUN_NORTH_PATH = 0xEC, + NOUN_NORTHERN_EXPOSURE = 0xED, + NOUN_NORTHERN_SEA_CLIFF = 0xEE, + NOUN_OBSTACLE = 0xEF, + NOUN_OCEAN_FLOOR = 0xF0, + NOUN_ODD_ROCK_FORMATION = 0xF1, + NOUN_OOGLY_BOOGLY_JUICE = 0xF2, + NOUN_OPEN_AREA_TO_EAST = 0xF3, + NOUN_OPEN_AREA_TO_NORTH = 0xF4, + NOUN_OPEN_AREA_TO_SOUTH = 0xF5, + NOUN_OPEN_AREA_TO_WEST = 0xF6, + NOUN_OPEN_FIELD = 0xF7, + NOUN_OUTER_HULL = 0xF8, + NOUN_OUTSIDE = 0xF9, + NOUN_OVEN = 0xFA, + NOUN_OVERHANG_TO_EAST = 0xFB, + NOUN_OVERHANG_TO_WEST = 0xFC, + NOUN_OVERHEAD_LAMP = 0xFD, + NOUN_PAD_OF_PAPER = 0xFE, + NOUN_PADLOCK_KEY = 0xFF, + NOUN_PALM_TREE = 0x100, + NOUN_PASSAGE_WAY_TO_SOUTH = 0x101, + NOUN_PASSION_PUSS = 0x102, + NOUN_PEER_THROUGH = 0x103, + NOUN_PENCIL = 0x104, + NOUN_PENDULOUS_CRAG = 0x105, + NOUN_PENLIGHT = 0x106, + NOUN_PHONE_CELLS = 0x107, + NOUN_PHONE_HANDSET = 0x108, + NOUN_PILE_OF_ROCKS = 0x109, + NOUN_PILLOW = 0x10A, + NOUN_PILOTS_CHAIR = 0x10B, + NOUN_PIPE = 0x10C, + NOUN_PIRANHA = 0x10D, + NOUN_PLANT = 0x10E, + NOUN_PLANT_STALK = 0x10F, + NOUN_PLANTS = 0x110, + NOUN_PLASTIC_JESUS = 0x111, + NOUN_PLAY = 0x112, + NOUN_PLUNGER = 0x113, + NOUN_POISON_DARTS = 0x114, + NOUN_POLYCEMENT = 0x115, + NOUN_POOL = 0x116, + NOUN_POSTER = 0x117, + NOUN_POWER_STATUS_PANEL = 0x118, + NOUN_PRECIPICE = 0x119, + NOUN_PRESS = 0x11A, + NOUN_PRESSURE_GAUGE = 0x11B, + NOUN_PRY = 0x11C, + NOUN_RAGING_RIVER = 0x11D, + NOUN_RAMOLYAN_RUGBY_RATS = 0x11E, + NOUN_READ = 0x11F, + NOUN_REARVIEW_MIRROR = 0x120, + NOUN_REBREATHER = 0x121, + NOUN_REFRIGERATOR = 0x122, + NOUN_REMOTE = 0x123, + NOUN_REPAIR_LIST = 0x124, + NOUN_RIVER = 0x125, + NOUN_RIVER_TO_WEST = 0x126, + NOUN_ROBO_KITCHEN = 0x127, + NOUN_ROCK = 0x128, + NOUN_ROCKS = 0x129, + NOUN_ROCKY_AREA = 0x12A, + NOUN_ROLLING_HILL = 0x12B, + NOUN_SCALPEL = 0x12C, + NOUN_SCENIC_MOUNTAINS = 0x12D, + NOUN_SEA_CLIFF = 0x12E, + NOUN_SEAWEED = 0x12F, + NOUN_SEAWEED_BANK = 0x130, + NOUN_SECURITY_CARD = 0x131, + NOUN_SET = 0x132, + NOUN_SHAKE_HANDS = 0x133, + NOUN_SHARPEN = 0x134, + NOUN_SHIELD_ACCESS_PANEL = 0x135, + NOUN_SHIELD_GENERATOR = 0x136, + NOUN_SHIELD_MODULATOR = 0x137, + NOUN_SHIELD_STATUS_PANEL = 0x138, + NOUN_SHIP = 0x139, + NOUN_SHOOT = 0x13A, + NOUN_SHOVEL = 0x13B, + NOUN_SHRED = 0x13C, + NOUN_SHRUNKEN_HEADS = 0x13D, + NOUN_SINGED_MEAT = 0x13E, + NOUN_SIT_IN = 0x13F, + NOUN_SKULL = 0x140, + NOUN_SKULL_AND_CROSSBONES = 0x141, + NOUN_SKY = 0x142, + NOUN_SLEEP_ON = 0x143, + NOUN_SLITHERING_SNAKE = 0x144, + NOUN_SLUG_SECRETION = 0x145, + NOUN_SMALL_HOLE = 0x146, + NOUN_SMELL = 0x147, + NOUN_SNAKE = 0x148, + NOUN_SNIFF = 0x149, + NOUN_SOAK = 0x14A, + NOUN_SPECIAL_KEY_1 = 0x14B, + NOUN_SPECIAL_KEY_2 = 0x14C, + NOUN_SPIDER = 0x14D, + NOUN_SPILT_MILK = 0x14E, + NOUN_SPIT_FIRE = 0x14F, + NOUN_SPRAY = 0x150, + NOUN_STAB = 0x151, + NOUN_STAIRS = 0x152, + NOUN_STALAGMITES = 0x153, + NOUN_STAND_INSIDE = 0x154, + NOUN_STARE_AT = 0x155, + NOUN_STEPS = 0x156, + NOUN_STUFFED_FISH = 0x157, + NOUN_SURFACE = 0x158, + NOUN_SWIM_ACROSS = 0x159, + NOUN_SWIM_INTO = 0x15A, + NOUN_SWIM_THROUGH = 0x15B, + NOUN_SWIM_TO = 0x15C, + NOUN_SWIM_TOWARDS = 0x15D, + NOUN_SWIM_UNDER = 0x15E, + NOUN_SWOOPING_CREATURE = 0x15F, + NOUN_TABLE = 0x160, + NOUN_TAKE_LIVER = 0x161, + NOUN_TAKE_OFF = 0x162, + NOUN_TAKE_PAGE = 0x163, + NOUN_TALL_GRASS = 0x164, + NOUN_TAPE_PLAYER = 0x165, + NOUN_TARGET_COMPUTER = 0x166, + NOUN_TARGET_MODULE = 0x167, + NOUN_TARGETTING_COMPUTER = 0x168, + NOUN_TASMANIAN_DEVIL = 0x169, + NOUN_TASTY_TURKEY = 0x16A, + NOUN_TELEPORT_DEVICE = 0x16B, + NOUN_TELEPORTER = 0x16C, + NOUN_THATCHED_ROOF = 0x16D, + NOUN_THORNS = 0x16E, + NOUN_THORNY_BUSH = 0x16F, + NOUN_TIE = 0x170, + NOUN_TIMEBOMB = 0x171, + NOUN_TIMER = 0x172, + NOUN_TIMER_MODULE = 0x173, + NOUN_TREE = 0x174, + NOUN_TREES = 0x175, + NOUN_TRODDEN_PATH = 0x176, + NOUN_TUBE = 0x177, + NOUN_TUNNEL = 0x178, + NOUN_TWINKIE_BUSH = 0x179, + NOUN_TWINKIFRUIT = 0x17A, + NOUN_UNLOCK = 0x17B, + NOUN_UZI = 0x17C, + NOUN_VASE = 0x17D, + NOUN_VIDEO_GAME = 0x17E, + NOUN_VIEW = 0x17F, + NOUN_VIEW_SCREEN = 0x180, + NOUN_VIEWPORT = 0x181, + NOUN_VILLAGE_AREA = 0x182, + NOUN_VILLAGE_TO_WEST = 0x183, + NOUN_VOLCANO = 0x184, + NOUN_VULTURE = 0x185, + NOUN_WAD_OF_CATTLE_PARTS = 0x186, + NOUN_WALK_ACROSS = 0x187, + NOUN_WALK_INSIDE = 0x188, + NOUN_WALK_ON = 0x189, + NOUN_WALK_OUTSIDE = 0x18A, + NOUN_WALK_THROUGH = 0x18B, + NOUN_WALK_TOWARDS = 0x18C, + NOUN_WALL = 0x18D, + NOUN_WATCH_TOWER = 0x18E, + NOUN_WATER = 0x18F, + NOUN_WEAPONS_DISPLAY = 0x190, + NOUN_WEAR = 0x191, + NOUN_WEATHER_STATION = 0x192, + NOUN_WEATHER_VANE = 0x193, + NOUN_WEIGHT_MACHINE = 0x194, + NOUN_WESTERN_CLIFF_FACE = 0x195, + NOUN_WHEEL = 0x196, + NOUN_WINDOW = 0x197, + NOUN_WITCHDOCTOR_HUT = 0x198, + NOUN_WORKBENCH = 0x199, + NOUN_WRITE_ON = 0x19A, + NOUN_YELLOW_BIRDY = 0x19B, + NOUN_GRASS = 0x19C, + NOUN_BOUNCING_REPTILE = 0x19D, + NOUN_DEEP_PIT = 0x19E, + NOUN_LOWLANDS_TO_NORTH = 0x19F, + NOUN_SMALL_BUSH = 0x1A0, + NOUN_SMALL_CACTUS = 0x1A1, + NOUN_ROCKY_AREA_TO_NORTH = 0x1A2, + NOUN_BAMBOO_LIKE_PLANT = 0x1A3, + NOUN_MOUNTAINSIDE = 0x1A4, + NOUN_FIELD = 0x1A5, + NOUN_GRASSY_FIELD = 0x1A6, + NOUN_CRAG = 0x1A7, + NOUN_HUGE_LEGS = 0x1A8, + NOUN_LEAF_COVERED_PIT = 0x1A9, NOUN_PILE_OF_LEAVES = 0x1AA, + NOUN_OPEN_FIELD_TO_EAST = 0x1AB, + NOUN_LAWN = 0x1AC, + NOUN_WALK_DOWN = 0x1AD, + NOUN_PATH_TO_WEST = 0x1AE, + NOUN_HEDGE = 0x1AF, + NOUN_VILLAGE_PATH = 0x1B0, + NOUN_PATH_TO_NORTHEAST = 0x1B1, + NOUN_JUNGLE_PATH = 0x1B2, + NOUN_THICK_UNDERGROWTH = 0x1B3, + NOUN_OCEAN = 0x1B4, + NOUN_OCEAN_IN_DISTANCE = 0x1B5, NOUN_STRANGE_DEVICE = 0x1B6, + NOUN_BUSH = 0x1B7, + NOUN_ANEMOMETER = 0x1B8, + NOUN_ISLAND_IN_DISTANCE = 0x1B9, + NOUN_PATH = 0x1BA, + NOUN_TROPHY = 0x1BB, + NOUN_SPECIMEN_JARS = 0x1BC, + NOUN_BOWL = 0x1BD, + NOUN_LARGE_BOWL = 0x1BE, + NOUN_PATH_TO_NORTH = 0x1BF, + NOUN_HUT_TO_NORTH = 0x1C0, + NOUN_PATH_TO_EAST = 0x1C1, + NOUN_CHICKEN_ON_SPIT = 0x1C2, NOUN_CAPTIVE_CREATURE = 0x1C3, - NOUN_DISPLAY = 0x1CC, - NOUN_DEVICE = 0x1CF, - NOUN_0_KEY = 0x1D0, - NOUN_1_KEY = 0x1D1, - NOUN_2_KEY = 0x1D2, - NOUN_3_KEY = 0x1D3, - NOUN_4_KEY = 0x1D4, - NOUN_5_KEY = 0x1D5, - NOUN_6_KEY = 0x1D6, - NOUN_7_KEY = 0x1D7, - NOUN_8_KEY = 0x1D8, - NOUN_9_KEY = 0x1D9, - NOUN_FROWN_KEY = 0x1DA, - NOUN_SMILE_KEY = 0x1DB, - NOUN_NATIVE_WOMAN = 0x1DC, - NOUN_PLATFORM = 0x22C, - NOUN_ALCOHOL = 0x310, + NOUN_TWINKIFRUIT_BUSH = 0x1C4, + NOUN_STREAM = 0x1C5, + NOUN_OPPOSITE_SHORE = 0x1C6, + NOUN_PATH_TO_SOUTH = 0x1C7, + NOUN_OPPOSITE_BANK = 0x1C8, + NOUN_BROKEN_LADDER = 0x1C9, + NOUN_BAG_OF_TWINKIFRUITS = 0x1CA, + NOUN_BED = 0x1CB, + NOUN_DISPLAY = 0x1CC, + NOUN_LEAVE = 0x1CD, + NOUN_EXIT_FROM = 0x1CE, + NOUN_DEVICE = 0x1CF, + NOUN_0_KEY = 0x1D0, + NOUN_1_KEY = 0x1D1, + NOUN_2_KEY = 0x1D2, + NOUN_3_KEY = 0x1D3, + NOUN_4_KEY = 0x1D4, + NOUN_5_KEY = 0x1D5, + NOUN_6_KEY = 0x1D6, + NOUN_7_KEY = 0x1D7, + NOUN_8_KEY = 0x1D8, + NOUN_9_KEY = 0x1D9, + NOUN_FROWN_KEY = 0x1DA, + NOUN_SMILE_KEY = 0x1DB, + NOUN_NATIVE_WOMAN = 0x1DC, + NOUN_YELLOW_BIRD = 0x1DD, + NOUN_BLEEPER = 0x1DE, + NOUN_SIZEMOMETER = 0x1DF, + NOUN_PANEL = 0x1E0, + NOUN_PRINTER = 0x1E1, + NOUN_HARD_DRIVE = 0x1E2, + NOUN_BATHROOM = 0x1E3, + NOUN_DESK = 0x1E4, + NOUN_PASSAGEWAY = 0x1E5, + NOUN_FIRE_HYDRANT = 0x1E6, + NOUN_FREEZER = 0x1E7, + NOUN_EQUIDIGITIZER = 0x1E8, + NOUN_VISION_VIEW = 0x1E9, + NOUN_TELEDETECTOR = 0x1EA, + NOUN_POLE = 0x1EB, + NOUN_TRANSPOSITION_DEVICE = 0x1EC, + NOUN_STATUESQUE = 0x1ED, + NOUN_TEMPERATURE_GAUGE = 0x1EE, + NOUN_CHECK = 0x1EF, + NOUN_WATCH = 0x1F0, + NOUN_ELECTRO_SCANNER = 0x1F1, + NOUN_HALL = 0x1F2, + NOUN_SCANNER = 0x1F3, + NOUN_PLACE_HAND_ON = 0x1F4, + NOUN_SECURITY_MONITOR = 0x1F5, + NOUN_DIGITORAMA = 0x1F6, + NOUN_RAIL_BEAM = 0x1F7, + NOUN_VAULT = 0x1F8, + NOUN_HALLWAY = 0x1F9, + NOUN_PIPES = 0x1FA, + NOUN_AIR_VENT_GRATE = 0x1FB, + NOUN_SECURITY_OFFICE = 0x1FC, + NOUN_SIGNAL = 0x1FD, + NOUN_BLEEP = 0x1FE, + NOUN_BLIP = 0x1FF, + NOUN_LOFT = 0x200, + NOUN_ELECTRONIC_ANT_FARM = 0x201, + NOUN_ELECTRIC_WIRING = 0x202, + NOUN_SECURITY_PANEL = 0x203, + NOUN_CORRIDOR = 0x204, + NOUN_CIRCUIT_CONTROLS = 0x205, + NOUN_AIR_DUCT = 0x206, + NOUN_CELL_WALL = 0x207, + NOUN_LIGHTS = 0x208, + NOUN_STARE_INTO = 0x209, + NOUN_CELL_CONTROLS = 0x20A, + NOUN_COMMODE = 0x20B, + NOUN_USE = 0x20C, + NOUN_BASIN = 0x20D, + NOUN_JUMP_INSIDE = 0x20E, + NOUN_PREVIOUS_CELL = 0x20F, + NOUN_NEXT_ROOM = 0x210, + NOUN_ZINK = 0x211, + NOUN_GAZE_INTO = 0x212, + NOUN_THRONE = 0x213, + NOUN_SACK = 0x214, + NOUN_LIMB = 0x215, + NOUN_SINK = 0x216, + NOUN_JOHNNY_ON_THE_SPOT = 0x217, + NOUN_DEBRIS = 0x218, + NOUN_BUNK = 0x219, + NOUN_NEXT_CELL = 0x21A, + NOUN_TOILET = 0x21B, + NOUN_MONITOR_AREA = 0x21C, + NOUN_SIDEWALL = 0x21D, + NOUN_COFFEE_MUG = 0x21E, + NOUN_SIT_AT = 0x21F, + NOUN_LIGHTING_FIXTURE = 0x220, + NOUN_MONITORS = 0x221, + NOUN_GENDER_CONTROLS = 0x222, + NOUN_NEURO_ANALYZER = 0x223, + NOUN_MOLECULAR_RECORDER = 0x224, + NOUN_MAINTENANCE_PANEL = 0x225, + NOUN_RAMP = 0x226, + NOUN_WALK_UP = 0x227, + NOUN_SUBSONIC_ATOMIZER = 0x228, + NOUN_EIGHT_BALL = 0x229, + NOUN_DNA_INVERTER = 0x22A, + NOUN_DNA_CONVERTER = 0x22B, + NOUN_PLATFORM = 0x22C, + NOUN_GUINEA_PIG_TEST_BOX = 0x22D, + NOUN_GASEOUS_PROBE_WARPER = 0x22E, + NOUN_TOOL_CABINET = 0x22F, + NOUN_SURGICAL_BOXES = 0x230, + NOUN_FETAL_HEART_MONITOR = 0x231, + NOUN_XRAY_CABINET = 0x232, + NOUN_STERILIZATION_SINK = 0x233, + NOUN_DRIPOLATOR = 0x234, + NOUN_SHOCK_MACHINE = 0x235, + NOUN_INTERROGATION_TABLE = 0x236, + NOUN_LIE_DOWN_ON = 0x237, + NOUN_DECIPHER = 0x238, + NOUN_GUARD = 0x239, + NOUN_RIP_IN_FLOOR = 0x23A, + NOUN_TELEPORT_AREA = 0x23B, + NOUN_BROKEN_BEAM = 0x23C, + NOUN_ROCK_CHUNK = 0x23D, + NOUN_BLOODY_CELL_WALL = 0x23E, + NOUN_WALL_BOARD = 0x23F, + NOUN_GENDER_SCANNER = 0x240, + NOUN_BAR = 0x241, + NOUN_WALK_INTO = 0x242, + NOUN_HALLWAY_TO_SOUTH = 0x243, + NOUN_SIGN = 0x244, + NOUN_HALLWAY_TO_NORTH = 0x245, + NOUN_BOTTLES = 0x246, + NOUN_UPPER_DANCE_FLOOR = 0x247, + NOUN_DANCE_FLOOR = 0x248, + NOUN_RAILING = 0x249, + NOUN_BAR_STOOL = 0x24A, + NOUN_LADY = 0x24B, + NOUN_UPPER_LEVEL = 0x24C, + NOUN_ALCOVE = 0x24D, + NOUN_DISCO_BALL = 0x24E, + NOUN_LADIES = 0x24F, + NOUN_COACH_LAMP = 0x250, + NOUN_CARD_SLOT = 0x251, + NOUN_HOOP = 0x252, + NOUN_CANNONBALLS = 0x253, + NOUN_WATER_FOUNTAIN = 0x254, + NOUN_HALLWAY_TO_EAST = 0x255, + NOUN_HALLWAY_TO_WEST = 0x256, + NOUN_SUPPORT = 0x257, + NOUN_BACKBOARD = 0x258, + NOUN_WIDE_DOOR = 0x259, + NOUN_SIGN_POST = 0x25A, + NOUN_FIRE_EXTINGUISHER = 0x25B, + NOUN_TRASH = 0x25C, + NOUN_MISSILES = 0x25D, + NOUN_TANK = 0x25E, + NOUN_TWO_TON_WEIGHT = 0x25F, + NOUN_ONE_TON_TOMATO = 0x260, + NOUN_ANVIL = 0x261, + NOUN_MINUTEMAN_IV_ICBM = 0x262, + NOUN_CHEST = 0x263, + NOUN_ARMOR = 0x264, + NOUN_CARTON = 0x265, + NOUN_POWDER = 0x266, + NOUN_RAFT = 0x267, + NOUN_WHATZIT = 0x268, + NOUN_CATAPULT = 0x269, + NOUN_HAND_GRENADE = 0x26A, + NOUN_BARRELS = 0x26B, + NOUN_LOADING_RAMP = 0x26C, + NOUN_BLIMP = 0x26D, + NOUN_FLOUR = 0x26E, + NOUN_FLY_PAPER = 0x26F, + NOUN_RUG = 0x270, + NOUN_CARPET = 0x271, + NOUN_CAN = 0x272, + NOUN_RUBBER_DUCKIE = 0x273, + NOUN_GOLF_CLUBS = 0x274, + NOUN_RAT = 0x275, + NOUN_BARREL = 0x276, + NOUN_BUCKET_OF_TAR = 0x277, + NOUN_SACKS = 0x278, + NOUN_STORAGE = 0x279, + NOUN_120V_3_PHASE_400HZ = 0x27A, + NOUN_LAB_EQUIPMENT = 0x27B, + NOUN_AIR_HORN = 0x27C, + NOUN_JAR = 0x27D, + NOUN_SEVERED_CABLE = 0x27E, + NOUN_PROBE_ASSEMBLY = 0x27F, + NOUN_KNIFE_SWITCH = 0x280, + NOUN_WORK_BENCH = 0x281, + NOUN_HEATER = 0x282, + NOUN_TOXIC_WASTE = 0x283, + NOUN_EXPERIMENT = 0x284, + NOUN_DRAWING_BOARD = 0x285, + NOUN_MISHAP = 0x286, + NOUN_AIR_PURIFIER = 0x287, + NOUN_DUMMY = 0x288, + NOUN_PICTURE = 0x289, + NOUN_BAGGAGE_CHECK = 0x28A, + NOUN_DEPARTURE_SCHEDULE = 0x28B, + NOUN_SHADE_OF_PALE = 0x28C, + NOUN_ITINERARY = 0x28D, + NOUN_BARGAIN_VAT = 0x28E, + NOUN_PENCILS = 0x28F, + NOUN_PAD_IF_PAPER = 0x290, + NOUN_DEEPEST_DEPTHS = 0x291, + NOUN_ROLODEX = 0x292, + NOUN_MONA_TISA = 0x293, + NOUN_ABSTRACT_ART = 0x294, + NOUN_SPACE_QUESTING_VIII = 0x295, + NOUN_THEATRICAL_ART = 0x296, + NOUN_METAL_POLE = 0x297, + NOUN_EXIT = 0x298, + NOUN_SWIRLING_LIGHT = 0x299, + NOUN_REGISTER = 0x29A, + NOUN_PEACHY_BUNS = 0x29B, + NOUN_OUR_TOWN = 0x29C, + NOUN_EMBROIDERED_ART = 0x29D, + NOUN_GEORGE_BUSH_ALIKE = 0x29E, + NOUN_COUNTER = 0x29F, + NOUN_SENSOR = 0x2A0, + NOUN_SOFTWARE_INFORMATION = 0x2A1, + NOUN_WALK_BEHIND = 0x2A2, + NOUN_BARGAINS = 0x2A3, + NOUN_SCAN_LIGHT = 0x2A4, + NOUN_OLD_SOFTWARE_STAND = 0x2A5, + NOUN_SOFTWARE_SHELF = 0x2A6, + NOUN_HOTTEST_SOFTWARE = 0x2A7, + NOUN_GREAT_PAINTBALL_ART = 0x2A8, + NOUN_SCENIC_VISTA = 0x2A9, + NOUN_LASER = 0x2AA, + NOUN_LASER_JET = 0x2AB, + NOUN_LEVER = 0x2AC, + NOUN_BULLSEYE = 0x2AD, + NOUN_STAND = 0x2AE, + NOUN_CONTROL_STATION = 0x2AF, + NOUN_STRANGE_MONSTER = 0x2B0, + NOUN_GHASTLY_BEAST = 0x2B1, + NOUN_GAWK_AT = 0x2B2, + NOUN_CORRIDOR_TO_SOUTH = 0x2B3, + NOUN_CORRIDOR_TO_NORTH = 0x2B4, + NOUN_WALK_ONTO = 0x2B5, + NOUN_ROCK_WALL = 0x2B6, + NOUN_WOMAN = 0x2B7, + NOUN_WOMEN = 0x2B8, + NOUN_CORRIDOR_TO_EAST = 0x2B9, + NOUN_CORRIDOR_TO_WEST = 0x2BA, + NOUN_AMMUNITION = 0x2BB, + NOUN_ARMORED_VEHICLE = 0x2BC, + NOUN_TOMATO = 0x2BD, + NOUN_MISSILE = 0x2BE, + NOUN_SUIT_OF_ARMOR = 0x2BF, + NOUN_POWDER_CONTAINER = 0x2C0, + NOUN_INFLATABLE_RAFT = 0x2C1, + NOUN_GRENADE = 0x2C2, + NOUN_FENCE = 0x2C3, + NOUN_WOODEN_STATUE = 0x2C4, + NOUN_CONVEYER_BELT = 0x2C5, + NOUN_CONTROLS = 0x2C6, + NOUN_EQUIPMENT = 0x2C7, + NOUN_SHELF = 0x2C8, + NOUN_CABINETS = 0x2C9, + NOUN_CONTROL_CONSOLE = 0x2CA, + NOUN_FAUCET = 0x2CB, + NOUN_PANEL_BOX = 0x2CC, + NOUN_STATUE = 0x2CD, + NOUN_GAUGE = 0x2CE, + NOUN_CIRCUIT_PANEL = 0x2CF, + NOUN_CATWALK = 0x2D0, + NOUN_CIRCUITS = 0x2D1, + NOUN_BLOOD_STAIN = 0x2D2, + NOUN_GRATE = 0x2D3, + NOUN_AIR_SHAFT = 0x2D4, + NOUN_RETURN_TO = 0x2D5, + NOUN_FORMALDEHYDE = 0x2D6, + NOUN_PETROX = 0x2D7, + NOUN_SODIUM_BENZOATE = 0x2D8, + NOUN_GURNEY = 0x2D9, + NOUN_IRONING_BOARD = 0x2DA, + NOUN_LEFT_MONITOR = 0x2DB, + NOUN_RIGHT_MONITOR = 0x2DC, + NOUN_RED_BUTTON = 0x2DD, + NOUN_GREEN_BUTTON = 0x2DE, + NOUN_RIGHT_ONE_KEY = 0x2DF, + NOUN_RIGHT_1_KEY = 0x2E0, + NOUN_RIGHT_2_KEY = 0x2E1, + NOUN_RIGHT_3_KEY = 0x2E2, + NOUN_RIGHT_4_KEY = 0x2E3, + NOUN_RIGHT_5_KEY = 0x2E4, + NOUN_RIGHT_6_KEY = 0x2E5, + NOUN_RIGHT_7_KEY = 0x2E6, + NOUN_RIGHT_8_KEY = 0x2E7, + NOUN_LEFT_1_KEY = 0x2E8, + NOUN_LEFT_2_KEY = 0x2E9, + NOUN_LEFT_3_KEY = 0x2EA, + NOUN_LEFT_4_KEY = 0x2EB, + NOUN_CORRIDOR_WALL = 0x2EC, + NOUN_MUG = 0x2ED, + NOUN_DOUGHNUT = 0x2EE, + NOUN_SECURITY_STATION = 0x2EF, + NOUN_NEWSPAPER = 0x2F0, + NOUN_MAGAZINE = 0x2F1, + NOUN_CLIPBOARD = 0x2F2, + NOUN_PAPER_FOOTBALL = 0x2F3, + NOUN_YOUR_STUFF = 0x2F4, + NOUN_OTHER_STUFF = 0x2F5, + NOUN_LAMP = 0x2F6, + NOUN_CLIMB_INTO = 0x2F7, + NOUN_LIGHT_BULB = 0x2F8, + NOUN_STEP_INTO = 0x2F9, + NOUN_ROOM = 0x2FA, + NOUN_CRAWL_TO = 0x2FB, + NOUN_FOURTH_CELL = 0x2FC, + NOUN_THIRD_CELL = 0x2FD, + NOUN_SECOND_CELL = 0x2FE, + NOUN_FIRST_CELL = 0x2FF, + NOUN_EQUIPMENT_ROOM = 0x300, + NOUN_CRAWL_DOWN = 0x301, + NOUN_DESCENDING_SHAFT = 0x302, + NOUN_SAUROPOD = 0x303, + NOUN_MONSTER = 0x304, + NOUN_FAKE_ID = 0x305, + NOUN_ALIEN_LIQUOR = 0x306, + NOUN_INTERN = 0x307, + NOUN_INSTRUMENT_TABLE = 0x308, + NOUN_WOMAN_ON_BALCONY = 0x309, + NOUN_WOMAN_IN_CHAIR = 0x30A, + NOUN_SIT_ON = 0x30B, + NOUN_WOMAN_IN_ALCOVE = 0x30C, + NOUN_KETTLE = 0x30D, + NOUN_BARTENDER = 0x30E, + NOUN_WHISKEY = 0x30F, + NOUN_ALCOHOL = 0x310, + NOUN_RIM = 0x311, + NOUN_WALK_ALONG = 0x312, NOUN_SUBMERGED_CITY = 0x313, - NOUN_CEMENT_PYLON = 0x316, - NOUN_ELEVATOR = 0x317, - NOUN_BUILDING = 0x323, - NOUN_LASER_BEAM = 0x343, - NOUN_BOAT = 0x345, - NOUN_CEMENT_BLOCK = 0x38E, - NOUN_CITY = 0x38F, - NOUN_DOLLOP = 0x3AC, - NOUN_DROP = 0x3AD, - NOUN_DASH = 0x3AE, - NOUN_SPLASH = 0x3AF, - NOUN_HOOK = 0x467, - NOUN_BIRDS = 0x487, + NOUN_GOVERNORS_HOUSE = 0x314, + NOUN_RIM_TOWARDS_EAST = 0x315, + NOUN_CEMENT_PYLON = 0x316, + NOUN_ELEVATOR = 0x317, + NOUN_ELEVATOR_SHAFT = 0x318, + NOUN_CONVEYOR_BELT = 0x319, + NOUN_CANNON_BALLS = 0x31A, + NOUN_ELECTRICAL_OVERHANG = 0x31B, + NOUN_GUTTER_PIPE = 0x31C, + NOUN_SIDEWALK = 0x31D, + NOUN_STREET = 0x31E, + NOUN_BARRICADE = 0x31F, + NOUN_DOOR_CONTROL_SLOT = 0x320, + NOUN_STREET_TO_EAST = 0x321, + NOUN_SIDEWALK_TO_EAST = 0x322, + NOUN_BUILDING = 0x323, + NOUN_CAR = 0x324, + NOUN_GET_INSIDE = 0x325, + NOUN_MARQUEE = 0x326, + NOUN_BUILDING_ENTRANCE = 0x327, + NOUN_GUARD_STATION = 0x328, + NOUN_TECHNICAL_EQUIPMENT = 0x329, + NOUN_GUARD_TURRET = 0x32A, + NOUN_PILLAR = 0x32B, + NOUN_PAPERS = 0x32C, + NOUN_FILE_CABINET = 0x32D, + NOUN_WINDOWS = 0x32E, + NOUN_WALK = 0x32F, + NOUN_STORAGE_BOX = 0x330, + NOUN_WATER_COOLER = 0x331, + NOUN_BOX = 0x332, + NOUN_RIFLES = 0x333, + NOUN_SLINGSHOT = 0x334, + NOUN_MAUSOLEUM = 0x335, + NOUN_SOFTWARE_STORE = 0x336, + NOUN_CONCRETE_BUILDING = 0x337, + NOUN_HUMONGOUS_MONITOR = 0x338, + NOUN_SPACE_BIKE = 0x339, + NOUN_BILLBOARD = 0x33A, + NOUN_LACK_OF_NOOKIE_MOTEL = 0x33B, + NOUN_BIDETS_XCREETZA_HUT = 0x33C, + NOUN_BUILDINGS = 0x33D, + NOUN_SKYSCRAPER = 0x33E, + NOUN_SOFTWARE_LOGO = 0x33F, + NOUN_GIANT_TELESCOPE = 0x340, + NOUN_HANDLE = 0x341, + NOUN_HOLE = 0x342, + NOUN_LASER_BEAM = 0x343, + NOUN_PEDESTAL = 0x344, + NOUN_BOAT = 0x345, + NOUN_GIANT_MONUMENT = 0x346, + NOUN_ROPE = 0x347, + NOUN_SAND_BAR_RESTAURANT = 0x348, + NOUN_PORTHOLE = 0x349, + NOUN_TICKET_BOOTH = 0x34A, + NOUN_POLLYS_ENTRANCE = 0x34B, + NOUN_RESTAURANT_ENTRANCE = 0x34C, + NOUN_THE_PLEASURE_DOME = 0x34D, + NOUN_STARFISH = 0x34E, + NOUN_FLIPPER = 0x34F, + NOUN_SAND_DOLLAR = 0x350, + NOUN_SHELL = 0x351, + NOUN_GUEST_LIST = 0x352, + NOUN_WEIRD_ANIMAL_HEAD = 0x353, + NOUN_SHIPS_WHEEL = 0x354, + NOUN_HANDICAP_SIGN = 0x355, + NOUN_ELEVATOR_CONTROLS = 0x356, + NOUN_BRICK_WALL = 0x357, + NOUN_BIKE_RACK = 0x358, + NOUN_ODONALDS_SIGN = 0x359, + NOUN_ELEVATOR_ENTRANCE = 0x35A, + NOUN_SPECIAL_SALE_SIGN = 0x35B, + NOUN_ATTORNEYS_AT_LAW = 0x35C, + NOUN_SLEDGE_MALL = 0x35D, + NOUN_SKELETON = 0x35E, + NOUN_STRANGE_EQUIPMENT = 0x35F, + NOUN_STREET_TO_WEST = 0x360, + NOUN_SIDEWALK_TO_WEST = 0x361, + NOUN_TELEPORTER_ENTRANCE = 0x362, + NOUN_SOFTWARE_DOOR = 0x363, + NOUN_SPINACH_PATCH_DOLL = 0x364, + NOUN_REFLECT = 0x365, + NOUN_REGISTER_DRAWER = 0x366, + NOUN_ELEVATOR_DOOR = 0x367, + NOUN_HYDRAULIC_SUPPORT = 0x368, + NOUN_EQUIPMENT_OVERHEAD = 0x369, + NOUN_GET_INTO = 0x36A, + NOUN_WARNING_LABEL = 0x36B, + NOUN_NUCLEAR_SLINGSHOT = 0x36C, + NOUN_DISPLAY_CASE = 0x36D, + NOUN_PHOTON_RIFLES = 0x36E, + NOUN_MONITORING_EQUIPMENT = 0x36F, + NOUN_TELESCOPE = 0x370, + NOUN_MOTEL = 0x371, + NOUN_RESTAURANT = 0x372, + NOUN_SOFTWARE_STORE_SIGN = 0x373, + NOUN_ADVERTISING_POSTER = 0x374, + NOUN_ADVERTISEMENT = 0x375, + NOUN_OLD_SOFTWARE = 0x376, + NOUN_CASH_REGISTER = 0x377, + NOUN_ENTRANCE = 0x378, + NOUN_LASER_CANNON = 0x379, + NOUN_SAND_BAGS = 0x37A, + NOUN_PLEASURE_DOME = 0x37B, + NOUN_DOME_ENTRANCE = 0x37C, + NOUN_LABORATORY = 0x37D, + NOUN_STREET_TO_SOUTH = 0x37E, + NOUN_ELEVATOR_ACCESS_SLOT = 0x37F, + NOUN_CAR_CONTROLS = 0x380, + NOUN_SCENT_PACKET = 0x381, + NOUN_KITTY = 0x382, + NOUN_GLOVE_COMPARTMENT = 0x383, + NOUN_MOLDY_SOCK = 0x384, + NOUN_SODA_CANS = 0x385, + NOUN_WINDSHIELD = 0x386, + NOUN_DASHBOARD = 0x387, + NOUN_INTERIOR_OF_CAR = 0x388, + NOUN_VIEW_RIGHT_BUTTON = 0x389, + NOUN_BLACK_BUTTON = 0x38A, + NOUN_WHITE_BUTTON = 0x38B, + NOUN_INSIDE_OF_CAR = 0x38C, + NOUN_RIM_TOWARDS_WEST = 0x38D, + NOUN_CEMENT_BLOCK = 0x38E, + NOUN_CITY = 0x38F, + NOUN_SPEAKER = 0x390, + NOUN_EYE_CHART = 0x391, + NOUN_LAUNCH_PAD = 0x392, + NOUN_BUILDING_TO_WEST = 0x393, + NOUN_PAD_TO_EAST = 0x394, + NOUN_PAD_TO_WEST = 0x395, + NOUN_TOWER = 0x396, + NOUN_LOOK_OUT = 0x397, + NOUN_SERVICE_PANEL = 0x398, + NOUN_CRACK = 0x399, + NOUN_THROTTLE = 0x39A, + NOUN_GRAB = 0x39B, + NOUN_INSTRUMENTATION = 0x39C, + NOUN_TP = 0x39D, + NOUN_SEAT = 0x39E, + NOUN_STATUS_PANEL = 0x39F, + NOUN_SHIPS_CONTROLS = 0x3A0, + NOUN_PROFESSOR = 0x3A1, + NOUN_PROFESSORS_GURNEY = 0x3A2, + NOUN_WELCOME_MAT = 0x3A3, + NOUN_MELON_MUSH = 0x3A4, + NOUN_BADMINTON_BRAT = 0x3A5, + NOUN_APPLY = 0x3A6, + NOUN_COMBINATION = 0x3A7, + NOUN_NOTE = 0x3A8, + NOUN_LECITHIN = 0x3A9, + NOUN_REPAIR_WOMAN = 0x3AA, + NOUN_EXPLOSIVES = 0x3AB, + NOUN_DOLLOP = 0x3AC, + NOUN_DROP = 0x3AD, + NOUN_DASH = 0x3AE, + NOUN_SPLASH = 0x3AF, + NOUN_DOCK_TO_SOUTH = 0x3B0, + NOUN_STEER_TOWARDS = 0x3B1, + NOUN_BUILDING_TO_NORTH = 0x3B2, + NOUN_VOLCANO_RIM = 0x3B3, + NOUN_OPEN_WATER_TO_SOUTH = 0x3B4, + NOUN_PROJECTOR = 0x3B5, + NOUN_GUARDS_ARM2 = 0x3B6, + NOUN_NIBBLE_ON = 0x3B7, + NOUN_ENTER = 0x3B8, + NOUN_ = 0x3B9, + NOUN_TIMER_BUTTON_1 = 0x3BA, + NOUN_REMOTE_BUTTON_1 = 0x3BB, + NOUN_START_BUTTON_2 = 0x3BC, + NOUN_REMOTE_BUTTON_2 = 0x3BD, + NOUN_TIMER_BUTTON_2 = 0x3BE, + NOUN_START_BUTTON_1 = 0x3BF, + NOUN_ANTIGRAV_CONTROLS = 0x3C0, + NOUN_BRUCES_TREE = 0x3C1, + NOUN_COLISEUM = 0x3C2, + NOUN_BRUCES_GARDEN_ROOM = 0x3C3, + NOUN_FOUNTAIN = 0x3C4, + NOUN_HOUSE_OF_BRUCE = 0x3C5, + NOUN_CITY_BACKDROP = 0x3C6, + NOUN_BRUCES_BALCONY = 0x3C7, + NOUN_BRUCES_ENTRANCE = 0x3C8, + NOUN_BRUCES_LOGO = 0x3C9, + NOUN_LOUNGE_CHAIR = 0x3CA, + NOUN_LIVING_ROOM_FLOOR = 0x3CB, + NOUN_LIVINGROOM_FLOOR = 0x3CC, + NOUN_PERFUME_BOTTLE = 0x3CD, + NOUN_COOL_NEON_LIGHT = 0x3CE, + NOUN_FLOWER_POT = 0x3CF, + NOUN_COFFEE_TABLE = 0x3D0, + NOUN_FLOWERS = 0x3D1, + NOUN_ART_DECO_CHAIR = 0x3D2, + NOUN_SAFE = 0x3D3, + NOUN_SPLASHY_DECOR = 0x3D4, + NOUN_THEATRICAL_FACES = 0x3D5, + NOUN_ART_DECO_PIECE = 0x3D6, + NOUN_END_OF_ROOM = 0x3D7, + NOUN_FIREPLACE = 0x3D8, + NOUN_ARTWORK = 0x3D9, + NOUN_COOL_NEON_LIGHTS = 0x3DA, + NOUN_GLASS_PLATED_WINDOW = 0x3DB, + NOUN_BEDROOM_FLOOR = 0x3DC, + NOUN_BAUBLE = 0x3DD, + NOUN_SNAPSHOT = 0x3DE, + NOUN_PERFUME = 0x3DF, + NOUN_CLAPBOARD = 0x3E0, + NOUN_BERET = 0x3E1, + NOUN_HORSE_WHIP = 0x3E2, + NOUN_CORNER_TABLE = 0x3E3, + NOUN_BOA = 0x3E4, + NOUN_WIG_STAND = 0x3E5, + NOUN_PARTITION = 0x3E6, + NOUN_MEGAPHONE = 0x3E7, + NOUN_SLIP = 0x3E8, + NOUN_SCONCE = 0x3E9, + NOUN_VANITY = 0x3EA, + NOUN_BEDBOARD = 0x3EB, + NOUN_LOVE_SEAT = 0x3EC, + NOUN_SOUVENIR_TICKETS = 0x3ED, + NOUN_REVIEW = 0x3EE, + NOUN_BRUCE_AT_THE_GALA = 0x3EF, + NOUN_ART_DECO_RUG = 0x3F0, + NOUN_LIVINGROOM = 0x3F1, + NOUN_SCULPTURE = 0x3F2, + NOUN_SPECIMEN_EPITHET = 0x3F3, + NOUN_VENT = 0x3F4, + NOUN_FLOWER_BOX = 0x3F5, + NOUN_LEDGE = 0x3F6, + NOUN_BOLT = 0x3F7, + NOUN_OBSERVATION_WINDOW = 0x3F8, + NOUN_AIR_HOSE = 0x3F9, + NOUN_AUTO_SHOP = 0x3FA, + NOUN_MANHOLE = 0x3FB, + NOUN_AUTO_SHOP_ENTRANCE = 0x3FC, + NOUN_BROKEN_WINDOW = 0x3FD, + NOUN_WOMANHOLE = 0x3FE, + NOUN_GARAGE_DOOR = 0x3FF, + NOUN_SCRATCH_PAD = 0x400, + NOUN_GAS_PRICES = 0x401, + NOUN_UP_BUTTON = 0x402, + NOUN_DOWN_BUTTON = 0x403, + NOUN_SPARE_PARTS_LIST = 0x404, + NOUN_SKYLIGHT = 0x405, + NOUN_TOOL_BOX = 0x406, + NOUN_CAR_LIFT = 0x407, + NOUN_CAR_SEAT = 0x408, + NOUN_GARAGE_FLOOR = 0x409, + NOUN_GARAGE_DOOR_CONTROLS = 0x40A, + NOUN_AMISH_HAT = 0x40B, + NOUN_JACK = 0x40C, + NOUN_COILS = 0x40D, + NOUN_OIL_CAN = 0x40E, + NOUN_FAN_BELTS = 0x40F, + NOUN_REAR_OF_GARAGE = 0x410, + NOUN_FRONT_OF_GARAGE = 0x411, + NOUN_MUFFLER = 0x412, + NOUN_SPARE_PART = 0x413, + NOUN_HUBCAP = 0x414, + NOUN_CANDLE = 0x415, + NOUN_RATES = 0x416, + NOUN_GREASE_CAN = 0x417, + NOUN_CALENDAR = 0x418, + NOUN_FORK_LIFT = 0x419, + NOUN_TRASH_CAN = 0x41A, + NOUN_SHAKER_CHAIR = 0x41B, + NOUN_QUARTER_PANEL = 0x41C, + NOUN_AREA_BEHIND_CAR = 0x41D, + NOUN_DANGER_ZONE = 0x41E, + NOUN_NEWSSTAND = 0x41F, + NOUN_LADY_GODIVA_MONUMENT = 0x420, + NOUN_SPOT_A_POT = 0x421, + NOUN_GUARD_RAIL = 0x422, + NOUN_ALLEY = 0x423, + NOUN_DITCH = 0x424, + NOUN_VIDEO_STORE_DOOR = 0x425, + NOUN_BUCKLUSTER_MARQUEE = 0x426, + NOUN_VIDEO_STORE = 0x427, + NOUN_HORMONE_BILLBOARD = 0x428, + NOUN_PHONE_ANTENNA = 0x429, + NOUN_RETURN_SLOT = 0x42A, + NOUN_NOOSE = 0x42B, + NOUN_COMEDY_VIDEOS = 0x42C, + NOUN_SMELLY_SNEAKER = 0x42D, + NOUN_PIPPYS_STOCKING = 0x42E, + NOUN_PHONE_CRADLE = 0x42F, + NOUN_DRAMA_VIDEOS = 0x430, + NOUN_SPOTLIGHT = 0x431, + NOUN_STOREROOM_FLOOR = 0x432, + NOUN_ALL_SALES_FINAL = 0x433, + NOUN_MACHOPROSE_TEE_SHIRT = 0x434, + NOUN_UNKNOWN_COMIC_HANDS = 0x435, + NOUN_WET_CEMENT = 0x436, + NOUN_PIPPYS_TINY_IMPRINT = 0x437, + NOUN_OBNOXIOUS_DOG_PAWS = 0x438, + NOUN_LEG_AND_A_LEG_JEANS = 0x439, + NOUN_VIDEO_STORE_EXIT = 0x43A, + NOUN_AISLE = 0x43B, + NOUN_VIDEO_MONITOR = 0x43C, + NOUN_POLLY_PIGS_IMPRINT = 0x43D, + NOUN_JOHN_WYNNS_IMPRINT = 0x43E, + NOUN_MR_NEDS_IMPRINT = 0x43F, + NOUN_PEG_LEG_PETE_IMPRINT = 0x440, + NOUN_MARX_BROS_POSTER = 0x441, + NOUN_PIPPY_BILLBOARD = 0x442, + NOUN_VIDEOS_NOONE_WANTS = 0x443, + NOUN_MORE_CLASSIC_VIDEOS = 0x444, + NOUN_JOIN_OUR_PRICE_CLUB = 0x445, + NOUN_EDUCATIONAL_VIDEOS = 0x446, + NOUN_DEEP_DISCOUNT_TITLES = 0x447, + NOUN_WORLD_CHAMPS_POSTER = 0x448, + NOUN_WORKOUT_VIDEOS = 0x449, + NOUN_20_PERCENT_OFF_SIGN = 0x44A, + NOUN_CIVILIZATION_AD = 0x44B, + NOUN_NEW_RELEASE_VIDEOS = 0x44C, + NOUN_PORNO_VIDEOS = 0x44D, + NOUN_FOREIGN_VIDEOS = 0x44E, + NOUN_CLASSIC_VIDEOS = 0x44F, + NOUN_ADVENTURE_VIDEOS = 0x450, + NOUN_BUCKLUSTER_LOGO = 0x451, + NOUN_WINE_BOTTLE = 0x452, + NOUN_DIRT_PILE = 0x453, + NOUN_MAMMOTH_PENCIL_HEAD = 0x454, + NOUN_WREAKY_PUMPKIN = 0x455, + NOUN_MILK_CARTON = 0x456, + NOUN_BUCKET = 0x457, + NOUN_EMPTY_BOX = 0x458, + NOUN_DIAPER_BOX = 0x459, + NOUN_HERMIT = 0x45A, + NOUN_METAL_PIPE = 0x45B, + NOUN_CONCRETE_SUPPORT = 0x45C, + NOUN_VARIOUS_TRASH = 0x45D, + NOUN_ARMATURE = 0x45E, + NOUN_CONTROL_BOX = 0x45F, + NOUN_TOP_OF_DOME = 0x460, + NOUN_EXPRESSWAY_TO_EAST = 0x461, + NOUN_GO_TOWARDS = 0x462, + NOUN_EXPRESSWAY_TO_WEST = 0x463, + NOUN_DOME = 0x464, + NOUN_VIEW_OF_CITY = 0x465, + NOUN_EXPRESSWAY = 0x466, + NOUN_HOOK = 0x467, + NOUN_SEA_MONSTER = 0x468, + NOUN_EDGE_OF_VOLCANO = 0x469, + NOUN_JUMP_THROUGH = 0x46A, + NOUN_OLD_TEA_CUP = 0x46B, + NOUN_NAME_PLATE = 0x46C, + NOUN_OLD_VASE = 0x46D, + NOUN_PORTRAIT = 0x46E, + NOUN_PUT_DOWN = 0x46F, + NOUN_TALL_BUILDING = 0x470, + NOUN_OBNOXIOUS_DOG = 0x471, + NOUN_GUTS = 0x472, + NOUN_BIG_HEADS = 0x473, + NOUN_INSTALL = 0x474, + NOUN_LIFE_SUPPORT_MODULE = 0x475, + NOUN_REMOVE = 0x476, + NOUN_LARGE_BLADE = 0x477, + NOUN_SIDE_ENTRANCE = 0x478, + NOUN_INDICATOR = 0x479, + NOUN_SIGNPOST = 0x47A, + NOUN_PIN = 0x47B, + NOUN_POWDER_PUFF = 0x47C, + NOUN_SHELVES = 0x47D, + NOUN_ELECTRODES = 0x47E, + NOUN_MISHAP2 = 0x47F, + NOUN_ISLD_SUPERSTRUCTURE = 0x480, + NOUN_FILE_CABINETS = 0x481, + NOUN_CYCLE_SHOP = 0x482, + NOUN_AIR_BIKE = 0x483, + NOUN_EMERGENCY_LIGHT = 0x484, + NOUN_TARGET_AREA = 0x485, + NOUN_ICE_CHESTS = 0x486, + NOUN_BIRDS = 0x487, + NOUN_DOCTORS_OFFICE = 0x488, + NOUN_DEFACE = 0x489, + NOUN_LARGE_HEADS = 0x48A, + NOUN_SMALL_TABLE = 0x48B, + NOUN_COLLOSSEUM = 0x48C, + NOUN_HOUSE = 0x48D, + NOUN_BALCONY = 0x48E, + NOUN_GARDEN_ROOM = 0x48F, + NOUN_COVE_LIGHTS = 0x490, + NOUN_MASKS = 0x491, + NOUN_NEON_LIGHTS = 0x492, + NOUN_GLASS_BLOCK_WALL = 0x493, + NOUN_SCREEN = 0x494, + NOUN_SPARE_RIBS = 0x495, + NOUN_BANNER = 0x496, + NOUN_INSTRUCTIONAL_VIDEOS = 0x497, + NOUN_CEMENT = 0x498, + NOUN_STORE = 0x499, + NOUN_CARDBOARD_BOX = 0x49A, + NOUN_GRAFFITTI = 0x49B, + NOUN_GRAFFITI = 0x49C, + NOUN_PHOTOGRAPH = 0x49D, + NOUN_DIRECTORS_SLATE = 0x49E, + NOUN_CROP = 0x49F, + NOUN_HAT = 0x4A0, + NOUN_LOGO = 0x4A1, + NOUN_MAINTENANCE_BUILDING = 0x4A2, + NOUN_MASSAGE = 0x4A3, + NOUN_MANGLE = 0x4A4, + NOUN_RUB = 0x4A5, + NOUN_JUGGLE = 0x4A6, + NOUN_SMASH = 0x4A7, + NOUN_GUZZLE = 0x4A8, NOUN_WEST_END_OF_PLATFORM = 0x4A9, - NOUN_EAST_END_OF_PLATFORM = 0x4AA + NOUN_EAST_END_OF_PLATFORM = 0x4AA, + NOUN_FOLD = 0x4AB, + NOUN_SPINDLE = 0x4AC, + NOUN_MUTILATE = 0x4AD }; class SceneFactory { diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index 7c4af52760..04c646f2cf 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -268,7 +268,7 @@ void Scene101::step() { } void Scene101::preActions() { - if (_action.isAction(VERB_LOOK, 0x180)) + if (_action.isAction(VERB_LOOK, NOUN_VIEW_SCREEN)) _game._player._needToWalk = true; if (_sittingFl) { @@ -424,13 +424,13 @@ void Scene101::actions() { return; } - if (_action.isAction(VERB_OPEN, 0x135) && _panelOpened) { + if (_action.isAction(VERB_OPEN, NOUN_SHIELD_ACCESS_PANEL) && _panelOpened) { _vm->_dialogs->show(10130); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x180) && _sittingFl) { + if (_action.isAction(VERB_LOOK, NOUN_VIEW_SCREEN) && _sittingFl) { if (_globals[kWatchedViewScreen]) { sayDang(); } else { @@ -469,7 +469,7 @@ void Scene101::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x47)) { + if (_action.isAction(VERB_LOOK, NOUN_CHAIR)) { _vm->_dialogs->show(10101); _action._inProgress = false; return; @@ -481,115 +481,115 @@ void Scene101::actions() { return; } - if (_action.isAction(VERB_LOOK, 0xA8) || _action.isAction(VERB_LOOK, 0xF8) || _action.isAction(VERB_EXAMINE, 0xA8) || _action.isAction(VERB_EXAMINE, 0xF8)) { + if (_action.isAction(VERB_LOOK, NOUN_HULL) || _action.isAction(VERB_LOOK, NOUN_OUTER_HULL) || _action.isAction(VERB_EXAMINE, NOUN_HULL) || _action.isAction(VERB_EXAMINE, NOUN_OUTER_HULL)) { _vm->_dialogs->show(10103); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x91)) { + if (_action.isAction(VERB_LOOK, NOUN_FUZZY_DICE)) { _vm->_dialogs->show(10104); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0xE1) || _action.isAction(VERB_LOOK_IN, 0xE1)) { + if (_action.isAction(VERB_LOOK, NOUN_MIRROR) || _action.isAction(VERB_LOOK_IN, NOUN_MIRROR)) { _vm->_dialogs->show(10105); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x60)) { + if (_action.isAction(VERB_LOOK, NOUN_CURTAINS)) { _vm->_dialogs->show(10106); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x111)) { + if (_action.isAction(VERB_LOOK, NOUN_PLASTIC_JESUS)) { _vm->_dialogs->show(10107); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x7B) || (_action.isAction(VERB_OPEN, 0x7B) && !_game._objects.isInInventory(OBJ_REBREATHER))) { + if (_action.isAction(VERB_LOOK, NOUN_ESCAPE_HATCH) || (_action.isAction(VERB_OPEN, NOUN_ESCAPE_HATCH) && !_game._objects.isInInventory(OBJ_REBREATHER))) { _vm->_dialogs->show(10109); _action._inProgress = false; return; } - if (_action.isAction(VERB_OPEN, 0x7B)) { + if (_action.isAction(VERB_OPEN, NOUN_ESCAPE_HATCH)) { _vm->_dialogs->show(10110); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x166)) { + if (_action.isAction(VERB_LOOK, NOUN_TARGET_COMPUTER)) { _vm->_dialogs->show(10111); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0xCA)) { + if (_action.isAction(VERB_LOOK, NOUN_LIBRARY_COMPUTER)) { _vm->_dialogs->show(10126); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x63)) { + if (_action.isAction(VERB_LOOK, NOUN_DAMAGE_CONTROL_PANEL)) { _vm->_dialogs->show(10112); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0xEB)) { + if (_action.isAction(VERB_LOOK, NOUN_NAVIGATION_CONTROLS)) { _vm->_dialogs->show(10113); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x78)) { + if (_action.isAction(VERB_LOOK, NOUN_ENGINEERING_CONTROLS)) { _vm->_dialogs->show(10114); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x190)) { + if (_action.isAction(VERB_LOOK, NOUN_WEAPONS_DISPLAY)) { _vm->_dialogs->show(10115); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x138)) { + if (_action.isAction(VERB_LOOK, NOUN_SHIELD_STATUS_PANEL)) { _vm->_dialogs->show(10116); _action._inProgress = false; return; } - if (_action.isAction(VERB_TAKE, 0x111)) { + if (_action.isAction(VERB_TAKE, NOUN_PLASTIC_JESUS)) { _vm->_dialogs->show(10118); _action._inProgress = false; return; } - if (_action.isAction(VERB_TAKE, 0x91)) { + if (_action.isAction(VERB_TAKE, NOUN_FUZZY_DICE)) { _vm->_dialogs->show(10119); _action._inProgress = false; return; } - if (_action.isAction(VERB_OPEN, 0x63)) { + if (_action.isAction(VERB_OPEN, NOUN_DAMAGE_CONTROL_PANEL)) { _vm->_dialogs->show(10121); _action._inProgress = false; return; } - if (_action.isAction(VERB_OPEN, 0x60)) { + if (_action.isAction(VERB_OPEN, NOUN_CURTAINS)) { _vm->_dialogs->show(10122); _action._inProgress = false; return; } - if (_action.isAction(VERB_CLOSE, 0x60)) { + if (_action.isAction(VERB_CLOSE, NOUN_CURTAINS)) { _vm->_dialogs->show(10123); _action._inProgress = false; return; @@ -875,7 +875,7 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_WALK_THROUGH, 0x6E)) { + if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOOR)) { switch (_game._trigger) { case 0: _globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 6, 1, 0, 0); @@ -892,43 +892,43 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_WALKTO, 0x79)) { + if (_action.isAction(VERB_WALKTO, NOUN_ENGINEERING_SECTION)) { _scene->_nextSceneId = 103; _action._inProgress = false; return; } - if (_action.isAction(VERB_WALKTO, 0x117) || _action.isAction(VERB_LOOK, 0x117) || _action.isAction(VERB_WALKTO, 0x27)) { + if (_action.isAction(VERB_WALKTO, NOUN_POSTER) || _action.isAction(VERB_LOOK, NOUN_POSTER) || _action.isAction(VERB_WALKTO, NOUN_BINOCULARS)) { addRandomMessage(); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x194)) { + if (_action.isAction(VERB_LOOK, NOUN_WEIGHT_MACHINE)) { _vm->_dialogs->show(10212); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x79)) { + if (_action.isAction(VERB_LOOK, NOUN_ENGINEERING_SECTION)) { _vm->_dialogs->show(10205); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x6E)) { + if (_action.isAction(VERB_LOOK, NOUN_DOOR)) { _vm->_dialogs->show(10204); _action._inProgress = false; return; } - if (_action.isAction(VERB_STARE_AT, 0x46) || _action.isAction(VERB_LOOK, 0x46)) { + if (_action.isAction(VERB_STARE_AT, NOUN_CEILING) || _action.isAction(VERB_LOOK, NOUN_CEILING)) { _vm->_dialogs->show(10203); _action._inProgress = false; return; } - if (_action.isAction(VERB_STARE_AT, 0xFD) || _action.isAction(VERB_LOOK, 0xFD)) { + if (_action.isAction(VERB_STARE_AT, NOUN_OVERHEAD_LAMP) || _action.isAction(VERB_LOOK, NOUN_OVERHEAD_LAMP)) { _vm->_dialogs->show(10202); _action._inProgress = false; return; @@ -964,7 +964,7 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x52)) { + if (_action.isAction(VERB_LOOK, NOUN_CLOSET)) { _vm->_dialogs->show(10219); _action._inProgress = false; return; @@ -1019,19 +1019,19 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x118)) { + if (_action.isAction(VERB_LOOK, NOUN_POWER_STATUS_PANEL)) { _vm->_dialogs->show(10226); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x197) || _action.isAction(VERB_LOOK_THROUGH, 0x197)) { + if (_action.isAction(VERB_LOOK, NOUN_WINDOW) || _action.isAction(VERB_LOOK_THROUGH, NOUN_WINDOW)) { _vm->_dialogs->show(10227); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x70) || _action.isAction(VERB_WALKTO, 0x70)) { + if (_action.isAction(VERB_LOOK, NOUN_DOORWAY) || _action.isAction(VERB_WALKTO, NOUN_DOORWAY)) { _vm->_dialogs->show(10228); _action._inProgress = false; return; @@ -1056,20 +1056,20 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x47) || (_action.isAction(VERB_SIT_IN, 0x47) && !_chairDescrFl)) { + if (_action.isAction(VERB_LOOK, NOUN_CHAIR) || (_action.isAction(VERB_SIT_IN, NOUN_CHAIR) && !_chairDescrFl)) { _chairDescrFl = true; _vm->_dialogs->show(10210); _action._inProgress = false; return; } - if (_action.isAction(VERB_SIT_IN, 0x47)) { + if (_action.isAction(VERB_SIT_IN, NOUN_CHAIR)) { _vm->_dialogs->show(10211); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0xDE)) { + if (_action.isAction(VERB_LOOK, NOUN_MEDICINE_CABINET)) { if (_globals[kMedicineCabinetOpen]) _vm->_dialogs->show(10207); else @@ -1079,7 +1079,7 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_CLOSE, 0xDE) && _globals[kMedicineCabinetOpen]) { + if (_action.isAction(VERB_CLOSE, NOUN_MEDICINE_CABINET) && _globals[kMedicineCabinetOpen]) { switch (_game._trigger) { case 0: _scene->_sequences.remove(_globals._sequenceIndexes[8]); @@ -1103,7 +1103,7 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_OPEN, 0xDE) && !_globals[kMedicineCabinetOpen]) { + if (_action.isAction(VERB_OPEN, NOUN_MEDICINE_CABINET) && !_globals[kMedicineCabinetOpen]) { switch (_game._trigger) { case 0: _globals._sequenceIndexes[8] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[8], false, 6, 1, 0, 0); @@ -1133,7 +1133,7 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x27) && _game._objects.isInRoom(OBJ_BINOCULARS)) { + if (_action.isAction(VERB_TAKE, NOUN_BINOCULARS) && _game._objects.isInRoom(OBJ_BINOCULARS)) { switch (_game._trigger) { case 0: _globals._sequenceIndexes[11] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[11], false, 3, 1, 0, 0); @@ -1157,7 +1157,7 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x35) && _game._objects.isInRoom(OBJ_BURGER)) { + if (_action.isAction(VERB_TAKE, NOUN_BURGER) && _game._objects.isInRoom(OBJ_BURGER)) { if (_game._trigger == 0) { _vm->_dialogs->showItem(OBJ_BURGER, 10235); _scene->_sequences.remove(_globals._sequenceIndexes[10]); @@ -1171,7 +1171,7 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x117)) { + if (_action.isAction(VERB_TAKE, NOUN_POSTER)) { _vm->_dialogs->show(10224); _action._inProgress = false; return; @@ -1183,26 +1183,26 @@ void Scene102::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x89)) { + if (_action.isAction(VERB_LOOK, NOUN_FLOOR)) { _vm->_dialogs->show(10232); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x27) && !_game._objects.isInInventory(OBJ_BINOCULARS)) { + if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS) && !_game._objects.isInInventory(OBJ_BINOCULARS)) { _vm->_dialogs->show(10233); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x35) && (_action._mainObjectSource == 4)) { + if (_action.isAction(VERB_LOOK, NOUN_BURGER) && (_action._mainObjectSource == 4)) { _vm->_dialogs->show(801); _action._inProgress = false; } } void Scene102::postActions() { - if (_action.isAction(VERB_PUT, 0x127) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { + if (_action.isAction(VERB_PUT, NOUN_ROBO_KITCHEN) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { _vm->_dialogs->show(10217); _action._inProgress = false; } @@ -1716,23 +1716,23 @@ void Scene104::step() { } void Scene104::preActions() { - if (_action.isAction(VERB_SWIM_TOWARDS, 0x74)) + if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_EASTERN_CLIFF_FACE)) _game._player._walkOffScreenSceneId = 105; - if (_action.isAction(VERB_SWIM_TOWARDS, 0x75)) + if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_EAT)) _game._player._walkOffScreenSceneId = 106; } void Scene104::actions() { if (_action._lookFlag) _vm->_dialogs->show(10405); - else if (_action.isAction(VERB_LOOK, 0x5E)) + else if (_action.isAction(VERB_LOOK, NOUN_CURIOUS_WEED_PATCH)) _vm->_dialogs->show(10404); - else if (_action.isAction(VERB_LOOK, 0x158)) + else if (_action.isAction(VERB_LOOK, NOUN_SURFACE)) _vm->_dialogs->show(10403); - else if (_action.isAction(VERB_LOOK, 0x4D)) + else if (_action.isAction(VERB_LOOK, NOUN_CLIFF_FACE)) _vm->_dialogs->show(10401); - else if (_action.isAction(VERB_LOOK, 0xF0)) + else if (_action.isAction(VERB_LOOK, NOUN_OCEAN_FLOOR)) _vm->_dialogs->show(10402); else return; @@ -1843,10 +1843,10 @@ void Scene105::step() { } void Scene105::preActions() { - if (_action.isAction(VERB_SWIM_TOWARDS, 0x195)) + if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_WESTERN_CLIFF_FACE)) _game._player._walkOffScreenSceneId = 104; - if (_action.isAction(VERB_SWIM_TOWARDS, 0xF5)) + 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))) @@ -1856,7 +1856,7 @@ void Scene105::preActions() { void Scene105::actions() { if (_action._lookFlag) _vm->_dialogs->show(10512); - else if (_action.isAction(VERB_TAKE, 0x65) && _globals[kFishIn105]) { + else if (_action.isAction(VERB_TAKE, NOUN_DEAD_FISH) && _globals[kFishIn105]) { if (_game._objects.isInInventory(OBJ_DEAD_FISH)) { int randVal = _vm->getRandomNumber(74, 76); _scene->_kernelMessages.reset(); @@ -1867,25 +1867,25 @@ void Scene105::actions() { _globals[kFishIn105] = false; _vm->_dialogs->showItem(OBJ_DEAD_FISH, 802, 0); } - } else if (_action.isAction(VERB_LOOK, 0x195)) + } else if (_action.isAction(VERB_LOOK, NOUN_WESTERN_CLIFF_FACE)) _vm->_dialogs->show(10501); - else if (_action.isAction(VERB_LOOK, 0x4D)) + else if (_action.isAction(VERB_LOOK, NOUN_CLIFF_FACE)) _vm->_dialogs->show(10502); - else if (_action.isAction(VERB_LOOK, 0xF0)) + else if (_action.isAction(VERB_LOOK, NOUN_OCEAN_FLOOR)) _vm->_dialogs->show(10503); - else if (_action.isAction(VERB_LOOK, 0xDD)) + else if (_action.isAction(VERB_LOOK, NOUN_MEDICAL_WASTE)) _vm->_dialogs->show(10504); - else if (_action.isAction(VERB_TAKE, 0xDD)) + else if (_action.isAction(VERB_TAKE, NOUN_MEDICAL_WASTE)) _vm->_dialogs->show(10505); - else if (_action.isAction(VERB_LOOK, 0xE0)) + else if (_action.isAction(VERB_LOOK, NOUN_MINE)) _vm->_dialogs->show(10506); - else if (_action.isAction(VERB_LOOK, 0x65)) + else if (_action.isAction(VERB_LOOK, NOUN_DEAD_FISH)) _vm->_dialogs->show(10508); - else if (_action.isAction(VERB_LOOK, 0x158)) + else if (_action.isAction(VERB_LOOK, NOUN_SURFACE)) _vm->_dialogs->show(10509); - else if (_action.isAction(VERB_LOOK, 0xF5)) + else if (_action.isAction(VERB_LOOK, NOUN_OPEN_AREA_TO_SOUTH)) _vm->_dialogs->show(10510); - else if (_action.isAction(VERB_LOOK, 0x129)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) _vm->_dialogs->show(10511); else return; @@ -2052,20 +2052,20 @@ void Scene106::step() { } void Scene106::preActions() { - if (_action.isAction(VERB_SWIM_TOWARDS, 0x12E) || _action.isAction(VERB_SWIM_TOWARDS, 0x130)) { + if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_SEA_CLIFF) || _action.isAction(VERB_SWIM_TOWARDS, NOUN_SEAWEED_BANK)) { _game._player._stepEnabled = false; _scene->_sprites[_game._player._spritesStart + 1]->_charInfo->_velocity = 24; _game._player._walkOffScreenSceneId = 104; } - if (_action.isAction(VERB_SWIM_TOWARDS, 0xF3)) + if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_OPEN_AREA_TO_EAST)) _game._player._walkOffScreenSceneId = 107; } void Scene106::actions() { if (_action._lookFlag) _vm->_dialogs->show(10614); - else if (_action.isAction(VERB_SWIM_TO, 0xD9)) { + else if (_action.isAction(VERB_SWIM_TO, NOUN_MAIN_AIRLOCK)) { _game._player._stepEnabled = false; _game._player._prepareWalkPos = Common::Point(95, 72); _game._player._prepareWalkFacing = FACING_WEST; @@ -2073,31 +2073,31 @@ void Scene106::actions() { _game._player._readyToWalk = true; _game._player._frameNumber = 9; _backToShipFl = true; - } else if (_action.isAction(VERB_LOOK, 0x13) || _action.isAction(VERB_LOOK_AT, 0x13)) + } else if (_action.isAction(VERB_LOOK, NOUN_ANEMONE) || _action.isAction(VERB_LOOK_AT, NOUN_ANEMONE)) _vm->_dialogs->show(10601); - else if (_action.isAction(VERB_TAKE, 0x13)) + else if (_action.isAction(VERB_TAKE, NOUN_ANEMONE)) _vm->_dialogs->show(10602); - else if (_action.isAction(VERB_LOOK, 0x12F) || _action.isAction(VERB_LOOK, 0x130)) + else if (_action.isAction(VERB_LOOK, NOUN_SEAWEED) || _action.isAction(VERB_LOOK, NOUN_SEAWEED_BANK)) _vm->_dialogs->show(10603); - else if (_action.isAction(VERB_TAKE, 0x12F) || _action.isAction(VERB_TAKE, 0x130)) + else if (_action.isAction(VERB_TAKE, NOUN_SEAWEED) || _action.isAction(VERB_TAKE, NOUN_SEAWEED_BANK)) _vm->_dialogs->show(10604); - else if (_action.isAction(VERB_LOOK, 0xF3)) + else if (_action.isAction(VERB_LOOK, NOUN_OPEN_AREA_TO_EAST)) _vm->_dialogs->show(10605); - else if (_action.isAction(VERB_LOOK, 0x109) || _action.isAction(VERB_LOOK_AT, 0x109)) + 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))) _vm->_dialogs->show(10607); - else if (_action.isAction(VERB_LOOK, 0x139) || _action.isAction(VERB_LOOK_AT, 0x139)) + else if (_action.isAction(VERB_LOOK, NOUN_SHIP) || _action.isAction(VERB_LOOK_AT, NOUN_SHIP)) _vm->_dialogs->show(10608); - else if (_action.isAction(VERB_LOOK, 0xD9)) + else if (_action.isAction(VERB_LOOK, NOUN_MAIN_AIRLOCK)) _vm->_dialogs->show(10609); - else if (_action.isAction(VERB_OPEN, 0xD9)) + else if (_action.isAction(VERB_OPEN, NOUN_MAIN_AIRLOCK)) _vm->_dialogs->show(10610); - else if (_action.isAction(VERB_CLOSE, 0xD9)) + else if (_action.isAction(VERB_CLOSE, NOUN_MAIN_AIRLOCK)) _vm->_dialogs->show(10611); - else if (_action.isAction(VERB_LOOK, 0x12E)) + else if (_action.isAction(VERB_LOOK, NOUN_SEA_CLIFF)) _vm->_dialogs->show(10612); - else if (_action.isAction(VERB_LOOK, 0xF0)) + else if (_action.isAction(VERB_LOOK, NOUN_OCEAN_FLOOR)) _vm->_dialogs->show(10613); else return; @@ -2178,17 +2178,17 @@ void Scene107::step() { } void Scene107::preActions() { - if (_action.isAction(VERB_SWIM_TOWARDS, 0xF6)) + if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_OPEN_AREA_TO_WEST)) _game._player._walkOffScreenSceneId = 106; - if (_action.isAction(VERB_SWIM_TOWARDS, 0xF5)) + if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_OPEN_AREA_TO_SOUTH)) _game._player._walkOffScreenSceneId = 108; } void Scene107::actions() { if (_action._lookFlag) _vm->_dialogs->show(10708); - else if (_action.isAction(VERB_TAKE, 0x65) && _globals[kFishIn107]) { + else if (_action.isAction(VERB_TAKE, NOUN_DEAD_FISH) && _globals[kFishIn107]) { if (_game._objects.isInInventory(OBJ_DEAD_FISH)) { int randVal = _vm->getRandomNumber(74, 76); _scene->_kernelMessages.reset(); @@ -2199,25 +2199,25 @@ void Scene107::actions() { _globals[kFishIn107] = false; _vm->_dialogs->showItem(OBJ_DEAD_FISH, 802); } - } else if (_action.isAction(VERB_SWIM_TOWARDS, 0xEE)) + } else if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_NORTHERN_SEA_CLIFF)) _scene->_nextSceneId = 105; - else if (_action.isAction(VERB_LOOK, 0xEE)) + else if (_action.isAction(VERB_LOOK, NOUN_NORTHERN_SEA_CLIFF)) _vm->_dialogs->show(10701); - else if (_action.isAction(VERB_LOOK, 0x65) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_DEAD_FISH) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(10702); - else if (_action.isAction(VERB_LOOK, 0x38)) + else if (_action.isAction(VERB_LOOK, NOUN_BUSH_LIKE_FORMATION)) _vm->_dialogs->show(10703); - else if (_action.isAction(VERB_LOOK, 0x128)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCK)) _vm->_dialogs->show(10704); - else if (_action.isAction(VERB_LOOK, 0x12F)) + else if (_action.isAction(VERB_LOOK, NOUN_SEAWEED)) _vm->_dialogs->show(10705); - else if (_action.isAction(VERB_LOOK, 0xF5)) + else if (_action.isAction(VERB_LOOK, NOUN_OPEN_AREA_TO_SOUTH)) _vm->_dialogs->show(10706); - else if (_action.isAction(VERB_LOOK, 0x4D)) + else if (_action.isAction(VERB_LOOK, NOUN_CLIFF_FACE)) _vm->_dialogs->show(10707); - else if (_action.isAction(VERB_LOOK, 0xDA)) + else if (_action.isAction(VERB_LOOK, NOUN_MANTA_RAY)) _vm->_dialogs->show(10709); - else if (_action.isAction(VERB_TAKE, 0xDA)) + else if (_action.isAction(VERB_TAKE, NOUN_MANTA_RAY)) _vm->_dialogs->show(10710); else return; @@ -2273,14 +2273,14 @@ void Scene108::enter() { } void Scene108::preActions() { - if (_action.isAction(VERB_SWIM_UNDER, 0xFB)) + if (_action.isAction(VERB_SWIM_UNDER, NOUN_OVERHANG_TO_EAST)) _game._player._walkOffScreenSceneId = 109; } void Scene108::actions() { if (_action._lookFlag) _vm->_dialogs->show(10812); - else if (_action.isAction(VERB_TAKE, 0x65) && _globals[kFishIn108]) { + else if (_action.isAction(VERB_TAKE, NOUN_DEAD_FISH) && _globals[kFishIn108]) { if (_game._objects.isInInventory(OBJ_DEAD_FISH)) { int randVal = _vm->getRandomNumber(74, 76); _scene->_kernelMessages.reset(); @@ -2291,27 +2291,27 @@ void Scene108::actions() { _globals[kFishIn108] = false; _vm->_dialogs->showItem(OBJ_DEAD_FISH, 10808); } - } else if (_action.isAction(VERB_SWIM_TOWARDS, 0xF4)) + } else if (_action.isAction(VERB_SWIM_TOWARDS, NOUN_OPEN_AREA_TO_NORTH)) _scene->_nextSceneId = 107; - else if (_action.isAction(VERB_LOOK, 0x4D)) + else if (_action.isAction(VERB_LOOK, NOUN_CLIFF_FACE)) _vm->_dialogs->show(10801); - else if (_action.isAction(VERB_LOOK, 0xF0)) + else if (_action.isAction(VERB_LOOK, NOUN_OCEAN_FLOOR)) _vm->_dialogs->show(10802); - else if (_action.isAction(VERB_LOOK, 0xF1)) + else if (_action.isAction(VERB_LOOK, NOUN_ODD_ROCK_FORMATION)) _vm->_dialogs->show(10803); - else if (_action.isAction(VERB_TAKE, 0xF1)) + else if (_action.isAction(VERB_TAKE, NOUN_ODD_ROCK_FORMATION)) _vm->_dialogs->show(10804); - else if (_action.isAction(VERB_LOOK, 0x129)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) _vm->_dialogs->show(10805); - else if (_action.isAction(VERB_TAKE, 0x129)) + else if (_action.isAction(VERB_TAKE, NOUN_ROCKS)) _vm->_dialogs->show(10806); - else if (_action.isAction(VERB_LOOK, 0x65)) + else if (_action.isAction(VERB_LOOK, NOUN_DEAD_FISH)) _vm->_dialogs->show(10807); - else if (_action.isAction(VERB_LOOK, 0xFB)) + else if (_action.isAction(VERB_LOOK, NOUN_OVERHANG_TO_EAST)) _vm->_dialogs->show(10809); - else if (_action.isAction(VERB_LOOK, 0xF4)) + else if (_action.isAction(VERB_LOOK, NOUN_OPEN_AREA_TO_NORTH)) _vm->_dialogs->show(10810); - else if (_action.isAction(VERB_LOOK, 0x158)) + else if (_action.isAction(VERB_LOOK, NOUN_SURFACE)) _vm->_dialogs->show(10811); else return; @@ -2485,7 +2485,7 @@ void Scene109::step() { } void Scene109::preActions() { - if (_action.isAction(VERB_SWIM_UNDER, 0xFC)) + if (_action.isAction(VERB_SWIM_UNDER, NOUN_OVERHANG_TO_WEST)) _game._player._walkOffScreenSceneId = 108; if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE) || _action.isAction(VERB_PUT)) @@ -2500,7 +2500,7 @@ void Scene109::preActions() { } } - if ((_action.isAction(VERB_SWIM_INTO, 0x178) || _action.isAction(VERB_SWIM_TO, 0x146)) + if ((_action.isAction(VERB_SWIM_INTO, NOUN_TUNNEL) || _action.isAction(VERB_SWIM_TO, NOUN_SMALL_HOLE)) && (!_globals[kHoovicAlive] || _globals[kHoovicSated]) && (_action.isObject(0x178))) _game._player._walkOffScreenSceneId = 110; @@ -2685,33 +2685,33 @@ void Scene109::actions() { } } - if (_action.isAction(VERB_TAKE, 0x35) && _game._objects.isInRoom(OBJ_BURGER)) { + if (_action.isAction(VERB_TAKE, NOUN_BURGER) && _game._objects.isInRoom(OBJ_BURGER)) { _scene->_sequences.remove(_globals._sequenceIndexes[3]); _game._objects.addToInventory(OBJ_BURGER); - } else if (_action.isAction(VERB_LOOK, 0xF0)) + } else if (_action.isAction(VERB_LOOK, NOUN_OCEAN_FLOOR)) _vm->_dialogs->show(10901); - else if (_action.isAction(VERB_LOOK, 0x5A)) + 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)) _vm->_dialogs->show(10903); - else if (_action.isAction(VERB_LOOK, 0x129)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) _vm->_dialogs->show(10904); - else if (_action.isAction(VERB_TAKE, 0x129)) + else if (_action.isAction(VERB_TAKE, NOUN_ROCKS)) _vm->_dialogs->show(10905); - else if (_action.isAction(VERB_LOOK, 0x45)) + else if (_action.isAction(VERB_LOOK, NOUN_CAVE_WALL)) _vm->_dialogs->show(10906); - else if (_action.isAction(VERB_LOOK, 0x178)) { + else if (_action.isAction(VERB_LOOK, NOUN_TUNNEL)) { if (_globals[kHoovicAlive]) _vm->_dialogs->show(10907); else _vm->_dialogs->show(10913); - } else if (_action.isAction(VERB_LOOK, 0x146)) + } else if (_action.isAction(VERB_LOOK, NOUN_SMALL_HOLE)) _vm->_dialogs->show(10908); - else if (_action.isAction(VERB_LOOK, 0xFC)) + else if (_action.isAction(VERB_LOOK, NOUN_OVERHANG_TO_WEST)) _vm->_dialogs->show(10911); - else if (_action.isAction(VERB_PUT, 0x146)) + else if (_action.isAction(VERB_PUT, NOUN_SMALL_HOLE)) _vm->_dialogs->show(10910); - else if (_action.isAction(VERB_LOOK, 0x66)) + else if (_action.isAction(VERB_LOOK, NOUN_DEAD_PURPLE_MONSTER)) _vm->_dialogs->show(10914); else return; @@ -2789,7 +2789,7 @@ void Scene110::step() { } void Scene110::preActions() { - if (_action.isAction(VERB_SWIM_THROUGH, 0x41)) + if (_action.isAction(VERB_SWIM_THROUGH, NOUN_CAVE_ENTRANCE)) _game._player._walkOffScreenSceneId = 109; if (_crabsFl) { @@ -2817,7 +2817,7 @@ void Scene110::preActions() { } void Scene110::actions() { - if (_action.isAction(VERB_SWIM_THROUGH, 0x178)) { + if (_action.isAction(VERB_SWIM_THROUGH, NOUN_TUNNEL)) { switch (_game._trigger) { case 0: _scene->loadAnimation(Resources::formatName(110, 'T', 0, EXT_AA, ""), 1); @@ -2831,21 +2831,21 @@ void Scene110::actions() { _scene->_nextSceneId = 111; break; } - } else if ((_action._lookFlag) || _action.isAction(VERB_LOOK, 0x3F)) + } else if ((_action._lookFlag) || _action.isAction(VERB_LOOK, NOUN_CAVE)) _vm->_dialogs->show(11001); - else if (_action.isAction(VERB_LOOK, 0x40) || _action.isAction(VERB_LOOK_AT, 0x40)) + else if (_action.isAction(VERB_LOOK, NOUN_CAVE_CEILING) || _action.isAction(VERB_LOOK_AT, NOUN_CAVE_CEILING)) _vm->_dialogs->show(11002); - else if (_action.isAction(VERB_LOOK, 0x129)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) _vm->_dialogs->show(11003); - else if (_action.isAction(VERB_TAKE, 0x129)) + else if (_action.isAction(VERB_TAKE, NOUN_ROCKS)) _vm->_dialogs->show(11004); - else if (_action.isAction(VERB_LOOK, 0x178)) + else if (_action.isAction(VERB_LOOK, NOUN_TUNNEL)) _vm->_dialogs->show(11005); - else if (_action.isAction(VERB_LOOK, 0x41)) + else if (_action.isAction(VERB_LOOK, NOUN_CAVE_ENTRANCE)) _vm->_dialogs->show(11006); - else if (_action.isAction(VERB_LOOK, 0x8F)) + else if (_action.isAction(VERB_LOOK, NOUN_FUNGOIDS)) _vm->_dialogs->show(11007); - else if (_action.isAction(VERB_TAKE, 0x8F)) + else if (_action.isAction(VERB_TAKE, NOUN_FUNGOIDS)) _vm->_dialogs->show(11008); else return; @@ -2964,12 +2964,12 @@ void Scene111::step() { } void Scene111::preActions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x41)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_CAVE_ENTRANCE)) _game._player._walkOffScreenSceneId = 212; } void Scene111::actions() { - if (_action.isAction(VERB_DIVE_INTO, 0x116) && _game._objects.isInInventory(OBJ_REBREATHER)) { + if (_action.isAction(VERB_DIVE_INTO, NOUN_POOL) && _game._objects.isInInventory(OBJ_REBREATHER)) { switch (_game._trigger) { case 0: _scene->loadAnimation(Resources::formatName(111, 'A', 1, EXT_AA, ""), 1); @@ -2982,15 +2982,15 @@ void Scene111::actions() { _scene->_nextSceneId = 110; break; } - } else if (_action.isAction(VERB_LOOK, 0x43)) + } else if (_action.isAction(VERB_LOOK, NOUN_CAVE_FLOOR)) _vm->_dialogs->show(11101); - else if (_action.isAction(VERB_LOOK, 0x116)) + else if (_action.isAction(VERB_LOOK, NOUN_POOL)) _vm->_dialogs->show(11102); - else if (_action.isAction(VERB_LOOK, 0x41)) + else if (_action.isAction(VERB_LOOK, NOUN_CAVE_ENTRANCE)) _vm->_dialogs->show(11103); - else if (_action.isAction(VERB_LOOK, 0x153)) + else if (_action.isAction(VERB_LOOK, NOUN_STALAGMITES)) _vm->_dialogs->show(11104); - else if (_action.isAction(VERB_LOOK, 0xC8)) + 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))) _vm->_dialogs->show(11106); diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index cfb261c72b..173c641240 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -121,7 +121,7 @@ void Scene201::setup() { setPlayerSpritesPrefix(); setAAName(); - _scene->addActiveVocab(NOUN_15F); + _scene->addActiveVocab(NOUN_SWOOPING_CREATURE); _scene->addActiveVocab(NOUN_BIRDS); _scene->addActiveVocab(VERB_WALKTO); } @@ -280,9 +280,9 @@ void Scene201::step() { void Scene201::actions() { if (_action._lookFlag == false) { - if (_action.isAction(VERB_WALK_TOWARDS, 0x83)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_SOUTH)) _scene->_nextSceneId = 202; - else if ((_action.isAction(VERB_CLIMB_UP, 0x156)) || (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER)) || (_action.isAction(VERB_WALK_INSIDE, NOUN_STRANGE_DEVICE))) { + else if ((_action.isAction(VERB_CLIMB_UP, NOUN_STEPS)) || (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER)) || (_action.isAction(VERB_WALK_INSIDE, NOUN_STRANGE_DEVICE))) { if (_game._trigger == 0) { _game._player._stepEnabled = false; _game._player._visible = false; @@ -291,30 +291,30 @@ void Scene201::actions() { } else if (_game._trigger == 1) { _scene->_nextSceneId = 213; } - } else if (_action.isAction(VERB_LOOK, 0x1A6)) { + } else if (_action.isAction(VERB_LOOK, NOUN_GRASSY_FIELD)) { _vm->_dialogs->show(20101); - } else if (_action.isAction(VERB_LOOK, 0x129)) { + } else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) { _vm->_dialogs->show(20102); - } else if (_action.isAction(VERB_LOOK, 0x16F)) { + } else if (_action.isAction(VERB_LOOK, NOUN_THORNY_BUSH)) { _vm->_dialogs->show(20103); - } else if (_action.isAction(VERB_LOOK, 0x142)) { + } else if (_action.isAction(VERB_LOOK, NOUN_SKY)) { _vm->_dialogs->show(20104); - } else if (_action.isAction(VERB_LOOK, 0x18F)) { + } else if (_action.isAction(VERB_LOOK, NOUN_WATER)) { _vm->_dialogs->show(20105); - } else if (_action.isAction(VERB_LOOK, 0x1B9)) { + } else if (_action.isAction(VERB_LOOK, NOUN_ISLAND_IN_DISTANCE)) { _vm->_dialogs->show(20106); - } else if (_action.isAction(VERB_LOOK, 0x192)) { + } else if (_action.isAction(VERB_LOOK, NOUN_WEATHER_STATION)) { _vm->_dialogs->show(20107); - } else if (_action.isAction(VERB_LOOK, 0x1BA)) { + } else if (_action.isAction(VERB_LOOK, NOUN_PATH)) { _vm->_dialogs->show(20108); - } else if (_action.isAction(VERB_LOOK, 0x83)) { + } else if (_action.isAction(VERB_LOOK, NOUN_FIELD_TO_SOUTH)) { _vm->_dialogs->show(20110); - } else if (_action.isAction(VERB_LOOK, 0x1B6)) { + } else if (_action.isAction(VERB_LOOK, NOUN_STRANGE_DEVICE)) { if (_globals[kMeteorologistEverSeen]) _vm->_dialogs->show(20112); else _vm->_dialogs->show(20109); - } else if (_action.isAction(VERB_LOOK, 0x16C)) { + } else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER)) { _vm->_dialogs->show(20113); } else return; @@ -731,7 +731,7 @@ void Scene202::preActions() { } } - if (_action.isAction(VERB_LOOK, 0x27) && (_action._activeAction._indirectObjectId > 0)) { + if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS) && (_action._activeAction._indirectObjectId > 0)) { if (!player._readyToWalk || _ladderTopFl) _game._player._needToWalk = false; else @@ -751,9 +751,9 @@ void Scene202::actions() { if (_action.isAction(VERB_CLIMB_DOWN, NOUN_LADDER)) { _action._inProgress = false; return; - } else if (_action.isAction(VERB_WALK_TOWARDS, 0x83)) { + } else if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_SOUTH)) { _scene->_nextSceneId = 203; - } else if (_action.isAction(VERB_WALK_TOWARDS, 0x82)) { + } else if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_NORTH)) { if (_globals[kMeteorologistStatus] != METEOROLOGIST_GONE) { if (_scene->_activeAnimation) _globals[kMeteorologistStatus] = METEOROLOGIST_PRESENT; @@ -930,37 +930,37 @@ void Scene202::actions() { return; } } - } else if (_action.isAction(VERB_WALK_INSIDE, 0xAA)) { + } else if (_action.isAction(VERB_WALK_INSIDE, NOUN_HUT)) { setRandomKernelMessage(); } else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) { _vm->_dialogs->show(20202); - } else if (_action.isAction(VERB_LOOK, 0x86)) { + } else if (_action.isAction(VERB_LOOK, NOUN_FIRE_PIT)) { _vm->_dialogs->show(20203); - } else if (_action.isAction(VERB_LOOK, 0x19C)) { + } else if (_action.isAction(VERB_LOOK, NOUN_GRASS)) { _vm->_dialogs->show(20204); - } else if (_action.isAction(VERB_LOOK, 0x82)) { + } else if (_action.isAction(VERB_LOOK, NOUN_FIELD_TO_NORTH)) { if ((_globals[kMeteorologistStatus] == METEOROLOGIST_ABSENT) || (_globals[kMeteorologistStatus] == METEOROLOGIST_GONE)) _vm->_dialogs->show(20205); else if (_globals[kMeteorologistStatus] == METEOROLOGIST_PRESENT) _vm->_dialogs->show(20220); - } else if (_action.isAction(VERB_LOOK, 0x18E)) { + } else if (_action.isAction(VERB_LOOK, NOUN_WATCH_TOWER)) { _vm->_dialogs->show(20206); - } else if (_action.isAction(VERB_LOOK, 0x164)) { + } else if (_action.isAction(VERB_LOOK, NOUN_TALL_GRASS)) { _vm->_dialogs->show(20207); - } else if (_action.isAction(VERB_LOOK, 0x175)) { + } else if (_action.isAction(VERB_LOOK, NOUN_TREES)) { _vm->_dialogs->show(20208); - } else if (_action.isAction(VERB_LOOK, 0x174)) { + } else if (_action.isAction(VERB_LOOK, NOUN_TREE)) { _vm->_dialogs->show(20209); - } else if (_action.isAction(VERB_LOOK, 0x142)) { + } else if (_action.isAction(VERB_LOOK, NOUN_SKY)) { _vm->_dialogs->show(20210); - } else if (_action.isAction(VERB_LOOK, 0xAA)) { + } else if (_action.isAction(VERB_LOOK, NOUN_HUT)) { if ((_game._player._playerPos == Common::Point(77, 105)) && (_game._player._facing == FACING_NORTH)) _vm->_dialogs->show(20212); else _vm->_dialogs->show(20211); } else if (_action.isAction(VERB_LOOK, NOUN_STRANGE_DEVICE)) { _vm->_dialogs->show(20213); - } else if (_action.isAction(VERB_LOOK, 0x1B5)) { + } else if (_action.isAction(VERB_LOOK, NOUN_OCEAN_IN_DISTANCE)) { _vm->_dialogs->show(20214); } else if (_action.isAction(VERB_LOOK, NOUN_SKULL)) { _vm->_dialogs->show(20215); @@ -1070,34 +1070,34 @@ void Scene203::step() { } void Scene203::preActions() { - if (_rhotundaEatFl && !_action.isAction(VERB_WALK_TOWARDS, 0x83)) { + if (_rhotundaEatFl && !_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_SOUTH)) { _game._player.walk(Common::Point(158, 136), FACING_SOUTH); _action._inProgress = false; return; } - if (_action.isAction(VERB_WALKTO, 0xF3)) + if (_action.isAction(VERB_WALKTO, NOUN_OPEN_AREA_TO_EAST)) _game._player._walkOffScreenSceneId = 209; } void Scene203::actions() { if (_action._savedFields._lookFlag) { _vm->_dialogs->show(20307); - } else if (_action.isAction(VERB_WALK_TOWARDS, 0x83)) { + } else if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_SOUTH)) { _scene->_nextSceneId = 208; - } else if (_action.isAction(VERB_WALK_TOWARDS, 0x82)) { + } else if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_NORTH)) { _scene->_nextSceneId = 202; - } else if (_action.isAction(VERB_LOOK, 0x142)) { + } else if (_action.isAction(VERB_LOOK, NOUN_SKY)) { _vm->_dialogs->show(20301); - } else if (_action.isAction(VERB_LOOK, 0x4D)) { + } else if (_action.isAction(VERB_LOOK, NOUN_CLIFF_FACE)) { _vm->_dialogs->show(20302); - } else if (_action.isAction(VERB_LOOK, 0x100)) { + } else if (_action.isAction(VERB_LOOK, NOUN_PALM_TREE)) { _vm->_dialogs->show(20303); - } else if (_action.isAction(VERB_LOOK, 0x82)) { + } else if (_action.isAction(VERB_LOOK, NOUN_FIELD_TO_NORTH)) { _vm->_dialogs->show(20304); - } else if (_action.isAction(VERB_LOOK, 0x1A6)) { + } else if (_action.isAction(VERB_LOOK, NOUN_GRASSY_FIELD)) { _vm->_dialogs->show(20305); - } else if (_action.isAction(VERB_LOOK, 0x30)) { + } else if (_action.isAction(VERB_LOOK, NOUN_BOULDERS)) { _vm->_dialogs->show(20305); } else return; @@ -1301,9 +1301,9 @@ void Scene205::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(20502); - else if (_action.isAction(VERB_LOOK, 0x27, 0x1C8)) + else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x1C8)) _vm->_dialogs->show(20518); - else if (_action.isAction(VERB_TALKTO, 0x1DC)) { + else if (_action.isAction(VERB_TALKTO, NOUN_NATIVE_WOMAN)) { if (_game._trigger == 0) { _game._player._stepEnabled = false; _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 18, 1, 120, _game.getQuote(0x73)); @@ -1314,14 +1314,14 @@ void Scene205::actions() { _dialog1.write(0x75, true); _dialog1.start(); } - } else if (_action.isAction(VERB_GIVE, 0x1DC) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { + } else if (_action.isAction(VERB_GIVE, NOUN_NATIVE_WOMAN) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { if (_game._trigger == 0) { _game._player._stepEnabled = false; int rndVal = _vm->getRandomNumber(0xAC, 0xAE); _scene->_kernelMessages.add(Common::Point(186, 27), 0xFBFA, 32, 1, 120, _game.getQuote(rndVal)); } else if (_game._trigger == 1) _game._player._stepEnabled = true; - } else if (_action.isAction(VERB_WALKTO, 0x1C8)) { + } else if (_action.isAction(VERB_WALKTO, NOUN_OPPOSITE_BANK)) { if (_game._trigger == 0) { _game._player._visible = false; _game._player._stepEnabled = false; @@ -1342,50 +1342,50 @@ void Scene205::actions() { _scene->_reloadSceneFlag = true; } } else { - if (_action.isAction(VERB_WALK_DOWN, 0x1C7)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_SOUTH)) _scene->_nextSceneId = 210; - if (_action.isAction(VERB_WALKTO, 0x86) || _action.isAction(VERB_WALKTO, 0x1C2)) { + if (_action.isAction(VERB_WALKTO, NOUN_FIRE_PIT) || _action.isAction(VERB_WALKTO, NOUN_CHICKEN_ON_SPIT)) { if (_game._objects.isInRoom(OBJ_CHICKEN)) { _scene->_kernelMessages.reset(); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x6B)); } - } else if (_action.isAction(VERB_TAKE, 0x1C2) && _globals[kChickenPermitted] && _game._objects.isInRoom(OBJ_CHICKEN)) { + } 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); _vm->_dialogs->showItem(OBJ_CHICKEN, 812); - } else if (_action.isAction(VERB_TAKE, 0x1C2) && (!_globals[kChickenPermitted])) + } 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)); - else if (_action.isAction(VERB_LOOK, 0x1DC)) + else if (_action.isAction(VERB_LOOK, NOUN_NATIVE_WOMAN)) _vm->_dialogs->show(20503); - else if (_action.isAction(VERB_LOOK, 0xAA)) + else if (_action.isAction(VERB_LOOK, NOUN_HUT)) _vm->_dialogs->show(20504); - else if (_action.isAction(VERB_LOOK, 0x49) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_CHICKEN) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(20505); - else if (_action.isAction(VERB_TAKE, 0x49) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_TAKE, NOUN_CHICKEN) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(20506); - else if (_action.isAction(VERB_LOOK, 0x1C2)) + else if (_action.isAction(VERB_LOOK, NOUN_CHICKEN_ON_SPIT)) _vm->_dialogs->show(20507); - else if (_action.isAction(VERB_LOOK, 0x86)) + else if (_action.isAction(VERB_LOOK, NOUN_FIRE_PIT)) _vm->_dialogs->show(20508); - else if (_action.isAction(VERB_TAKE, 0x86)) + else if (_action.isAction(VERB_TAKE, NOUN_FIRE_PIT)) _vm->_dialogs->show(20509); - else if (_action.isAction(VERB_LOOK, 0x1C5)) + else if (_action.isAction(VERB_LOOK, NOUN_STREAM)) _vm->_dialogs->show(20510); - else if (_action.isAction(VERB_LOOK, 0x1C8)) + else if (_action.isAction(VERB_LOOK, NOUN_OPPOSITE_BANK)) _vm->_dialogs->show(20511); else if (_game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId)) - && ( _action.isAction(VERB_GIVE, 0x1C5) || _action.isAction(VERB_THROW, 0x1C5) - || _action.isAction(VERB_GIVE, 0x10D) || _action.isAction(VERB_THROW, 0x10D))) + && ( _action.isAction(VERB_GIVE, NOUN_STREAM) || _action.isAction(VERB_THROW, NOUN_STREAM) + || _action.isAction(VERB_GIVE, NOUN_PIRANHA) || _action.isAction(VERB_THROW, NOUN_PIRANHA))) _vm->_dialogs->show(20512); - else if (_action.isAction(VERB_LOOK, 0x10D)) + else if (_action.isAction(VERB_LOOK, NOUN_PIRANHA)) _vm->_dialogs->show(20513); - else if (_action.isAction(VERB_LOOK, 0x1C4)) + else if (_action.isAction(VERB_LOOK, NOUN_TWINKIFRUIT_BUSH)) _vm->_dialogs->show(20514); - else if (_action.isAction(VERB_TAKE, 0x1C4)) + else if (_action.isAction(VERB_TAKE, NOUN_TWINKIFRUIT_BUSH)) _vm->_dialogs->show(20515); - else if (_action.isAction(VERB_TAKE, 0x1DC)) + else if (_action.isAction(VERB_TAKE, NOUN_NATIVE_WOMAN)) _vm->_dialogs->show(20517); else return; @@ -1519,10 +1519,10 @@ void Scene207::step() { } void Scene207::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x1AE)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_WEST)) _game._player._walkOffScreenSceneId = 211; - if (_action.isAction(VERB_WALK_TOWARDS, 0x1AB)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_OPEN_FIELD_TO_EAST)) _game._player._walkOffScreenSceneId = 208; if ((_action.isAction(VERB_WALKTO)) || (_action.isAction(VERB_LOOK))) { @@ -1537,7 +1537,7 @@ void Scene207::preActions() { void Scene207::actions() { if (_action._savedFields._lookFlag) { _vm->_dialogs->show(20711); - } else if (_action.isAction(VERB_WALK_THROUGH, 0x70)) { + } else if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY)) { _scene->_nextSceneId = 214; } else { if ((_game._player._playerPos.x > 150) && (_game._player._playerPos.x < 189) && @@ -1555,33 +1555,33 @@ void Scene207::actions() { _eyeFl = false; } - if (_action.isAction(VERB_LOOK, 0x69)) { + if (_action.isAction(VERB_LOOK, NOUN_DENSE_FOREST)) { _vm->_dialogs->show(20701); - } else if (_action.isAction(VERB_LOOK, 0x1AF)) { + } else if (_action.isAction(VERB_LOOK, NOUN_HEDGE)) { _vm->_dialogs->show(20702); - } else if (_action.isAction(VERB_LOOK, 0x141)) { + } else if (_action.isAction(VERB_LOOK, NOUN_SKULL_AND_CROSSBONES)) { _vm->_dialogs->show(20703); - } else if (_action.isAction(VERB_LOOK, 0x3E)) { + } else if (_action.isAction(VERB_LOOK, NOUN_CAULDRON)) { _vm->_dialogs->show(20704); - } else if (_action.isAction(VERB_LOOK, 0x198)) { + } else if (_action.isAction(VERB_LOOK, NOUN_WITCHDOCTOR_HUT)) { _vm->_dialogs->show(20705); - } else if (_action.isAction(VERB_LOOK, 0x1AE)) { + } else if (_action.isAction(VERB_LOOK, NOUN_PATH_TO_WEST)) { _vm->_dialogs->show(20706); - } else if (_action.isAction(VERB_LOOK, 0xE8)) { + } else if (_action.isAction(VERB_LOOK, NOUN_MOUNTAINS)) { _vm->_dialogs->show(20707); - } else if (_action.isAction(VERB_LOOK, 0x12)) { + } else if (_action.isAction(VERB_LOOK, NOUN_ALOE_PLANT)) { _vm->_dialogs->show(20708); - } else if (_action.isAction(VERB_LOOK, 0x1AC)) { + } else if (_action.isAction(VERB_LOOK, NOUN_LAWN)) { _vm->_dialogs->show(20709); - } else if (_action.isAction(VERB_LOOK, 0x185)) { + } else if (_action.isAction(VERB_LOOK, NOUN_VULTURE)) { _vm->_dialogs->show(20710); - } else if (_action.isAction(VERB_TAKE, 0x141)) { + } else if (_action.isAction(VERB_TAKE, NOUN_SKULL_AND_CROSSBONES)) { _vm->_dialogs->show(20712); - } else if (_action.isAction(VERB_TAKE, 0x12)) { + } else if (_action.isAction(VERB_TAKE, NOUN_ALOE_PLANT)) { _vm->_dialogs->show(20713); - } else if (_action.isAction(VERB_LOOK, 0x14D)) { + } else if (_action.isAction(VERB_LOOK, NOUN_SPIDER)) { _vm->_dialogs->show(20714); - } else if (_action.isAction(VERB_TAKE, 0x14D)) { + } else if (_action.isAction(VERB_TAKE, NOUN_SPIDER)) { _vm->_dialogs->show(20715); } else return; @@ -1725,10 +1725,10 @@ void Scene208::preActions() { if (_action.isAction(VERB_LOOK) && player._readyToWalk) player._needToWalk = true; - if (_action.isAction(VERB_WALK_TOWARDS, 0x9B)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_GRASSLAND_TO_EAST)) player._walkOffScreenSceneId = 209; - if (_action.isAction(VERB_WALK_TOWARDS, 0xF6)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_OPEN_AREA_TO_WEST)) player._walkOffScreenSceneId = 207; } @@ -1804,7 +1804,7 @@ void Scene208::subAction(int mode) { } void Scene208::actions() { - if (_action.isAction(VERB_WALK_TOWARDS, 0x19F)) { + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_LOWLANDS_TO_NORTH)) { if (_globals[kRhotundaStatus]) _scene->_nextSceneId = 203; else if (_game._trigger == 0) { @@ -1814,7 +1814,7 @@ void Scene208::actions() { } else if (_game._trigger == 1) { _scene->_nextSceneId = 203; } - } else if (_action.isAction(VERB_WALK_TOWARDS, 0x83)) { + } else if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_SOUTH)) { _scene->_nextSceneId = 212; } else if (_action.isAction(VERB_TAKE, NOUN_PILE_OF_LEAVES) && (!_globals[kLeavesStatus] || _game._trigger)) { subAction(1); @@ -1839,19 +1839,19 @@ void Scene208::actions() { if (_game._player._stepEnabled) { _vm->_dialogs->show(20812); } - } else if (_action.isAction(VERB_LOOK, 0x5D)) { + } else if (_action.isAction(VERB_LOOK, NOUN_CUMULOUS_CLOUD)) { _vm->_dialogs->show(20801); - } else if (_action.isAction(VERB_LOOK, 0xF6)) { + } else if (_action.isAction(VERB_LOOK, NOUN_OPEN_AREA_TO_WEST)) { _vm->_dialogs->show(20802); - } else if (_action.isAction(VERB_LOOK, 0x16F)) { + } else if (_action.isAction(VERB_LOOK, NOUN_THORNY_BUSH)) { _vm->_dialogs->show(20803); - } else if (_action.isAction(VERB_LOOK, 0x129)) { + } else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) { _vm->_dialogs->show(20804); - } else if (_action.isAction(VERB_LOOK, 0x1A1)) { + } else if (_action.isAction(VERB_LOOK, NOUN_SMALL_CACTUS)) { _vm->_dialogs->show(20805); - } else if (_action.isAction(VERB_TAKE, 0x1A1)) { + } else if (_action.isAction(VERB_TAKE, NOUN_SMALL_CACTUS)) { _vm->_dialogs->show(20806); - } else if (_action.isAction(VERB_LOOK, 0x9B)) { + } else if (_action.isAction(VERB_LOOK, NOUN_GRASSLAND_TO_EAST)) { _vm->_dialogs->show(20807); } else if (_action.isAction(VERB_LOOK, NOUN_DEEP_PIT)) { _vm->_dialogs->show(20808); @@ -1862,7 +1862,7 @@ void Scene208::actions() { _vm->_dialogs->show(20810); else _vm->_dialogs->show(20811); - } else if (_action.isAction(VERB_LOOK, 0x174) || _action.isAction(VERB_LOOK, 0x175)) { + } else if (_action.isAction(VERB_LOOK, NOUN_TREE) || _action.isAction(VERB_LOOK, NOUN_TREES)) { _vm->_dialogs->show(20813); } else if (_action.isAction(VERB_TAKE, NOUN_LEAF_COVERED_PIT)) { _vm->_dialogs->show(20814); @@ -3148,7 +3148,7 @@ void Scene209::step() { } void Scene209::preActions() { - if (_action.isAction(VERB_WALK_TOWARDS, 0x84)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_WEST)) _game._player._walkOffScreenSceneId = 208; if (_globals[kMonkeyStatus] == MONKEY_HAS_BINOCULARS) { @@ -3176,7 +3176,7 @@ void Scene209::actions() { return; } - if (_action.isAction(VERB_WALK_TOWARDS, 0x1A2)) { + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_ROCKY_AREA_TO_NORTH)) { _scene->_nextSceneId = 203; _action._inProgress = false; return; @@ -3353,7 +3353,7 @@ void Scene209::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x27) && (_game._trigger || _game._objects.isInRoom(OBJ_BINOCULARS))) { + if (_action.isAction(VERB_TAKE, NOUN_BINOCULARS) && (_game._trigger || _game._objects.isInRoom(OBJ_BINOCULARS))) { switch (_game._trigger) { case 0: _globals._spriteIndexes[10] = _scene->_sprites.addSprites("*RXMBD_8"); @@ -3386,61 +3386,61 @@ void Scene209::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x142)) { + if (_action.isAction(VERB_LOOK, NOUN_SKY)) { _vm->_dialogs->show(20901); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x1A3)) { + if (_action.isAction(VERB_LOOK, NOUN_BAMBOO_LIKE_PLANT)) { _vm->_dialogs->show(20902); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x1A4)) { + if (_action.isAction(VERB_LOOK, NOUN_MOUNTAINSIDE)) { _vm->_dialogs->show(20903); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x1A6)) { + if (_action.isAction(VERB_LOOK, NOUN_GRASSY_FIELD)) { _vm->_dialogs->show(20904); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x84)) { + if (_action.isAction(VERB_LOOK, NOUN_FIELD_TO_WEST)) { _vm->_dialogs->show(20905); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x1A2)) { + if (_action.isAction(VERB_LOOK, NOUN_ROCKY_AREA_TO_NORTH)) { _vm->_dialogs->show(20906); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x10F) && (_action._savedFields._mainObjectSource == 4)) { + if (_action.isAction(VERB_LOOK, NOUN_PLANT_STALK) && (_action._savedFields._mainObjectSource == 4)) { _vm->_dialogs->show(20907); _action._inProgress = false; return; } - if (_action.isAction(VERB_GIVE, 0x17A, 0xE3) || _action.isAction(VERB_THROW, 0x17A, 0xE3)) { + if (_action.isAction(VERB_GIVE, NOUN_TWINKIFRUIT, 0xE3) || _action.isAction(VERB_THROW, NOUN_TWINKIFRUIT, 0xE3)) { _vm->_dialogs->show(20909); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x175)) { + if (_action.isAction(VERB_LOOK, NOUN_TREES)) { _vm->_dialogs->show(20913); _action._inProgress = false; return; } - if (_action.isAction(VERB_THROW, 0xE3) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { + if (_action.isAction(VERB_THROW, NOUN_MONKEY) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { if (!_action.isAction(0x114)) { _vm->_dialogs->show(20915); } @@ -3448,13 +3448,13 @@ void Scene209::actions() { return; } - if (_action.isAction(VERB_THROW, 0x114, 0xE3)) { + if (_action.isAction(VERB_THROW, NOUN_POISON_DARTS, 0xE3)) { _vm->_dialogs->show(20916); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x100)) { + if (_action.isAction(VERB_LOOK, NOUN_PALM_TREE)) { if (_globals[kMonkeyStatus] == MONKEY_HAS_BINOCULARS) { if (_monkeyPosition == 1) _vm->_dialogs->show(20917); @@ -3470,13 +3470,13 @@ void Scene209::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x3A4)) { + if (_action.isAction(VERB_LOOK, NOUN_MELON_MUSH)) { _vm->_dialogs->show(20920); _action._inProgress = false; return; } - if (_action.isAction(VERB_TAKE, 0x3A4)) { + if (_action.isAction(VERB_TAKE, NOUN_MELON_MUSH)) { _vm->_dialogs->show(20921); _action._inProgress = false; return; @@ -4321,16 +4321,16 @@ void Scene210::step() { void Scene210::preActions() { _stopWalking = false; - if (_action.isAction(VERB_WALK_DOWN, 0x1C1)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_EAST)) _game._player._walkOffScreenSceneId = 211; } void Scene210::actions() { - if (_action.isAction(VERB_LOOK, 0x27, 0x1C0)) { + if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x1C0)) { _vm->_dialogs->show(21017); } else if (_game._screenObjects._inputMode == 1) { handleConversations(); - } else if (_action.isAction(VERB_TALKTO, 0x1DC) || + } else if (_action.isAction(VERB_TALKTO, NOUN_NATIVE_WOMAN) || ((_game._player._playerPos == Common::Point(214, 150)) && (_game._player._facing == FACING_NORTHWEST) && (_twinkleAnimationType == 1) && _stopWalking)) { switch (_game._trigger) { case 0: { @@ -4381,7 +4381,7 @@ void Scene210::actions() { _curDialogNode = 1; break; } - } else if (_action.isAction(VERB_GIVE, 0x1DC) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { + } else if (_action.isAction(VERB_GIVE, NOUN_NATIVE_WOMAN) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { switch (_game._trigger) { case 0: { int quote = _vm->getRandomNumber(172, 174); @@ -4397,11 +4397,11 @@ void Scene210::actions() { _shouldMoveHead = false; break; } - } else if (_action.isAction(VERB_WALK_DOWN, 0x1BF) || _action.isAction(VERB_WALK_TOWARDS, 0x1C0)) { + } else if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_NORTH) || _action.isAction(VERB_WALK_TOWARDS, NOUN_HUT_TO_NORTH)) { _scene->_nextSceneId = 205; - } else if (_action.isAction(VERB_WALK_THROUGH, 0x70)) { + } else if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY)) { _scene->_nextSceneId = 215; - } else if ((_action.isAction(VERB_PULL, 0x5F) || _action.isAction(VERB_OPEN, 0x5F)) && !_globals[kCurtainOpen]) { + } else if ((_action.isAction(VERB_PULL, NOUN_CURTAIN) || _action.isAction(VERB_OPEN, NOUN_CURTAIN)) && !_globals[kCurtainOpen]) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -4419,7 +4419,7 @@ void Scene210::actions() { _scene->_dynamicHotspots.setCursor(_doorway, CURSOR_GO_UP); break; } - } else if ((_action.isAction(VERB_PULL, 0x5F) || _action.isAction(VERB_CLOSE, 0x5F)) && _globals[kCurtainOpen]) { + } else if ((_action.isAction(VERB_PULL, NOUN_CURTAIN) || _action.isAction(VERB_CLOSE, NOUN_CURTAIN)) && _globals[kCurtainOpen]) { switch (_game._trigger) { case 0: _scene->_sequences.remove(_globals._sequenceIndexes[1]); @@ -4441,7 +4441,7 @@ void Scene210::actions() { _globals[kCurtainOpen] = false; break; } - } else if (_action.isAction(VERB_LOOK, 0xAA)) { + } else if (_action.isAction(VERB_LOOK, NOUN_HUT)) { if (_globals[kTwinklesStatus] == TWINKLES_GONE) { if (_game._storyMode == STORYMODE_NAUGHTY) _vm->_dialogs->show(21003); @@ -4450,31 +4450,31 @@ void Scene210::actions() { } else { _vm->_dialogs->show(21001); } - } else if (_action.isAction(VERB_LOOK, 0x31)) { + } else if (_action.isAction(VERB_LOOK, NOUN_BRA)) { _vm->_dialogs->show(21004); - } else if (_action.isAction(VERB_LOOK, 0xA7)) { + } else if (_action.isAction(VERB_LOOK, NOUN_HOTPANTS)) { _vm->_dialogs->show(21005); - } else if (_action.isAction(VERB_TAKE, 0xA7) || _action.isAction(VERB_TAKE, 0x31)) { + } else if (_action.isAction(VERB_TAKE, NOUN_HOTPANTS) || _action.isAction(VERB_TAKE, NOUN_BRA)) { _vm->_dialogs->show(21006); - } else if (_action.isAction(VERB_LOOK, 0x1C5)) { + } else if (_action.isAction(VERB_LOOK, NOUN_STREAM)) { _vm->_dialogs->show(21007); - } else if (_action.isAction(VERB_LOOK, 0x3A)) { + } else if (_action.isAction(VERB_LOOK, NOUN_BUSHY_FERN)) { _vm->_dialogs->show(21008); - } else if (_action.isAction(VERB_LOOK, 0x1B0)) { + } else if (_action.isAction(VERB_LOOK, NOUN_VILLAGE_PATH)) { _vm->_dialogs->show(21009); - } else if (_action.isAction(VERB_LOOK, 0x1DC)) { + } else if (_action.isAction(VERB_LOOK, NOUN_NATIVE_WOMAN)) { _vm->_dialogs->show(21010); - } else if (_action.isAction(VERB_SHOOT, 0x1DC) || _action.isAction(VERB_HOSE_DOWN, 0x1DC)) { + } else if (_action.isAction(VERB_SHOOT, NOUN_NATIVE_WOMAN) || _action.isAction(VERB_HOSE_DOWN, NOUN_NATIVE_WOMAN)) { _vm->_dialogs->show(21011); - } else if (_action.isAction(VERB_LOOK, 0x1BF)) { + } else if (_action.isAction(VERB_LOOK, NOUN_PATH_TO_NORTH)) { _vm->_dialogs->show(21012); - } else if (_action.isAction(VERB_LOOK, 0x5F)) { + } else if (_action.isAction(VERB_LOOK, NOUN_CURTAIN)) { _vm->_dialogs->show(21013); - } else if (_action.isAction(VERB_LOOK, 0x53)) { + } else if (_action.isAction(VERB_LOOK, NOUN_CLOTHESLINE)) { _vm->_dialogs->show(21014); - } else if (_action.isAction(VERB_TAKE, 0x53)) { + } else if (_action.isAction(VERB_TAKE, NOUN_CLOTHESLINE)) { _vm->_dialogs->show(21015); - } else if (_action.isAction(VERB_LOOK, 0x1C0)) { + } else if (_action.isAction(VERB_LOOK, NOUN_HUT_TO_NORTH)) { _vm->_dialogs->show(21016); } else { // Not handled @@ -4721,31 +4721,31 @@ void Scene211::step() { } void Scene211::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x1B2) && _game._objects.isInInventory(OBJ_BINOCULARS) && (_globals[kMonkeyStatus] == MONKEY_AMBUSH_READY) + if (_action.isAction(VERB_WALK_DOWN, NOUN_JUNGLE_PATH) && _game._objects.isInInventory(OBJ_BINOCULARS) && (_globals[kMonkeyStatus] == MONKEY_AMBUSH_READY) && (_scene->_customDest.x <= 52) && (_scene->_customDest.y >= 132)) _game._player.walk(Common::Point(52, 132), FACING_WEST); - if (_action.isAction(VERB_WALK_DOWN, 0x1AE)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_WEST)) { if (_game._objects.isInInventory(OBJ_BINOCULARS) && (_globals[kMonkeyStatus] == MONKEY_AMBUSH_READY)) _game._player.walk(Common::Point(52, 132), FACING_WEST); else _game._player._walkOffScreenSceneId = 210; } - if (_action.isAction(VERB_WALK_DOWN, 0x1B1)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_NORTHEAST)) _game._player._walkOffScreenSceneId = 207; } void Scene211::actions() { if (_action._lookFlag && (_globals[kMonkeyStatus] == MONKEY_AMBUSH_READY)) _vm->_dialogs->show(21111); - else if (_action.isAction(VERB_LOOK, 0x27, 0x100)) + else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x100)) _vm->_dialogs->show(21116); - else if (_action.isAction(VERB_LOOK, 0x3A)) + else if (_action.isAction(VERB_LOOK, NOUN_BUSHY_FERN)) _vm->_dialogs->show(21101); - else if (_action.isAction(VERB_LOOK, 0x1B2)) + else if (_action.isAction(VERB_LOOK, NOUN_JUNGLE_PATH)) _vm->_dialogs->show(21102); - else if (_action.isAction(VERB_LOOK, 0x100)) { + else if (_action.isAction(VERB_LOOK, NOUN_PALM_TREE)) { if (_globals[kMonkeyStatus] == MONKEY_AMBUSH_READY) { if (_game._storyMode == STORYMODE_NAUGHTY) _vm->_dialogs->show(21103); @@ -4754,22 +4754,22 @@ void Scene211::actions() { } else { _vm->_dialogs->show(21105); } - } else if (_action.isAction(VERB_LOOK, 0x1B3)) { + } else if (_action.isAction(VERB_LOOK, NOUN_THICK_UNDERGROWTH)) { if (_game._storyMode == STORYMODE_NAUGHTY) _vm->_dialogs->show(21106); else _vm->_dialogs->show(21107); - } else if (_action.isAction(VERB_LOOK, 0xB8)) + } else if (_action.isAction(VERB_LOOK, NOUN_JUNGLE)) _vm->_dialogs->show(21108); - else if (_action.isAction(VERB_LOOK, 0x1B1)) + else if (_action.isAction(VERB_LOOK, NOUN_PATH_TO_NORTHEAST)) _vm->_dialogs->show(21109); - else if (_action.isAction(VERB_LOOK, 0x1AE)) + else if (_action.isAction(VERB_LOOK, NOUN_PATH_TO_WEST)) _vm->_dialogs->show(21110); - else if (_action.isAction(VERB_LOOK, 0x144)) + else if (_action.isAction(VERB_LOOK, NOUN_SLITHERING_SNAKE)) _vm->_dialogs->show(21113); - else if (_action.isAction(VERB_TAKE, 0x144)) + else if (_action.isAction(VERB_TAKE, NOUN_SLITHERING_SNAKE)) _vm->_dialogs->show(21114); - else if (_action.isAction(VERB_LOOK, 0x129)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) _vm->_dialogs->show(21115); else return; @@ -4815,7 +4815,7 @@ void Scene212::step() { } void Scene212::preActions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x41)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_CAVE_ENTRANCE)) _game._player._walkOffScreenSceneId = 111; } @@ -4824,23 +4824,23 @@ void Scene212::actions() { _vm->_dialogs->show(21209); else if (_action.isAction(VERB_WALK_TOWARDS) && (_action.isObject(0x82) || _action.isObject(0xE8))) _scene->_nextSceneId = 208; - else if (_action.isAction(VERB_WALK_TOWARDS, 0x3F)) + else if (_action.isAction(VERB_WALK_TOWARDS, NOUN_CAVE)) _scene->_nextSceneId = 111; - else if (_action.isAction(VERB_LOOK, 0x19C)) + else if (_action.isAction(VERB_LOOK, NOUN_GRASS)) _vm->_dialogs->show(21201); - else if (_action.isAction(VERB_LOOK, 0x129)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) _vm->_dialogs->show(21202); - else if (_action.isAction(VERB_LOOK, 0x41)) + else if (_action.isAction(VERB_LOOK, NOUN_CAVE_ENTRANCE)) _vm->_dialogs->show(21203); - else if (_action.isAction(VERB_LOOK, 0x142)) + else if (_action.isAction(VERB_LOOK, NOUN_SKY)) _vm->_dialogs->show(21204); - else if (_action.isAction(VERB_LOOK, 0x82)) + else if (_action.isAction(VERB_LOOK, NOUN_FIELD_TO_NORTH)) _vm->_dialogs->show(21205); - else if (_action.isAction(VERB_LOOK, 0x175)) + else if (_action.isAction(VERB_LOOK, NOUN_TREES)) _vm->_dialogs->show(21206); - else if (_action.isAction(VERB_LOOK, 0x110)) + else if (_action.isAction(VERB_LOOK, NOUN_PLANTS)) _vm->_dialogs->show(21207); - else if (_action.isAction(VERB_LOOK, 0xE8)) + else if (_action.isAction(VERB_LOOK, NOUN_MOUNTAINS)) _vm->_dialogs->show(21208); else return; @@ -4994,7 +4994,7 @@ void Scene214::actions() { _vm->_dialogs->show(21427); else if (_action.isAction(0x18A, 0xAA)) _scene->_nextSceneId = 207; - else if (_action.isAction(VERB_TAKE, 0x114) && (_game._trigger || _game._objects.isInRoom(OBJ_POISON_DARTS))) { + else if (_action.isAction(VERB_TAKE, NOUN_POISON_DARTS) && (_game._trigger || _game._objects.isInRoom(OBJ_POISON_DARTS))) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -5023,7 +5023,7 @@ void Scene214::actions() { _vm->_dialogs->showItem(OBJ_POISON_DARTS, 0x53A5); break; } - } else if (_action.isAction(VERB_TAKE, 0x29) && (_game._trigger || _game._objects.isInRoom(OBJ_BLOWGUN))) { + } else if (_action.isAction(VERB_TAKE, NOUN_BLOWGUN) && (_game._trigger || _game._objects.isInRoom(OBJ_BLOWGUN))) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -5052,53 +5052,53 @@ void Scene214::actions() { _vm->_dialogs->showItem(OBJ_BLOWGUN, 0x329); break; } - } else if (_action.isAction(VERB_LOOK, 0x197)) + } else if (_action.isAction(VERB_LOOK, NOUN_WINDOW)) _vm->_dialogs->show(21401); - else if (_action.isAction(VERB_LOOK, 0x7E)) + else if (_action.isAction(VERB_LOOK, NOUN_EXPERIMENT_CAGE)) _vm->_dialogs->show(21402); - else if (_action.isAction(VERB_LOOK, 0x1C3)) + else if (_action.isAction(VERB_LOOK, NOUN_CAPTIVE_CREATURE)) _vm->_dialogs->show(21403); - else if (_action.isAction(VERB_LOOK, 0x21)) + else if (_action.isAction(VERB_LOOK, NOUN_BEAR_RUG)) _vm->_dialogs->show(21404); - else if (_action.isAction(VERB_LOOK, 0x1BB)) + else if (_action.isAction(VERB_LOOK, NOUN_TROPHY)) _vm->_dialogs->show(21405); - else if (_action.isAction(VERB_LOOK, 0x1BE)) { + else if (_action.isAction(VERB_LOOK, NOUN_LARGE_BOWL)) { if (_game._storyMode == STORYMODE_NAUGHTY) { _vm->_dialogs->show(21406); } else { _vm->_dialogs->show(21407); } - } else if (_action.isAction(VERB_LOOK, 0x1BC)) + } else if (_action.isAction(VERB_LOOK, NOUN_SPECIMEN_JARS)) _vm->_dialogs->show(21408); - else if (_action.isAction(VERB_TAKE, 0x1BE) || _action.isAction(VERB_TAKE, 0x1BC)) + else if (_action.isAction(VERB_TAKE, NOUN_LARGE_BOWL) || _action.isAction(VERB_TAKE, NOUN_SPECIMEN_JARS)) _vm->_dialogs->show(21409); - else if (_action.isAction(VERB_LOOK, 0x13D)) + else if (_action.isAction(VERB_LOOK, NOUN_SHRUNKEN_HEADS)) _vm->_dialogs->show(21410); - else if (_action.isAction(VERB_TAKE, 0x13D) || _action.isAction(VERB_TAKE, 0x48A)) + else if (_action.isAction(VERB_TAKE, NOUN_SHRUNKEN_HEADS) || _action.isAction(VERB_TAKE, NOUN_LARGE_HEADS)) _vm->_dialogs->show(21411); - else if (_action.isAction(VERB_LOOK, 0x48A)) + else if (_action.isAction(VERB_LOOK, NOUN_LARGE_HEADS)) _vm->_dialogs->show(21428); - else if (_action.isAction(VERB_LOOK, 0x114) && (_action._savedFields._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_POISON_DARTS) && (_action._savedFields._mainObjectSource == 4)) _vm->_dialogs->show(21412); - else if (_action.isAction(VERB_OPEN, 0x7E)) + else if (_action.isAction(VERB_OPEN, NOUN_EXPERIMENT_CAGE)) _vm->_dialogs->show(21414); - else if (_action.isAction(VERB_TALKTO, 0x1C3)) + else if (_action.isAction(VERB_TALKTO, NOUN_CAPTIVE_CREATURE)) _vm->_dialogs->show(21415); - else if (_action.isAction(VERB_GIVE, 0x17A, 0x1C3)) + else if (_action.isAction(VERB_GIVE, NOUN_TWINKIFRUIT, 0x1C3)) _vm->_dialogs->show(21416); else if (_action.isAction(VERB_SHOOT, 0x29, 0x1C3) || _action.isAction(VERB_HOSE_DOWN, 0x29, 0x1C3)) _vm->_dialogs->show(21417); - else if (_action.isAction(VERB_LOOK, 0x473)) + else if (_action.isAction(VERB_LOOK, NOUN_BIG_HEADS)) _vm->_dialogs->show(21418); - else if (_action.isAction(VERB_TAKE, 0x473)) + else if (_action.isAction(VERB_TAKE, NOUN_BIG_HEADS)) _vm->_dialogs->show(21419); - else if (_action.isAction(VERB_TAKE, 0x21)) + else if (_action.isAction(VERB_TAKE, NOUN_BEAR_RUG)) _vm->_dialogs->show(21420); - else if (_action.isAction(VERB_LOOK, 0x8A)) + else if (_action.isAction(VERB_LOOK, NOUN_FLOOR_OF_HUT)) _vm->_dialogs->show(21421); - else if (_action.isAction(VERB_LOOK, 0x29)) + else if (_action.isAction(VERB_LOOK, NOUN_BLOWGUN)) _vm->_dialogs->show(21422); - else if (_action.isAction(VERB_LOOK, 0x160)) { + else if (_action.isAction(VERB_LOOK, NOUN_TABLE)) { if (_game._objects.isInRoom(OBJ_POISON_DARTS) && _game._objects.isInRoom(OBJ_BLOWGUN)) { _vm->_dialogs->show(21423); } else if (_game._objects.isInRoom(OBJ_POISON_DARTS) && !_game._objects.isInRoom(OBJ_BLOWGUN)) { @@ -5174,7 +5174,7 @@ void Scene215::step() { void Scene215::actions() { if (_action._lookFlag) _vm->_dialogs->show(21509); - else if (_action.isAction(VERB_TAKE, 0x17A)) { + else if (_action.isAction(VERB_TAKE, NOUN_TWINKIFRUIT)) { if (!_game._objects.isInInventory(OBJ_TWINKIFRUIT) || _game._trigger) { switch (_game._trigger) { case 0: @@ -5212,29 +5212,29 @@ void Scene215::actions() { } } else if (_action.isAction(0x18A, 0xAA)) _scene->_nextSceneId = 210; - else if (_action.isAction(VERB_LOOK, 0x21)) + else if (_action.isAction(VERB_LOOK, NOUN_BEAR_RUG)) _vm->_dialogs->show(21501); - else if (_action.isAction(VERB_LOOK, 0x1CB)) + else if (_action.isAction(VERB_LOOK, NOUN_BED)) _vm->_dialogs->show(21502); - else if (_action.isAction(VERB_LOOK, 0x3A3)) + else if (_action.isAction(VERB_LOOK, NOUN_WELCOME_MAT)) _vm->_dialogs->show(21503); - else if (_action.isAction(VERB_LOOK, 0xD5)) + else if (_action.isAction(VERB_LOOK, NOUN_LOVE_ALTAR)) _vm->_dialogs->show(21504); - else if (_action.isAction(VERB_LOOK, 0x197)) + else if (_action.isAction(VERB_LOOK, NOUN_WINDOW)) _vm->_dialogs->show(21505); - else if (_action.isAction(VERB_LOOK, 0x289)) + else if (_action.isAction(VERB_LOOK, NOUN_PICTURE)) _vm->_dialogs->show(21506); - else if (_action.isAction(VERB_LOOK, 0x17A) && (_action._savedFields._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_TWINKIFRUIT) && (_action._savedFields._mainObjectSource == 4)) _vm->_dialogs->show(21507); - else if (_action.isAction(VERB_TAKE, 0x21)) + else if (_action.isAction(VERB_TAKE, NOUN_BEAR_RUG)) _vm->_dialogs->show(21510); - else if (_action.isAction(VERB_TAKE, 0xD5)) + else if (_action.isAction(VERB_TAKE, NOUN_LOVE_ALTAR)) _vm->_dialogs->show(21511); - else if (_action.isAction(VERB_LOOK, 0x1CA)) + else if (_action.isAction(VERB_LOOK, NOUN_BAG_OF_TWINKIFRUITS)) _vm->_dialogs->show(21512); - else if (_action.isAction(VERB_TAKE, 0x1CA)) + else if (_action.isAction(VERB_TAKE, NOUN_BAG_OF_TWINKIFRUITS)) _vm->_dialogs->show(21513); - else if (_action.isAction(VERB_TAKE, 0x3A3)) + else if (_action.isAction(VERB_TAKE, NOUN_WELCOME_MAT)) _vm->_dialogs->show(21514); else return; diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index 00de84eea8..74bc582249 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -862,7 +862,7 @@ void Scene307::actions() { _vm->_dialogs->show(30715); else if (_game._screenObjects._inputMode == 1) handleDialog(); - else if (_action.isAction(VERB_TALKTO, 0x207) || _action.isAction(VERB_TALKTO, 0x18D) || _action.isAction(VERB_TALKTO, 0x21B)) { + else if (_action.isAction(VERB_TALKTO, NOUN_CELL_WALL) || _action.isAction(VERB_TALKTO, NOUN_WALL) || _action.isAction(VERB_TALKTO, NOUN_TOILET)) { int node, say; if (_globals[kKnowsBuddyBeast]) { say = 0x10E; @@ -959,7 +959,7 @@ void Scene307::actions() { default: break; } - }else if (_action.isAction(VERB_CLIMB_INTO, 0x11)) { + }else if (_action.isAction(VERB_CLIMB_INTO, NOUN_AIR_VENT)) { if (_grateOpenedFl) { switch (_game._trigger) { case 0: @@ -1042,9 +1042,9 @@ void Scene307::actions() { break; } } - } else if (_action.isAction(VERB_USE, 0x21B) && (_game._storyMode != STORYMODE_NAUGHTY)) + } else if (_action.isAction(VERB_USE, NOUN_TOILET) && (_game._storyMode != STORYMODE_NAUGHTY)) _vm->_dialogs->show(30723); - else if (_action.isAction(VERB_USE, 0x21B)) { + else if (_action.isAction(VERB_USE, NOUN_TOILET)) { if (!_afterPeeingFl) { switch (_game._trigger) { case 0: @@ -1094,24 +1094,24 @@ void Scene307::actions() { int idx = _scene->_kernelMessages.add(Common::Point(85, 39), 0x1110, 0, 0, 180, _game.getQuote(238)); _scene->_kernelMessages.setQuoted(idx, 4, true); } - } else if (_action.isAction(VERB_LOOK, 0x11)) { + } else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) { if (!_grateOpenedFl) _vm->_dialogs->show(30710); else _vm->_dialogs->show(30711); - } else if (_action.isAction(VERB_LOOK, 0x1CB)) + } else if (_action.isAction(VERB_LOOK, NOUN_BED)) _vm->_dialogs->show(30712); - else if (_action.isAction(VERB_LOOK, 0x216)) + else if (_action.isAction(VERB_LOOK, NOUN_SINK)) _vm->_dialogs->show(30713); - else if (_action.isAction(VERB_LOOK, 0x21B)) + else if (_action.isAction(VERB_LOOK, NOUN_TOILET)) _vm->_dialogs->show(30714); else if (_action.isAction(0x134, 0x12C)) _vm->_dialogs->show(30716); - else if (_action.isAction(VERB_LOOK, 0x207)) + else if (_action.isAction(VERB_LOOK, NOUN_CELL_WALL)) _vm->_dialogs->show(30717); - else if (_action.isAction(VERB_LOOK, 0xCD)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHT)) _vm->_dialogs->show(30718); - else if (_action.isAction(VERB_WALK_INTO, 0x204)) { + else if (_action.isAction(VERB_WALK_INTO, NOUN_CORRIDOR)) { switch (_fieldCollisionCounter) { case 0: _vm->_dialogs->show(30719); @@ -1696,9 +1696,9 @@ void Scene311::actions() { _checkGuardFl = false; _scene->_kernelMessages.reset(); _scene->_kernelMessages.addQuote(0xFA, 120, 0); - } else if (_action.isAction(VERB_SIT_AT, 0x1E4)) + } else if (_action.isAction(VERB_SIT_AT, NOUN_DESK)) _scene->_nextSceneId = 320; - else if (_action.isAction(VERB_CLIMB_INTO, 0x11)) { + else if (_action.isAction(VERB_CLIMB_INTO, NOUN_AIR_VENT)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1790,25 +1790,25 @@ void Scene311::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK, 0x1E4)) + } else if (_action.isAction(VERB_LOOK, NOUN_DESK)) _vm->_dialogs->show(31110); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(31111); - else if (_action.isAction(VERB_LOOK, 0x220) || _action.isAction(VERB_STARE_AT, 0x220)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHTING_FIXTURE) || _action.isAction(VERB_STARE_AT, NOUN_LIGHTING_FIXTURE)) _vm->_dialogs->show(31112); - else if (_action.isAction(VERB_LOOK, 0x208) || _action.isAction(VERB_STARE_AT, 0x208)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHTS) || _action.isAction(VERB_STARE_AT, NOUN_LIGHTS)) _vm->_dialogs->show(31113); - else if (_action.isAction(VERB_TAKE, 0x208)) + else if (_action.isAction(VERB_TAKE, NOUN_LIGHTS)) _vm->_dialogs->show(31114); - else if (_action.isAction(VERB_LOOK, 0xCD) || _action.isAction(VERB_STARE_AT, 0xCD)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHT) || _action.isAction(VERB_STARE_AT, NOUN_LIGHT)) _vm->_dialogs->show(31115); - else if (_action.isAction(VERB_TAKE, 0xCD)) + else if (_action.isAction(VERB_TAKE, NOUN_LIGHT)) _vm->_dialogs->show(31116); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(31117); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(31118); - else if (_action.isAction(VERB_LOOK, 0x11)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(31120); else return; @@ -1866,24 +1866,24 @@ void Scene313::enter() { } void Scene313::actions() { - if (_action.isAction(VERB_CRAWL_TO, 0x2FC)) + if (_action.isAction(VERB_CRAWL_TO, NOUN_FOURTH_CELL)) _scene->_nextSceneId = 387; - else if (_action.isAction(VERB_CRAWL_TO, 0x2FD)) + else if (_action.isAction(VERB_CRAWL_TO, NOUN_THIRD_CELL)) _scene->_nextSceneId = 388; - else if (_action.isAction(VERB_CRAWL_TO, 0x2FE)) { + else if (_action.isAction(VERB_CRAWL_TO, NOUN_SECOND_CELL)) { if (_globals[kAfterHavoc]) _scene->_nextSceneId = 399; else _scene->_nextSceneId = 389; - } else if (_action.isAction(VERB_CRAWL_TO, 0x2FF)) + } else if (_action.isAction(VERB_CRAWL_TO, NOUN_FIRST_CELL)) _scene->_nextSceneId = 390; - else if (_action.isAction(VERB_CRAWL_TO, 0x2EF)) { + else if (_action.isAction(VERB_CRAWL_TO, NOUN_SECURITY_STATION)) { if (_globals[kSexOfRex] == REX_FEMALE) { _globals[kSexOfRex] = REX_MALE; _vm->_dialogs->show(31301); } _scene->_nextSceneId = 391; - } else if (_action.isAction(VERB_CRAWL_TO, 0x300)) { + } else if (_action.isAction(VERB_CRAWL_TO, NOUN_EQUIPMENT_ROOM)) { if (_globals[kSexOfRex] == REX_FEMALE) { _globals[kSexOfRex] = REX_MALE; _vm->_dialogs->show(31301); @@ -2249,7 +2249,7 @@ void Scene316::step() { } void Scene316::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) { if (_globals[kAfterHavoc]) _game._player._walkOffScreenSceneId = 354; else @@ -2258,12 +2258,12 @@ void Scene316::preActions() { } void Scene316::actions() { - if (_action.isAction(VERB_CLIMB_INTO, 0x11)) { + if (_action.isAction(VERB_CLIMB_INTO, NOUN_AIR_VENT)) { if (_globals[kSexOfRex] == REX_FEMALE) handleRoxInGrate(); else handleRexInGrate(); - } else if (_action.isAction(VERB_WALK_UP, 0x226) || _action.isAction(VERB_WALK_ONTO, 0x22C)) { + } else if (_action.isAction(VERB_WALK_UP, NOUN_RAMP) || _action.isAction(VERB_WALK_ONTO, NOUN_PLATFORM)) { switch (_game._trigger) { case 0: if (_globals[kCityFlooded]) { @@ -2314,35 +2314,35 @@ void Scene316::actions() { _scene->_nextSceneId = 321; break; } - } else if (_action.isAction(VERB_LOOK, 0x22C)) + } else if (_action.isAction(VERB_LOOK, NOUN_PLATFORM)) _vm->_dialogs->show(31610); - else if (_action.isAction(VERB_LOOK, 0x1B6)) { + else if (_action.isAction(VERB_LOOK, NOUN_STRANGE_DEVICE)) { if (_game._visitedScenes.exists(321)) _vm->_dialogs->show(31612); else _vm->_dialogs->show(31611); - } else if (_action.isAction(VERB_LOOK, 0x2C6)) + } else if (_action.isAction(VERB_LOOK, NOUN_CONTROLS)) _vm->_dialogs->show(31613); - else if (_action.isAction(VERB_LOOK, 0x2C7)) + else if (_action.isAction(VERB_LOOK, NOUN_EQUIPMENT)) _vm->_dialogs->show(31614); - else if (_action.isAction(VERB_LOOK, 0x1E0)) + else if (_action.isAction(VERB_LOOK, NOUN_PANEL)) _vm->_dialogs->show(31615); - else if (_action.isAction(VERB_LOOK, 0xE2)) + else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) _vm->_dialogs->show(31616); - else if (_action.isAction(VERB_LOOK, 0x226)) + else if (_action.isAction(VERB_LOOK, NOUN_RAMP)) _vm->_dialogs->show(31617); - else if (_action.isAction(VERB_LOOK, 0x11)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(31618); - else if (_action.isAction(VERB_LOOK, 0x2B9)) { + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) { if (!_globals[kAfterHavoc]) { if (_game._difficulty != DIFFICULTY_EASY) _vm->_dialogs->show(31620); else _vm->_dialogs->show(31619); } - } else if (_action.isAction(VERB_LOOK, 0x89)) + } else if (_action.isAction(VERB_LOOK, NOUN_FLOOR)) _vm->_dialogs->show(31621); - else if (_action.isAction(VERB_LOOK, 0x257)) + else if (_action.isAction(VERB_LOOK, NOUN_SUPPORT)) _vm->_dialogs->show(31622); else return; @@ -2740,7 +2740,7 @@ void Scene318::preActions() { if (_game._player._needToWalk) _game._player._needToWalk = _game._player._visible; - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 357; } @@ -2751,7 +2751,7 @@ void Scene318::actions() { return; } - if (_action.isAction(VERB_TALKTO, 0x307)) { + if (_action.isAction(VERB_TALKTO, NOUN_INTERN)) { switch (_game._trigger) { case 0: { _dialogFl = true; @@ -2790,7 +2790,7 @@ void Scene318::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x12C) && (_game._objects.isInRoom(OBJ_SCALPEL) || _game._trigger)) { + if (_action.isAction(VERB_TAKE, NOUN_SCALPEL) && (_game._objects.isInRoom(OBJ_SCALPEL) || _game._trigger)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2832,13 +2832,13 @@ void Scene318::actions() { } if (_game._player._visible) { - if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH)) { _scene->_nextSceneId = 407; _action._inProgress = false; return; } - if (_action.isAction(VERB_TAKE, 0x165)) { + if (_action.isAction(VERB_TAKE, NOUN_TAPE_PLAYER)) { if (_game._objects.isInRoom(OBJ_AUDIO_TAPE)) { _vm->_dialogs->showItem(OBJ_AUDIO_TAPE, 0x7C5B); _game._objects.addToInventory(OBJ_AUDIO_TAPE); @@ -2849,7 +2849,7 @@ void Scene318::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x165)) { + if (_action.isAction(VERB_LOOK, NOUN_TAPE_PLAYER)) { if (_game._objects.isInRoom(OBJ_AUDIO_TAPE)) _vm->_dialogs->show(31833); else @@ -2859,68 +2859,68 @@ void Scene318::actions() { return; } - if (_action.isAction(VERB_WALK_INTO, 0x488)) { + if (_action.isAction(VERB_WALK_INTO, NOUN_DOCTORS_OFFICE)) { _vm->_dialogs->show(31831); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x2D9)) { + if (_action.isAction(VERB_LOOK, NOUN_GURNEY)) { _vm->_dialogs->show(31823); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x308)) { + if (_action.isAction(VERB_LOOK, NOUN_INSTRUMENT_TABLE)) { _vm->_dialogs->show(31825); _action._inProgress = false; return; } } else { // Not visible - if (_action.isAction(VERB_LOOK, 0x2D9)) { + if (_action.isAction(VERB_LOOK, NOUN_GURNEY)) { _vm->_dialogs->show(31822); _action._inProgress = false; return; } - if (_action.isAction(VERB_LOOK, 0x308)) { + if (_action.isAction(VERB_LOOK, NOUN_INSTRUMENT_TABLE)) { _vm->_dialogs->show(31824); _action._inProgress = false; return; } } - if (_action.isAction(VERB_LOOK, 0x18D)) + if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(31810); - else if (_action.isAction(VERB_LOOK, 0x89)) + else if (_action.isAction(VERB_LOOK, NOUN_FLOOR)) _vm->_dialogs->show(31811); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(31812); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(31813); - else if (_action.isAction(VERB_LOOK, 0x2CB)) + else if (_action.isAction(VERB_LOOK, NOUN_FAUCET)) _vm->_dialogs->show(31814); - else if (_action.isAction(VERB_LOOK, 0x216)) + else if (_action.isAction(VERB_LOOK, NOUN_SINK)) _vm->_dialogs->show(31815); - else if (_action.isAction(VERB_LOOK, 0x319)) + else if (_action.isAction(VERB_LOOK, NOUN_CONVEYOR_BELT)) _vm->_dialogs->show(31816); - else if (_action.isAction(VERB_LOOK, 0x477)) + else if (_action.isAction(VERB_LOOK, NOUN_LARGE_BLADE)) _vm->_dialogs->show(31817); - else if (_action.isAction(VERB_LOOK, 0xE2)) + else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) _vm->_dialogs->show(31818); - else if (_action.isAction(VERB_LOOK, 0x2C9)) + else if (_action.isAction(VERB_LOOK, NOUN_CABINETS)) _vm->_dialogs->show(31819); - else if (_action.isAction(VERB_LOOK, 0x2C7)) + else if (_action.isAction(VERB_LOOK, NOUN_EQUIPMENT)) _vm->_dialogs->show(31820); - else if (_action.isAction(VERB_LOOK, 0x2C8)) + else if (_action.isAction(VERB_LOOK, NOUN_SHELF)) _vm->_dialogs->show(31821); - else if (_action.isAction(VERB_OPEN, 0x2C9)) + else if (_action.isAction(VERB_OPEN, NOUN_CABINETS)) _vm->_dialogs->show(31829); - else if (_action.isAction(VERB_LOOK, 0x307)) + else if (_action.isAction(VERB_LOOK, NOUN_INTERN)) _vm->_dialogs->show(31830); - else if (_action.isAction(VERB_LOOK, 0x3A1)) + else if (_action.isAction(VERB_LOOK, NOUN_PROFESSOR)) _vm->_dialogs->show(31832); - else if (_action.isAction(VERB_LOOK, 0x3A2)) + else if (_action.isAction(VERB_LOOK, NOUN_PROFESSORS_GURNEY)) _vm->_dialogs->show(31836); else if (_action._lookFlag) { if (_game._player._visible || _game._objects.isInInventory(OBJ_SCALPEL)) @@ -3709,39 +3709,39 @@ void Scene320::actions() { default: break; } - } else if (_action.isAction(VERB_LEAVE, 0x2EF)) + } else if (_action.isAction(VERB_LEAVE, NOUN_SECURITY_STATION)) _scene->_nextSceneId = 311; - else if (_action.isAction(VERB_LOOK, 0x2DC)) + else if (_action.isAction(VERB_LOOK, NOUN_RIGHT_MONITOR)) _vm->_dialogs->show(32001); - else if (_action.isAction(VERB_LOOK, 0x2DB)) + else if (_action.isAction(VERB_LOOK, NOUN_LEFT_MONITOR)) _vm->_dialogs->show(32002); - else if (_action.isAction(VERB_LOOK, 0x1E4)) + else if (_action.isAction(VERB_LOOK, NOUN_DESK)) _vm->_dialogs->show(32003); - else if (_action.isAction(VERB_LOOK, 0x2EF)) + else if (_action.isAction(VERB_LOOK, NOUN_SECURITY_STATION)) _vm->_dialogs->show(32004); - else if (_action.isAction(VERB_LOOK, 0x2ED)) + else if (_action.isAction(VERB_LOOK, NOUN_MUG)) _vm->_dialogs->show(32005); - else if (_action.isAction(VERB_LOOK, 0x2EE)) + else if (_action.isAction(VERB_LOOK, NOUN_DOUGHNUT)) _vm->_dialogs->show(32006); - else if (_action.isAction(VERB_LOOK, 0x2F1)) + else if (_action.isAction(VERB_LOOK, NOUN_MAGAZINE)) _vm->_dialogs->show(32006); - else if (_action.isAction(VERB_LOOK, 0x2F3)) + else if (_action.isAction(VERB_LOOK, NOUN_PAPER_FOOTBALL)) _vm->_dialogs->show(32008); - else if (_action.isAction(VERB_LOOK, 0x2F0)) + else if (_action.isAction(VERB_LOOK, NOUN_NEWSPAPER)) _vm->_dialogs->show(32009); - else if (_action.isAction(VERB_LOOK, 0x2F2)) + else if (_action.isAction(VERB_LOOK, NOUN_CLIPBOARD)) _vm->_dialogs->show(32010); - else if (_action.isAction(VERB_TAKE, 0x2ED)) + else if (_action.isAction(VERB_TAKE, NOUN_MUG)) _vm->_dialogs->show(32012); - else if (_action.isAction(VERB_TAKE, 0x2F2)) + else if (_action.isAction(VERB_TAKE, NOUN_CLIPBOARD)) _vm->_dialogs->show(32013); - else if (_action.isAction(VERB_TAKE, 0x2EE) || _action.isAction(VERB_EAT, 0x2EE)) + else if (_action.isAction(VERB_TAKE, NOUN_DOUGHNUT) || _action.isAction(VERB_EAT, NOUN_DOUGHNUT)) _vm->_dialogs->show(32014); - else if (_action.isAction(VERB_TAKE, 0x2F3)) + else if (_action.isAction(VERB_TAKE, NOUN_PAPER_FOOTBALL)) _vm->_dialogs->show(32015); - else if (_action.isAction(VERB_TAKE, 0x2F1)) + else if (_action.isAction(VERB_TAKE, NOUN_MAGAZINE)) _vm->_dialogs->show(32016); - else if (_action.isAction(VERB_TAKE, 0x2F0)) + else if (_action.isAction(VERB_TAKE, NOUN_NEWSPAPER)) _vm->_dialogs->show(32017); else return; @@ -3838,21 +3838,21 @@ void Scene322::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(VERB_PEER_THROUGH, 0x181)) + if (_action.isAction(VERB_LOOK, NOUN_VIEWPORT) || _action.isAction(VERB_PEER_THROUGH, NOUN_VIEWPORT)) _vm->_dialogs->show(32210); - else if (_action.isAction(VERB_LOOK, 0xC4)) + else if (_action.isAction(VERB_LOOK, NOUN_KEYPAD)) _vm->_dialogs->show(32211); - else if (_action.isAction(VERB_LOOK, 0x1CC)) + else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY)) _vm->_dialogs->show(32212); - else if (_action.isAction(VERB_LOOK, 0x1D0) || _action.isAction(VERB_LOOK, 0x1D1) - || _action.isAction(VERB_LOOK, 0x1D2) || _action.isAction(VERB_LOOK, 0x1D3) - || _action.isAction(VERB_LOOK, 0x1D4) || _action.isAction(VERB_LOOK, 0x1D5) - || _action.isAction(VERB_LOOK, 0x1D6) || _action.isAction(VERB_LOOK, 0x1D7) - || _action.isAction(VERB_LOOK, 0x1D8) || _action.isAction(VERB_LOOK, 0x1D9) - || _action.isAction(VERB_LOOK, 0x1DB) || _action.isAction(VERB_LOOK, 0x7A) - || _action.isAction(VERB_LOOK, 0x1DA)) + else if (_action.isAction(VERB_LOOK, NOUN_0_KEY) || _action.isAction(VERB_LOOK, NOUN_1_KEY) + || _action.isAction(VERB_LOOK, NOUN_2_KEY) || _action.isAction(VERB_LOOK, NOUN_3_KEY) + || _action.isAction(VERB_LOOK, NOUN_4_KEY) || _action.isAction(VERB_LOOK, NOUN_5_KEY) + || _action.isAction(VERB_LOOK, NOUN_6_KEY) || _action.isAction(VERB_LOOK, NOUN_7_KEY) + || _action.isAction(VERB_LOOK, NOUN_8_KEY) || _action.isAction(VERB_LOOK, NOUN_9_KEY) + || _action.isAction(VERB_LOOK, NOUN_SMILE_KEY) || _action.isAction(VERB_LOOK, NOUN_ENTER_KEY) + || _action.isAction(VERB_LOOK, NOUN_FROWN_KEY)) _vm->_dialogs->show(32213); - else if (_action.isAction(VERB_LOOK, 0x1CF)) + else if (_action.isAction(VERB_LOOK, NOUN_DEVICE)) _vm->_dialogs->show(32214); else return; @@ -3954,11 +3954,11 @@ void Scene351::step() { void Scene351::actions() { if (_action._lookFlag) _vm->_dialogs->show(35121); - else if (_action.isAction(VERB_STEP_INTO, 0x16C)) + else if (_action.isAction(VERB_STEP_INTO, NOUN_TELEPORTER)) _scene->_nextSceneId = 322; - else if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH)) _scene->_nextSceneId = 352; - else if (_action.isAction(VERB_TAKE, 0x5C)) { + else if (_action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP)) { if (_game._trigger || !_game._objects.isInInventory(0xF)) { switch (_game._trigger) { case 0: @@ -3990,30 +3990,30 @@ void Scene351::actions() { break; } } - } else if (_action.isAction(VERB_LOOK, 0x180)) + } else if (_action.isAction(VERB_LOOK, NOUN_VIEW_SCREEN)) _vm->_dialogs->show(35110); - else if (_action.isAction(VERB_LOOK, 0x23A)) + else if (_action.isAction(VERB_LOOK, NOUN_RIP_IN_FLOOR)) _vm->_dialogs->show(35111); - else if (_action.isAction(VERB_LOOK, 0x1E6)) + else if (_action.isAction(VERB_LOOK, NOUN_FIRE_HYDRANT)) _vm->_dialogs->show(35112); - else if (_action.isAction(VERB_LOOK, 0x239)) { + else if (_action.isAction(VERB_LOOK, NOUN_GUARD)) { if (_game._objects[0xF]._roomNumber == 351) _vm->_dialogs->show(35114); else _vm->_dialogs->show(35113); - } else if (_action.isAction(VERB_LOOK, 0x2C7)) + } else if (_action.isAction(VERB_LOOK, NOUN_EQUIPMENT)) _vm->_dialogs->show(35115); - else if (_action.isAction(VERB_LOOK, 0x1E4)) + else if (_action.isAction(VERB_LOOK, NOUN_DESK)) _vm->_dialogs->show(35116); - else if (_action.isAction(VERB_LOOK, 0xD7)) + else if (_action.isAction(VERB_LOOK, NOUN_MACHINE)) _vm->_dialogs->show(35117); - else if (_action.isAction(VERB_LOOK, 0x16C)) + else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER)) _vm->_dialogs->show(35118); - else if (_action.isAction(VERB_LOOK, 0x59)) + else if (_action.isAction(VERB_LOOK, NOUN_CONTROL_PANEL)) _vm->_dialogs->show(35119); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(35120); - else if (_action.isAction(VERB_LOOK, 0x1EB)) + else if (_action.isAction(VERB_LOOK, NOUN_POLE)) _vm->_dialogs->show(35122); else return; @@ -4171,7 +4171,7 @@ void Scene352::enter() { void Scene352::preActions() { _leaveRoomFl = false; - if (_action.isAction(VERB_OPEN, 0x1F8)) + 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)) { @@ -4210,14 +4210,14 @@ void Scene352::preActions() { } } - if (_action.isAction(VERB_PUT, 0x3B6, 0x1F3)) { + if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, 0x1F3)) { 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, 0x70) || _action.isAction(VERB_WALK_DOWN, 0x2B3) || _action.isAction(VERB_PUT, 0x3B6, 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, 0x89)) { if (_game._objects.isInInventory(OBJ_GUARDS_ARM)) _game._player.walk(Common::Point(230, 117), FACING_NORTHWEST); } @@ -4230,7 +4230,7 @@ void Scene352::actions() { return; } - if (_action.isAction(VERB_OPEN, 0x1F8)) { + if (_action.isAction(VERB_OPEN, NOUN_VAULT)) { if (!_vaultOpenFl) { switch (_game._trigger) { case 0: @@ -4288,15 +4288,15 @@ void Scene352::actions() { bool exit_corridor = false; bool exit_doorway = false; - if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH)) { exit_corridor = true; } - if (_action.isAction(VERB_WALK_THROUGH, 0x70)) { + if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY)) { exit_doorway = true; } - if (_action.isAction(VERB_WALK_DOWN, 0x2B3) || _action.isAction(VERB_WALK_THROUGH, 0x70) || _action.isAction(VERB_PUT, 0x3B6, 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, 0x89)) { if (_mustPutArmDownFl) putArmDown(exit_corridor, exit_doorway); else if (exit_corridor) @@ -4308,7 +4308,7 @@ void Scene352::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x3B6)) { + if (_action.isAction(VERB_TAKE, NOUN_GUARDS_ARM)) { if (_game._trigger || !_game._objects.isInInventory(OBJ_GUARDS_ARM)) { switch (_game._trigger) { case 0: @@ -4344,7 +4344,7 @@ void Scene352::actions() { } } - if (_action.isAction(VERB_PUT, 0x3B6, 0x1F3)) { + if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, 0x1F3)) { if (!_vaultOpenFl) { switch (_game._trigger) { case 0: @@ -4423,7 +4423,7 @@ void Scene352::actions() { break; } } - } else if (_action.isAction(VERB_TAKE, 0x2F4)) { + } else if (_action.isAction(VERB_TAKE, NOUN_YOUR_STUFF)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -4470,7 +4470,7 @@ void Scene352::actions() { default: break; } - } else if (_action.isAction(VERB_TAKE, 0x165) && !_game._objects.isInInventory(OBJ_TAPE_PLAYER)) { + } else if (_action.isAction(VERB_TAKE, NOUN_TAPE_PLAYER) && !_game._objects.isInInventory(OBJ_TAPE_PLAYER)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -4508,53 +4508,53 @@ void Scene352::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK, 0x1F3)) + } else if (_action.isAction(VERB_LOOK, NOUN_SCANNER)) _vm->_dialogs->show(35210); - else if (_action.isAction(VERB_LOOK, 0xE2)) { + else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) { if (_game._storyMode == STORYMODE_NAUGHTY) _vm->_dialogs->show(35211); else _vm->_dialogs->show(35212); - } else if (_action.isAction(VERB_LOOK, 0x1CC)) + } else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY)) _vm->_dialogs->show(35213); - else if (_action.isAction(VERB_LOOK, 0x2CD)) + else if (_action.isAction(VERB_LOOK, NOUN_STATUE)) _vm->_dialogs->show(35214); - else if (_action.isAction(VERB_LOOK, 0x165) && (_action._savedFields._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_TAPE_PLAYER) && (_action._savedFields._mainObjectSource == 4)) _vm->_dialogs->show(35215); - else if (_action.isAction(VERB_LOOK, 0x11)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(35216); - else if (_action.isAction(VERB_LOOK, 0x3B6) && (_action._savedFields._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_GUARDS_ARM) && (_action._savedFields._mainObjectSource == 4)) _vm->_dialogs->show(35217); - else if (_action.isAction(VERB_LOOK, 0x2DA)) + else if (_action.isAction(VERB_LOOK, NOUN_IRONING_BOARD)) _vm->_dialogs->show(35218); - else if (_action.isAction(VERB_LOOK, 0x51)) + else if (_action.isAction(VERB_LOOK, NOUN_CLOCK)) _vm->_dialogs->show(35219); - else if (_action.isAction(VERB_LOOK, 0x2CE)) + else if (_action.isAction(VERB_LOOK, NOUN_GAUGE)) _vm->_dialogs->show(35220); - else if (_action.isAction(VERB_LOOK, 0x1F8)) { + else if (_action.isAction(VERB_LOOK, NOUN_VAULT)) { if (!_vaultOpenFl) _vm->_dialogs->show(35221); - } else if (_action.isAction(VERB_LOOK, 0x2F4)) + } else if (_action.isAction(VERB_LOOK, NOUN_YOUR_STUFF)) _vm->_dialogs->show(35222); - else if (_action.isAction(VERB_LOOK, 0x2F5)) + else if (_action.isAction(VERB_LOOK, NOUN_OTHER_STUFF)) _vm->_dialogs->show(35223); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(35224); - else if (_action.isAction(VERB_TAKE, 0x2F5)) + else if (_action.isAction(VERB_TAKE, NOUN_OTHER_STUFF)) _vm->_dialogs->show(35226); - else if (_action.isAction(VERB_LOOK, 0x1E4)) + else if (_action.isAction(VERB_LOOK, NOUN_DESK)) _vm->_dialogs->show(35229); - else if (_action.isAction(VERB_LOOK, 0x239)) + else if (_action.isAction(VERB_LOOK, NOUN_GUARD)) _vm->_dialogs->show(35230); - else if (_action.isAction(VERB_LOOK, 0x70)) + else if (_action.isAction(VERB_LOOK, NOUN_DOORWAY)) _vm->_dialogs->show(35231); - else if (_action.isAction(VERB_LOOK, 0x160)) + else if (_action.isAction(VERB_LOOK, NOUN_TABLE)) _vm->_dialogs->show(35232); - else if (_action.isAction(VERB_LOOK, 0x3B5)) + else if (_action.isAction(VERB_LOOK, NOUN_PROJECTOR)) _vm->_dialogs->show(35233); - else if (_action.isAction(VERB_LOOK, 0x257)) + else if (_action.isAction(VERB_LOOK, NOUN_SUPPORT)) _vm->_dialogs->show(35234); - else if (_action.isAction(VERB_LOOK, 0x1F5)) + else if (_action.isAction(VERB_LOOK, NOUN_SECURITY_MONITOR)) _vm->_dialogs->show(35235); else return; @@ -4598,25 +4598,25 @@ void Scene353::enter() { void Scene353::actions() { if (_action._lookFlag) _vm->_dialogs->show(35315); - else if (_action.isAction(VERB_WALK_THROUGH, 0x70)) + else if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY)) _scene->_nextSceneId = 352; - else if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH)) _scene->_nextSceneId = 354; - else if (_action.isAction(VERB_LOOK, 0x23D)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCK_CHUNK)) _vm->_dialogs->show(35310); - else if (_action.isAction(VERB_LOOK, 0x1FA) || _action.isAction(VERB_LOOK, 0x10C)) + else if (_action.isAction(VERB_LOOK, NOUN_PIPES) || _action.isAction(VERB_LOOK, NOUN_PIPE)) _vm->_dialogs->show(35311); - else if (_action.isAction(VERB_LOOK, 0x23C)) + else if (_action.isAction(VERB_LOOK, NOUN_BROKEN_BEAM)) _vm->_dialogs->show(35312); - else if (_action.isAction(VERB_LOOK, 0x70)) + else if (_action.isAction(VERB_LOOK, NOUN_DOORWAY)) _vm->_dialogs->show(35313); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(35314); - else if (_action.isAction(VERB_LOOK, 0x89)) + else if (_action.isAction(VERB_LOOK, NOUN_FLOOR)) _vm->_dialogs->show(35316); - else if (_action.isAction(VERB_LOOK, 0x46)) + else if (_action.isAction(VERB_LOOK, NOUN_CEILING)) _vm->_dialogs->show(35317); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(35318); else return; @@ -4649,41 +4649,41 @@ void Scene354::enter() { } void Scene354::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH)) _game._player._walkOffScreenSceneId = 401; } void Scene354::actions() { if (_action._lookFlag) _vm->_dialogs->show(35414); - else if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) { + else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_NORTH)) { _game._player.startWalking(Common::Point(208, 0), FACING_NORTHEAST); _game._player._walkOffScreenSceneId = 353; - } else if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + } else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _scene->_nextSceneId = 361; - else if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _scene->_nextSceneId = 316; - else if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH)) _scene->_nextSceneId = 401; - else if (_action.isAction(VERB_LOOK, 0x2C6)) + else if (_action.isAction(VERB_LOOK, NOUN_CONTROLS)) _vm->_dialogs->show(35410); - else if (_action.isAction(VERB_LOOK, 0x1FD)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGNAL)) _vm->_dialogs->show(35411); - else if (_action.isAction(VERB_LOOK, 0x2D0)) + else if (_action.isAction(VERB_LOOK, NOUN_CATWALK)) _vm->_dialogs->show(35412); - else if (_action.isAction(VERB_LOOK, 0x206)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_DUCT)) _vm->_dialogs->show(35413); - else if (_action.isAction(VERB_LOOK, 0x2B4)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_NORTH)) _vm->_dialogs->show(35415); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(35416); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(35417); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(35418); - else if (_action.isAction(VERB_LOOK, 0x218)) + else if (_action.isAction(VERB_LOOK, NOUN_DEBRIS)) _vm->_dialogs->show(35419); - else if (_action.isAction(VERB_LOOK, 0x239)) + else if (_action.isAction(VERB_LOOK, NOUN_GUARD)) _vm->_dialogs->show(35420); else return; @@ -4716,41 +4716,41 @@ void Scene357::enter() { } void Scene357::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _game._player._walkOffScreenSceneId = 318; - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 358; } void Scene357::actions() { if (_action._lookFlag) _vm->_dialogs->show(35715); - else if (_action.isAction(VERB_LOOK, 0x11)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(35710); - else if (_action.isAction(VERB_CLIMB_INTO, 0x11)) + else if (_action.isAction(VERB_CLIMB_INTO, NOUN_AIR_VENT)) _vm->_dialogs->show(35711); - else if (_action.isAction(VERB_LOOK, 0x1CB)) + else if (_action.isAction(VERB_LOOK, NOUN_BED)) _vm->_dialogs->show(35712); - else if (_action.isAction(VERB_LOOK, 0x216)) + else if (_action.isAction(VERB_LOOK, NOUN_SINK)) _vm->_dialogs->show(35713); - else if (_action.isAction(VERB_LOOK, 0x21B)) + else if (_action.isAction(VERB_LOOK, NOUN_TOILET)) _vm->_dialogs->show(35714); - else if (_action.isAction(VERB_LOOK, 0x207)) + else if (_action.isAction(VERB_LOOK, NOUN_CELL_WALL)) _vm->_dialogs->show(35716); - else if (_action.isAction(VERB_LOOK, 0xCD)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHT)) _vm->_dialogs->show(35717); - else if (_action.isAction(VERB_LOOK, 0x23A)) + else if (_action.isAction(VERB_LOOK, NOUN_RIP_IN_FLOOR)) _vm->_dialogs->show(35718); - else if (_action.isAction(VERB_LOOK, 0x218)) + else if (_action.isAction(VERB_LOOK, NOUN_DEBRIS)) _vm->_dialogs->show(35719); - else if (_action.isAction(VERB_TAKE, 0x218)) + else if (_action.isAction(VERB_TAKE, NOUN_DEBRIS)) _vm->_dialogs->show(35720); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(35721); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(35722); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(35723); else return; @@ -4780,29 +4780,29 @@ void Scene358::enter() { } void Scene358::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _game._player._walkOffScreenSceneId = 357; - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 359; } void Scene358::actions() { if (_action._lookFlag) _vm->_dialogs->show(35815); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(35810); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(35811); - else if (_action.isAction(VERB_LOOK, 0x1CB)) + else if (_action.isAction(VERB_LOOK, NOUN_BED)) _vm->_dialogs->show(35812); - else if (_action.isAction(VERB_LOOK, 0x216)) + else if (_action.isAction(VERB_LOOK, NOUN_SINK)) _vm->_dialogs->show(35813); - else if (_action.isAction(VERB_LOOK, 0x21B)) + else if (_action.isAction(VERB_LOOK, NOUN_TOILET)) _vm->_dialogs->show(35814); - else if (_action.isAction(VERB_LOOK, 0x204) || _action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR) || _action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(35816); - else if (_action.isAction(VERB_LOOK, 0x11)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(35817); else return; @@ -4846,10 +4846,10 @@ void Scene359::enter() { } void Scene359::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _game._player._walkOffScreenSceneId = 358; - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 360; } @@ -4859,7 +4859,7 @@ void Scene359::actions() { _vm->_dialogs->show(35914); else _vm->_dialogs->show(35915); - } else if (_action.isAction(VERB_TAKE, 0x131)) { + } else if (_action.isAction(VERB_TAKE, NOUN_SECURITY_CARD)) { if (_game._trigger || !_game._objects.isInInventory(OBJ_SECURITY_CARD)) { switch (_game._trigger) { case 0: @@ -4903,43 +4903,43 @@ void Scene359::actions() { break; } } - } else if (_action.isAction(VERB_LOOK, 0x23E)) + } else if (_action.isAction(VERB_LOOK, NOUN_BLOODY_CELL_WALL)) _vm->_dialogs->show(35910); - else if (_action.isAction(VERB_LOOK, 0x1CB)) + else if (_action.isAction(VERB_LOOK, NOUN_BED)) _vm->_dialogs->show(35911); - else if (_action.isAction(VERB_LOOK, 0x216)) + else if (_action.isAction(VERB_LOOK, NOUN_SINK)) _vm->_dialogs->show(35912); - else if (_action.isAction(VERB_LOOK, 0x21B)) + else if (_action.isAction(VERB_LOOK, NOUN_TOILET)) _vm->_dialogs->show(35913); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(35916); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(35917); - else if (_action.isAction(VERB_LOOK, 0x215)) + else if (_action.isAction(VERB_LOOK, NOUN_LIMB)) _vm->_dialogs->show(35918); - else if (_action.isAction(VERB_TAKE, 0x215)) + else if (_action.isAction(VERB_TAKE, NOUN_LIMB)) _vm->_dialogs->show(35919); - else if (_action.isAction(VERB_LOOK, 0x131) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_SECURITY_CARD) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(35921); - else if (_action.isAction(VERB_LOOK, 0x2D2)) { + else if (_action.isAction(VERB_LOOK, NOUN_BLOOD_STAIN)) { if ((_game._difficulty != DIFFICULTY_HARD) && (_game._objects[OBJ_SECURITY_CARD]._roomNumber == 359)) _vm->_dialogs->show(35922); else _vm->_dialogs->show(35923); - } else if (_action.isAction(VERB_LOOK, 0x23F)) + } else if (_action.isAction(VERB_LOOK, NOUN_WALL_BOARD)) _vm->_dialogs->show(35924); - else if (_action.isAction(VERB_TAKE, 0x23F)) + else if (_action.isAction(VERB_TAKE, NOUN_WALL_BOARD)) _vm->_dialogs->show(35925); - else if (_action.isAction(VERB_LOOK, 0x23A)) + else if (_action.isAction(VERB_LOOK, NOUN_RIP_IN_FLOOR)) _vm->_dialogs->show(35926); - else if (_action.isAction(VERB_LOOK, 0x204)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR)) _vm->_dialogs->show(35927); - else if (_action.isAction(VERB_LOOK, 0x89)) { + else if (_action.isAction(VERB_LOOK, NOUN_FLOOR)) { if ((_game._difficulty != DIFFICULTY_HARD) && (_game._objects[OBJ_SECURITY_CARD]._roomNumber == 359)) _vm->_dialogs->show(35928); else _vm->_dialogs->show(35929); - } else if (_action.isAction(VERB_OPEN, 0x11) || _action.isAction(VERB_LOOK, 0x11)) + } else if (_action.isAction(VERB_OPEN, NOUN_AIR_VENT) || _action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(36016); else return; @@ -4976,31 +4976,31 @@ void Scene360::enter() { } void Scene360::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _game._player._walkOffScreenSceneId = 359; - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 361; } void Scene360::actions() { if (_action._lookFlag) _vm->_dialogs->show(36015); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(36010); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(36011); - else if (_action.isAction(VERB_LOOK, 0x1CB)) + else if (_action.isAction(VERB_LOOK, NOUN_BED)) _vm->_dialogs->show(36012); - else if (_action.isAction(VERB_LOOK, 0x216)) + else if (_action.isAction(VERB_LOOK, NOUN_SINK)) _vm->_dialogs->show(36013); - else if (_action.isAction(VERB_LOOK, 0x21B)) + else if (_action.isAction(VERB_LOOK, NOUN_TOILET)) _vm->_dialogs->show(36014); - else if (_action.isAction(VERB_LOOK, 0x11)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(36016); - else if (_action.isAction(VERB_LOOK, 0x204)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR)) _vm->_dialogs->show(36017); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(36018); else return; @@ -5348,43 +5348,43 @@ void Scene361::step() { } void Scene361::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _game._player._walkOffScreenSceneId = 360; - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 354; } void Scene361::actions() { if (_action._lookFlag) _vm->_dialogs->show(36119); - else if (_action.isAction(VERB_SIT_AT, 0x1E4)) { + else if (_action.isAction(VERB_SIT_AT, NOUN_DESK)) { _scene->_kernelMessages.reset(); _scene->_kernelMessages.addQuote(0xFC, 120, 0); - } else if (_action.isAction(VERB_CLIMB_INTO, 0x11)) { + } else if (_action.isAction(VERB_CLIMB_INTO, NOUN_AIR_VENT)) { if (_globals[kSexOfRex] == REX_FEMALE) handleRoxAction(); else handleRexAction(); - } else if (_action.isAction(VERB_LOOK, 0x1E4)) + } else if (_action.isAction(VERB_LOOK, NOUN_DESK)) _vm->_dialogs->show(36110); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(36111); - else if (_action.isAction(VERB_LOOK, 0x220) || _action.isAction(VERB_STARE_AT, 0x220)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHTING_FIXTURE) || _action.isAction(VERB_STARE_AT, NOUN_LIGHTING_FIXTURE)) _vm->_dialogs->show(36112); - else if (_action.isAction(VERB_LOOK, 0x208) || _action.isAction(VERB_STARE_AT, 0x208)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHTS) || _action.isAction(VERB_STARE_AT, NOUN_LIGHTS)) _vm->_dialogs->show(36113); - else if (_action.isAction(VERB_TAKE, 0x208)) + else if (_action.isAction(VERB_TAKE, NOUN_LIGHTS)) _vm->_dialogs->show(36114); - else if (_action.isAction(VERB_LOOK, 0x2F8) || _action.isAction(VERB_STARE_AT, 0x2F8)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHT_BULB) || _action.isAction(VERB_STARE_AT, NOUN_LIGHT_BULB)) _vm->_dialogs->show(36115); - else if (_action.isAction(VERB_TAKE, 0x2F8)) + else if (_action.isAction(VERB_TAKE, NOUN_LIGHT_BULB)) _vm->_dialogs->show(36116); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(36117); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(36118); - else if (_action.isAction(VERB_LOOK, 0x11)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT)) _vm->_dialogs->show(36120); else return; @@ -5406,15 +5406,15 @@ void Scene366::enter() { } void Scene366::actions() { - if (_action.isAction(VERB_RETURN_TO, 0x2D4)) + if (_action.isAction(VERB_RETURN_TO, NOUN_AIR_SHAFT)) _scene->_nextSceneId = 302; - else if (_action.isAction(VERB_OPEN, 0x2D3)) { + else if (_action.isAction(VERB_OPEN, NOUN_GRATE)) { if (_game._visitedScenes.exists(316)) _vm->_dialogs->show(36612); else _vm->_dialogs->show(36613); _scene->_nextSceneId = 316; - } else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) { + } else if (_action.isAction(VERB_LOOK_THROUGH, NOUN_GRATE)) { if (_game._visitedScenes.exists(321)) _vm->_dialogs->show(36611); else @@ -5441,11 +5441,11 @@ void Scene387::enter() { } void Scene387::actions() { - if (_action.isAction(VERB_RETURN_TO, 0x2D4)) + if (_action.isAction(VERB_RETURN_TO, NOUN_AIR_SHAFT)) _scene->_nextSceneId = 313; - else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) + else if (_action.isAction(VERB_LOOK_THROUGH, NOUN_GRATE)) _vm->_dialogs->show(38710); - else if (_action.isAction(VERB_OPEN, 0x2D3)) + else if (_action.isAction(VERB_OPEN, NOUN_GRATE)) _vm->_dialogs->show(38711); else return; @@ -5479,9 +5479,9 @@ void Scene388::enter() { } void Scene388::actions() { - if (_action.isAction(VERB_RETURN_TO, 0x2D4)) + if (_action.isAction(VERB_RETURN_TO, NOUN_AIR_SHAFT)) _scene->_nextSceneId = 313; - else if (_action.isAction(VERB_TALKTO, 0x303)) { + else if (_action.isAction(VERB_TALKTO, NOUN_SAUROPOD)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -5503,12 +5503,12 @@ void Scene388::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) { + } else if (_action.isAction(VERB_LOOK_THROUGH, NOUN_GRATE)) { if (_globals[kAfterHavoc]) _vm->_dialogs->show(38811); else _vm->_dialogs->show(38810); - } else if (_action.isAction(VERB_OPEN, 0x2D3)) + } else if (_action.isAction(VERB_OPEN, NOUN_GRATE)) _vm->_dialogs->show(38812); else return; @@ -5556,9 +5556,9 @@ void Scene389::step() { } void Scene389::actions() { - if (_action.isAction(VERB_RETURN_TO, 0x2D4)) + if (_action.isAction(VERB_RETURN_TO, NOUN_AIR_SHAFT)) _scene->_nextSceneId = 313; - else if (_action.isAction(VERB_TALKTO, 0x304)) { + else if (_action.isAction(VERB_TALKTO, NOUN_MONSTER)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -5576,7 +5576,7 @@ void Scene389::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) { + } else if (_action.isAction(VERB_LOOK_THROUGH, NOUN_GRATE)) { if (_globals[kAfterHavoc]) { if ((_game._difficulty != DIFFICULTY_HARD) && (_game._objects[OBJ_SECURITY_CARD]._roomNumber == 359)) _vm->_dialogs->show(38911); @@ -5584,7 +5584,7 @@ void Scene389::actions() { _vm->_dialogs->show(38912); } else _vm->_dialogs->show(38910); - } else if (_action.isAction(VERB_OPEN, 0x2D3)) { + } else if (_action.isAction(VERB_OPEN, NOUN_GRATE)) { if (_globals[kAfterHavoc]) _vm->_dialogs->show(38914); else @@ -5617,11 +5617,11 @@ void Scene390::enter() { } void Scene390::actions() { - if (_action.isAction(VERB_RETURN_TO, 0x2D4)) + if (_action.isAction(VERB_RETURN_TO, NOUN_AIR_SHAFT)) _scene->_nextSceneId = 313; - else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) + else if (_action.isAction(VERB_LOOK_THROUGH, NOUN_GRATE)) _vm->_dialogs->show(39010); - else if (_action.isAction(VERB_OPEN, 0x2D3)) + else if (_action.isAction(VERB_OPEN, NOUN_GRATE)) _vm->_dialogs->show(39011); else return; @@ -5643,9 +5643,9 @@ void Scene391::enter() { } void Scene391::actions() { - if (_action.isAction(VERB_RETURN_TO, 0x2D4)) + if (_action.isAction(VERB_RETURN_TO, NOUN_AIR_SHAFT)) _scene->_nextSceneId = 313; - else if (_action.isAction(VERB_OPEN, 0x2D3)) { + else if (_action.isAction(VERB_OPEN, NOUN_GRATE)) { if (_globals[kKickedIn391Grate]) _vm->_dialogs->show(39113); else { @@ -5657,7 +5657,7 @@ void Scene391::actions() { _scene->_nextSceneId = 361; else _scene->_nextSceneId = 311; - } else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) { + } else if (_action.isAction(VERB_LOOK_THROUGH, NOUN_GRATE)) { if (_globals[kAfterHavoc]) _vm->_dialogs->show(39111); else @@ -5682,9 +5682,9 @@ void Scene399::enter() { } void Scene399::actions() { - if (_action.isAction(VERB_RETURN_TO, 0x2D4)) + if (_action.isAction(VERB_RETURN_TO, NOUN_AIR_SHAFT)) _scene->_nextSceneId = 313; - else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) { + else if (_action.isAction(VERB_LOOK_THROUGH, NOUN_GRATE)) { if (_globals[kAfterHavoc]) { if ((_game._difficulty != DIFFICULTY_HARD) && (_game._objects[OBJ_SECURITY_CARD]._roomNumber == 359)) _vm->_dialogs->show(38911); @@ -5692,7 +5692,7 @@ void Scene399::actions() { _vm->_dialogs->show(38912); } else _vm->_dialogs->show(38910); - } else if (_action.isAction(VERB_OPEN, 0x2D3)) { + } else if (_action.isAction(VERB_OPEN, NOUN_GRATE)) { if (_globals[kAfterHavoc]) _vm->_dialogs->show(38914); else diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp index d8f3607f38..dd196b4059 100644 --- a/engines/mads/nebular/nebular_scenes4.cpp +++ b/engines/mads/nebular/nebular_scenes4.cpp @@ -158,12 +158,12 @@ void Scene401::step() { } void Scene401::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_NORTH)) { _game._player.walk(Common::Point(149, 89), FACING_NORTH); _northFl = false; } - if (_action.isAction(VERB_WALK_DOWN, 0x2B3) && !_northFl) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) && !_northFl) _game._player._walkOffScreenSceneId = 405; if (_action.isAction(VERB_TAKE)) @@ -204,23 +204,23 @@ void Scene401::actions() { } } - if (_action.isAction(VERB_WALK_INTO, 0x241)) { + if (_action.isAction(VERB_WALK_INTO, NOUN_BAR)) { if (!_northFl) _scene->_nextSceneId = 402; - } else if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) + } else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_NORTH)) _scene->_nextSceneId = 354; - else if (_action.isAction(VERB_LOOK, 0x1F3)) { + else if (_action.isAction(VERB_LOOK, NOUN_SCANNER)) { if (_globals[kHasBeenScanned]) _vm->_dialogs->show(40111); else _vm->_dialogs->show(40110); - } else if (_action.isAction(VERB_LOOK, 0x241)) + } else if (_action.isAction(VERB_LOOK, NOUN_BAR)) _vm->_dialogs->show(40112); - else if (_action.isAction(VERB_LOOK, 0x244)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGN)) _vm->_dialogs->show(40113); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(40114); - else if (_action.isAction(VERB_LOOK, 0x2B4)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_NORTH)) _vm->_dialogs->show(40115); else if (_action._lookFlag) _vm->_dialogs->show(40116); @@ -1977,29 +1977,29 @@ void Scene402::step() { } void Scene402::preActions() { - if (_action.isAction(VERB_SIT_ON, 0x24A) && (_game._player._prepareWalkPos.x != 248)) + if (_action.isAction(VERB_SIT_ON, NOUN_BAR_STOOL) && (_game._player._prepareWalkPos.x != 248)) _game._player.walk(Common::Point(232, 112), FACING_EAST); - if (_action.isAction(VERB_WALKTO, 0x309)) + if (_action.isAction(VERB_WALKTO, NOUN_WOMAN_ON_BALCONY)) _game._player._needToWalk = _game._player._readyToWalk; - if (!_roxOnStool && _action.isAction(VERB_TAKE, 0x5C) && !_game._objects.isInInventory(OBJ_CREDIT_CHIP)) + if (!_roxOnStool && _action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP) && !_game._objects.isInInventory(OBJ_CREDIT_CHIP)) _game._player.walk(Common::Point(246, 108), FACING_NORTH); if (_action.isAction(VERB_TAKE)) _game._player._needToWalk = false; - if (_action.isAction(VERB_TAKE, 0x5C) && !_roxOnStool) + if (_action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP) && !_roxOnStool) _game._player._needToWalk = true; if (_roxOnStool) { if (_action.isAction(VERB_LOOK) || _action.isAction(0x24A) || _action.isAction(VERB_TALKTO)) _game._player._needToWalk = false; - if (_action.isAction(VERB_TAKE, 0x124) || _action.isAction(VERB_TAKE, 0x5C)) + if (_action.isAction(VERB_TAKE, NOUN_REPAIR_LIST) || _action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP)) _game._player._needToWalk = false; - if (_action.isAction(VERB_TALKTO, 0x30A) || _action.isAction(VERB_TALKTO, 0x30C)) + if (_action.isAction(VERB_TALKTO, NOUN_WOMAN_IN_CHAIR) || _action.isAction(VERB_TALKTO, NOUN_WOMAN_IN_ALCOVE)) _game._player._needToWalk = _game._player._readyToWalk; if (_game._player._needToWalk) { @@ -2011,22 +2011,22 @@ void Scene402::preActions() { } } - if (_action.isAction(VERB_TAKE, 0x124) && !_roxOnStool && !_game._objects.isInInventory(OBJ_REPAIR_LIST)) + if (_action.isAction(VERB_TAKE, NOUN_REPAIR_LIST) && !_roxOnStool && !_game._objects.isInInventory(OBJ_REPAIR_LIST)) _game._player.walk(Common::Point(191, 99), FACING_NORTHEAST); - if (_action.isAction(VERB_TALKTO, 0x30E) && !_roxOnStool) + if (_action.isAction(VERB_TALKTO, NOUN_BARTENDER) && !_roxOnStool) _game._player.walk(Common::Point(228, 83), FACING_SOUTH); - if (_action.isAction(VERB_TALKTO, 0x3AA) && !_roxOnStool) + if (_action.isAction(VERB_TALKTO, NOUN_REPAIR_WOMAN) && !_roxOnStool) _game._player.walk(Common::Point(208, 102), FACING_NORTHEAST); } void Scene402::actions() { - if (_action.isAction(VERB_TAKE, 0x124) && _game._objects.isInRoom(OBJ_REPAIR_LIST) && _roxOnStool) { + if (_action.isAction(VERB_TAKE, NOUN_REPAIR_LIST) && _game._objects.isInRoom(OBJ_REPAIR_LIST) && _roxOnStool) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(1, 77); _game._player._needToWalk = false; - } else if (_action.isAction(VERB_TAKE, 0x124) && _game._objects.isInRoom(OBJ_REPAIR_LIST) && !_roxOnStool) { + } else if (_action.isAction(VERB_TAKE, NOUN_REPAIR_LIST) && _game._objects.isInRoom(OBJ_REPAIR_LIST) && !_roxOnStool) { if (_game._trigger == 0) { _game._player._stepEnabled = false; _game._player._visible = false; @@ -2048,11 +2048,11 @@ void Scene402::actions() { _game._player._stepEnabled = true; } else if (_game._screenObjects._inputMode == 1) handleDialogs(); - else if (_action.isAction(VERB_WALK_INTO, 0x2B3)) + else if (_action.isAction(VERB_WALK_INTO, NOUN_CORRIDOR_TO_SOUTH)) _scene->_nextSceneId = 401; - else if (_action.isAction(VERB_WALK_ONTO, 0x248)) + else if (_action.isAction(VERB_WALK_ONTO, NOUN_DANCE_FLOOR)) ; // just... nothing - else if (_action.isAction(VERB_TALKTO, 0x3AA)) { + else if (_action.isAction(VERB_TALKTO, NOUN_REPAIR_WOMAN)) { switch (_game._trigger) { case 0: { _game._player._stepEnabled = false; @@ -2128,26 +2128,26 @@ void Scene402::actions() { } break; } - } else if (_action.isAction(VERB_TALKTO, 0x30A) && !_firstTalkToGirlInChair) { + } else if (_action.isAction(VERB_TALKTO, NOUN_WOMAN_IN_CHAIR) && !_firstTalkToGirlInChair) { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x1D7)); _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(150, 39); _game._player._stepEnabled = false; _firstTalkToGirlInChair = true; - } else if (_action.isAction(VERB_TALKTO, 0x30A) && _firstTalkToGirlInChair) { + } else if (_action.isAction(VERB_TALKTO, NOUN_WOMAN_IN_CHAIR) && _firstTalkToGirlInChair) { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x1DB)); _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(150, 42); _game._player._stepEnabled = false; - } else if (_action.isAction(VERB_TALKTO, 0x30C) || _action.isAction(VERB_WALKTO, 0x30C)) { + } else if (_action.isAction(VERB_TALKTO, NOUN_WOMAN_IN_ALCOVE) || _action.isAction(VERB_WALKTO, NOUN_WOMAN_IN_ALCOVE)) { _scene->_kernelMessages.add(Common::Point(102, 48), 0xFBFA, 0, 0, 120, _game.getQuote(0x1DE)); _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(120, 44); _game._player._stepEnabled = false; - } else if (_action.isAction(VERB_WALK_ALONG, 0x24A) && (_game._player._targetPos.x == 248)){ + } else if (_action.isAction(VERB_WALK_ALONG, NOUN_BAR_STOOL) && (_game._player._targetPos.x == 248)){ _scene->_kernelMessages.add(Common::Point(0, -14), 0x1110, 34, 0, 120, _game.getQuote(0x20D)); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x20E)); - } else if (_action.isAction(VERB_WALK_ALONG, 0x24A) && !_roxOnStool && (_game._player._targetPos.x != 248)) { + } else if (_action.isAction(VERB_WALK_ALONG, NOUN_BAR_STOOL) && !_roxOnStool && (_game._player._targetPos.x != 248)) { _game._player._visible = false; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 7, 1, 0, 0); @@ -2155,11 +2155,11 @@ void Scene402::actions() { _scene->_sequences.setDepth(_globals._sequenceIndexes[6], 5); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 76); _game._player._stepEnabled = false; - } else if (_action.isAction(VERB_TAKE, 0x5C) && !_game._objects.isInInventory(OBJ_CREDIT_CHIP) && _roxOnStool) { + } else if (_action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP) && !_game._objects.isInInventory(OBJ_CREDIT_CHIP) && _roxOnStool) { _roxMode = 20; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(1, 92); - } else if (_action.isAction(VERB_TAKE, 0x5C) && !_game._objects.isInInventory(OBJ_CREDIT_CHIP) && !_roxOnStool) { + } else if (_action.isAction(VERB_TAKE, NOUN_CREDIT_CHIP) && !_game._objects.isInInventory(OBJ_CREDIT_CHIP) && !_roxOnStool) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; _game._player._visible = false; @@ -2170,7 +2170,7 @@ void Scene402::actions() { _scene->_sequences.setScale(_globals._sequenceIndexes[22], 88); _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addSubEntry(_globals._sequenceIndexes[22], SEQUENCE_TRIGGER_EXPIRE, 0, 104); - } else if (_action.isAction(VERB_TALKTO, 0x30E)) { + } else if (_action.isAction(VERB_TALKTO, NOUN_BARTENDER)) { switch (_game._trigger) { case 0: { int centerFlag; @@ -2281,66 +2281,66 @@ void Scene402::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK, 0x248)) + } else if (_action.isAction(VERB_LOOK, NOUN_DANCE_FLOOR)) _vm->_dialogs->show(40210); - else if (_action.isAction(VERB_LOOK, 0x16C)) { + else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER)) { if (_globals[kSomeoneHasExploded]) _vm->_dialogs->show(40212); else _vm->_dialogs->show(40211); - } else if (_action.isAction(VERB_LOOK, 0x241)) + } else if (_action.isAction(VERB_LOOK, NOUN_BAR)) _vm->_dialogs->show(40213); - else if (_action.isAction(VERB_LOOK, 0x30E)) + else if (_action.isAction(VERB_LOOK, NOUN_BARTENDER)) _vm->_dialogs->show(40214); - else if (_action.isAction(VERB_LOOK, 0x30C)) + else if (_action.isAction(VERB_LOOK, NOUN_WOMAN_IN_ALCOVE)) _vm->_dialogs->show(40215); - else if (_action.isAction(VERB_LOOK, 0x309)) + else if (_action.isAction(VERB_LOOK, NOUN_WOMAN_ON_BALCONY)) _vm->_dialogs->show(40216); - else if (_action.isAction(VERB_LOOK, 0x30A)) + else if (_action.isAction(VERB_LOOK, NOUN_WOMAN_IN_CHAIR)) _vm->_dialogs->show(40217); - else if (_action.isAction(VERB_LOOK, 0x3AA)) + else if (_action.isAction(VERB_LOOK, NOUN_REPAIR_WOMAN)) _vm->_dialogs->show(40218); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(40219); else if (_action._lookFlag) _vm->_dialogs->show(40220); - else if (_action.isAction(VERB_LOOK, 0x2B8)) + else if (_action.isAction(VERB_LOOK, NOUN_WOMEN)) _vm->_dialogs->show(40221); - else if (_action.isAction(VERB_PUSH, 0x3AA) || _action.isAction(VERB_PULL, 0x3AA)) + else if (_action.isAction(VERB_PUSH, NOUN_REPAIR_WOMAN) || _action.isAction(VERB_PULL, NOUN_REPAIR_WOMAN)) _vm->_dialogs->show(40222); - else if (_action.isAction(VERB_TALKTO, 0x2B8)) + else if (_action.isAction(VERB_TALKTO, NOUN_WOMEN)) _vm->_dialogs->show(40223); - else if (_action.isAction(VERB_TALKTO, 0x309)) + else if (_action.isAction(VERB_TALKTO, NOUN_WOMAN_ON_BALCONY)) _vm->_dialogs->show(40224); - else if (_action.isAction(VERB_LOOK, 0x249)) + else if (_action.isAction(VERB_LOOK, NOUN_RAILING)) _vm->_dialogs->show(40225); - else if (_action.isAction(VERB_LOOK, 0x160)) + else if (_action.isAction(VERB_LOOK, NOUN_TABLE)) _vm->_dialogs->show(40226); - else if (_action.isAction(VERB_TAKE, 0x160)) + else if (_action.isAction(VERB_TAKE, NOUN_TABLE)) _vm->_dialogs->show(40227); - else if (_action.isAction(VERB_LOOK, 0x244)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGN)) _vm->_dialogs->show(40228); - else if (_action.isAction(VERB_TAKE, 0x244)) + else if (_action.isAction(VERB_TAKE, NOUN_SIGN)) _vm->_dialogs->show(40229); - else if (_action.isAction(VERB_LOOK, 0x24A)) + else if (_action.isAction(VERB_LOOK, NOUN_BAR_STOOL)) _vm->_dialogs->show(40230); - else if (_action.isAction(VERB_TAKE, 0x24A)) + else if (_action.isAction(VERB_TAKE, NOUN_BAR_STOOL)) _vm->_dialogs->show(40231); - else if (_action.isAction(VERB_LOOK, 0x3B)) + else if (_action.isAction(VERB_LOOK, NOUN_CACTUS)) _vm->_dialogs->show(40232); - else if (_action.isAction(VERB_TAKE, 0x3B)) + else if (_action.isAction(VERB_TAKE, NOUN_CACTUS)) _vm->_dialogs->show(40233); - else if (_action.isAction(VERB_LOOK, 0x24E)) + else if (_action.isAction(VERB_LOOK, NOUN_DISCO_BALL)) _vm->_dialogs->show(40234); - else if (_action.isAction(VERB_LOOK, 0x247)) + else if (_action.isAction(VERB_LOOK, NOUN_UPPER_DANCE_FLOOR)) _vm->_dialogs->show(40235); - else if (_action.isAction(VERB_LOOK, 0x174)) + else if (_action.isAction(VERB_LOOK, NOUN_TREE)) _vm->_dialogs->show(40236); - else if (_action.isAction(VERB_LOOK, 0x10E)) + else if (_action.isAction(VERB_LOOK, NOUN_PLANT)) _vm->_dialogs->show(40237); - else if (_action.isAction(VERB_TAKE, 0x10E)) + else if (_action.isAction(VERB_TAKE, NOUN_PLANT)) _vm->_dialogs->show(40238); - else if (_action.isAction(VERB_LOOK, 0x124) && _game._objects.isInRoom(OBJ_REPAIR_LIST)) + else if (_action.isAction(VERB_LOOK, NOUN_REPAIR_LIST) && _game._objects.isInRoom(OBJ_REPAIR_LIST)) _vm->_dialogs->show(40239); else return; @@ -2435,24 +2435,24 @@ void Scene405::preActions() { if (_action.isAction(VERB_TAKE)) _game._player._needToWalk = false; - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 401; - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _game._player._walkOffScreenSceneId = 406; - if (_action.isAction(VERB_CLOSE, 0x259) && _globals[kArmoryDoorOpen]) + if (_action.isAction(VERB_CLOSE, NOUN_WIDE_DOOR) && _globals[kArmoryDoorOpen]) _game._player.walk(Common::Point(212, 113), FACING_NORTH); } void Scene405::actions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x6E)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOOR)) _scene->_nextSceneId = 413; - else if (_action.isAction(VERB_WALK_THROUGH, 0x259) && _globals[kArmoryDoorOpen]) + else if (_action.isAction(VERB_WALK_THROUGH, NOUN_WIDE_DOOR) && _globals[kArmoryDoorOpen]) _scene->_nextSceneId = 408; - else if (_action.isAction(VERB_WALK_THROUGH, 0x259) && !_globals[kArmoryDoorOpen]) + 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, 0x131, 0x251) && !_globals[kArmoryDoorOpen]) { + else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) && !_globals[kArmoryDoorOpen]) { _game._player._stepEnabled = false; _game._player._visible = false; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; @@ -2462,7 +2462,7 @@ void Scene405::actions() { Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1); _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], msgPos); _scene->_sequences.setScale(_globals._sequenceIndexes[3], 87); - } else if ((_action.isAction(VERB_PUT, 0x131, 0x251) || _action.isAction(VERB_CLOSE, 0x259)) && _globals[kArmoryDoorOpen]) { + } else if ((_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) || _action.isAction(VERB_CLOSE, NOUN_WIDE_DOOR)) && _globals[kArmoryDoorOpen]) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; _game._player._visible = false; @@ -2471,7 +2471,7 @@ void Scene405::actions() { _scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 70); _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], _game._player._playerPos); _scene->_sequences.setScale(_globals._sequenceIndexes[3], 87); - } else if (_action.isAction(VERB_PUT, 0x251)) { + } else if (_action.isAction(VERB_PUT, NOUN_CARD_SLOT)) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; _game._player._visible = false; @@ -2480,36 +2480,36 @@ void Scene405::actions() { _scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 80); _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[3], _game._player._playerPos); _scene->_sequences.setScale(_globals._sequenceIndexes[3], 87); - } else if (_action.isAction(VERB_LOOK, 0x31A)) + } else if (_action.isAction(VERB_LOOK, NOUN_CANNON_BALLS)) _vm->_dialogs->show(40510); - else if (_action.isAction(VERB_TAKE, 0x31A)) + else if (_action.isAction(VERB_TAKE, NOUN_CANNON_BALLS)) _vm->_dialogs->show(40511); - else if (_action.isAction(VERB_LOOK, 0x254)) + else if (_action.isAction(VERB_LOOK, NOUN_WATER_FOUNTAIN)) _vm->_dialogs->show(40512); - else if (_action.isAction(VERB_LOOK, 0x258) || _action.isAction(VERB_LOOK, 0x252)) + else if (_action.isAction(VERB_LOOK, NOUN_BACKBOARD) || _action.isAction(VERB_LOOK, NOUN_HOOP)) _vm->_dialogs->show(40513); - else if (_action.isAction(VERB_LOOK, 0xCD)) + else if (_action.isAction(VERB_LOOK, NOUN_LIGHT)) _vm->_dialogs->show(40514); - else if (_action.isAction(VERB_LOOK, 0x251)) + else if (_action.isAction(VERB_LOOK, NOUN_CARD_SLOT)) _vm->_dialogs->show(40515); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(40516); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(40517); - else if (_action.isAction(VERB_LOOK, 0xE2)) + else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) _vm->_dialogs->show(40518); - else if (_action.isAction(VERB_LOOK, 0x204) || _action._lookFlag) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR) || _action._lookFlag) _vm->_dialogs->show(40519); - else if (_action.isAction(VERB_LOOK, 0x259)) { + else if (_action.isAction(VERB_LOOK, NOUN_WIDE_DOOR)) { if (_globals[kArmoryDoorOpen]) _vm->_dialogs->show(40521); else _vm->_dialogs->show(40520); - } else if (_action.isAction(VERB_LOOK, 0x6E)) + } else if (_action.isAction(VERB_LOOK, NOUN_DOOR)) _vm->_dialogs->show(40522); - else if (_action.isAction(VERB_LOOK, 0x250)) + else if (_action.isAction(VERB_LOOK, NOUN_COACH_LAMP)) _vm->_dialogs->show(40523); - else if (_action.isAction(VERB_LOOK, 0x257)) + else if (_action.isAction(VERB_LOOK, NOUN_SUPPORT)) _vm->_dialogs->show(40524); else return; @@ -2621,36 +2621,36 @@ void Scene406::step() { } void Scene406::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x2BA)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_WEST)) _game._player._walkOffScreenSceneId = 405; - if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_EAST)) _game._player._walkOffScreenSceneId = 407; if (_action.isAction(VERB_TAKE)) _game._player._needToWalk = false; - if (_action.isAction(VERB_LOOK, 0x244) || _action.isAction(VERB_LOOK, 0x25C)) + if (_action.isAction(VERB_LOOK, NOUN_SIGN) || _action.isAction(VERB_LOOK, NOUN_TRASH)) _game._player._needToWalk = true; } void Scene406::actions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && (_game._player._targetPos.x> 100)) { + if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOOR) && (_game._player._targetPos.x> 100)) { _game._player._stepEnabled = false; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.remove(_globals._sequenceIndexes[3]); _globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 3, 1, 0, 0); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 80); _vm->_sound->command(19); - } else if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && _globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100)) + } else if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOOR) && _globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100)) _scene->_nextSceneId = 410; - else if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && !_globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100)) { + else if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOOR) && !_globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100)) { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 60, _game.getQuote(0x24F)); if (!_hitStorageDoor) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(80, 100); } - } else if (_action.isAction(VERB_PUT, 0x131, 0x251) && !_globals[kStorageDoorOpen]) { + } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) && !_globals[kStorageDoorOpen]) { _game._player._stepEnabled = false; _game._player._visible = false; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; @@ -2660,7 +2660,7 @@ void Scene406::actions() { Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1); _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], msgPos); _scene->_sequences.setScale(_globals._sequenceIndexes[2], 87); - } else if (_action.isAction(VERB_PUT, 0x131, 0x251) && _globals[kStorageDoorOpen]) { + } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251) && _globals[kStorageDoorOpen]) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; _game._player._visible = false; @@ -2670,7 +2670,7 @@ void Scene406::actions() { Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1); _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], msgPos); _scene->_sequences.setScale(_globals._sequenceIndexes[2], 87); - } else if (_action.isAction(VERB_PUT, 0x251)) { + } else if (_action.isAction(VERB_PUT, NOUN_CARD_SLOT)) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; _game._player._visible = false; @@ -2679,42 +2679,42 @@ void Scene406::actions() { _scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 110); _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], _game._player._playerPos); _scene->_sequences.setScale(_globals._sequenceIndexes[2], 87); - } else if (_action.isAction(VERB_LOOK, 0x25C)) + } else if (_action.isAction(VERB_LOOK, NOUN_TRASH)) _vm->_dialogs->show(40610); - else if (_action.isAction(VERB_TAKE, 0x25C)) + else if (_action.isAction(VERB_TAKE, NOUN_TRASH)) _vm->_dialogs->show(40611); - else if (_action.isAction(VERB_LOOK, 0x251)) + else if (_action.isAction(VERB_LOOK, NOUN_CARD_SLOT)) _vm->_dialogs->show(40612); - else if (_action.isAction(VERB_LOOK, 0x25B)) + else if (_action.isAction(VERB_LOOK, NOUN_FIRE_EXTINGUISHER)) _vm->_dialogs->show(40614); - else if (_action.isAction(VERB_TAKE, 0x25B)) + else if (_action.isAction(VERB_TAKE, NOUN_FIRE_EXTINGUISHER)) _vm->_dialogs->show(40615); - else if (_action.isAction(VERB_LOOK, 0x2B9)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_EAST)) _vm->_dialogs->show(40616); - else if (_action.isAction(VERB_LOOK, 0x2BA)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_WEST)) _vm->_dialogs->show(40617); - else if (_action.isAction(VERB_LOOK, 0x204) || _action._lookFlag) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR) || _action._lookFlag) _vm->_dialogs->show(40618); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(40619); - else if (_action.isAction(VERB_LOOK, 0x6E)) { + else if (_action.isAction(VERB_LOOK, NOUN_DOOR)) { if (_globals[kStorageDoorOpen]) _vm->_dialogs->show(40621); else _vm->_dialogs->show(40620); - } else if (_action.isAction(VERB_LOOK, 0xE2)) + } else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) _vm->_dialogs->show(40623); - else if (_action.isAction(VERB_LOOK, 0x47A)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGNPOST)) _vm->_dialogs->show(40624); - else if (_action.isAction(VERB_TAKE, 0x47A)) + else if (_action.isAction(VERB_TAKE, NOUN_SIGNPOST)) _vm->_dialogs->show(40625); - else if (_action.isAction(VERB_LOOK, 0x2F)) + else if (_action.isAction(VERB_LOOK, NOUN_BOULDER)) _vm->_dialogs->show(40626); - else if (_action.isAction(VERB_TAKE, 0x2F)) + else if (_action.isAction(VERB_TAKE, NOUN_BOULDER)) _vm->_dialogs->show(40627); - else if (_action.isAction(VERB_LOOK, 0x244)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGN)) _vm->_dialogs->show(40628); - else if (_action.isAction(VERB_TAKE, 0x244)) + else if (_action.isAction(VERB_TAKE, NOUN_SIGN)) _vm->_dialogs->show(40629); else return; @@ -2771,10 +2771,10 @@ void Scene407::preActions() { if (_action.isAction(VERB_TAKE)) _game._player._needToWalk = false; - if (_action.isAction(VERB_LOOK, 0x6E)) + if (_action.isAction(VERB_LOOK, NOUN_DOOR)) _game._player._needToWalk = true; - if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_NORTH)) { _game._player.walk(Common::Point(172, 91), FACING_NORTH); _fromNorth = false; } @@ -2813,20 +2813,20 @@ void Scene407::actions() { } } - if (_action.isAction(VERB_WALK_DOWN, 0x2B3) && !_fromNorth) + if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) && !_fromNorth) _scene->_nextSceneId = 406; - else if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_NORTH)) _scene->_nextSceneId = 318; - else if (_action.isAction(VERB_LOOK, 0x1F3)) { + else if (_action.isAction(VERB_LOOK, NOUN_SCANNER)) { if (_globals[kHasBeenScanned]) _vm->_dialogs->show(40711); else _vm->_dialogs->show(40710); - } else if (_action.isAction(VERB_LOOK, 0x6E)) + } else if (_action.isAction(VERB_LOOK, NOUN_DOOR)) _vm->_dialogs->show(40712); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(40713); - else if (_action.isAction(VERB_LOOK, 0x2B4)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_NORTH)) _vm->_dialogs->show(40714); else if (_action._lookFlag) _vm->_dialogs->show(40715); @@ -2870,18 +2870,18 @@ void Scene408::enter() { } void Scene408::preActions() { - if ((_action.isAction(VERB_TAKE) && !_action.isAction(0x167)) || _action.isAction(VERB_PULL, 0x47B) || _action.isAction(VERB_OPEN, 0x265)) + 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, 0x167) && _game._objects.isInRoom(0x17)) || _action.isAction(VERB_LOOK, 0x263)) + if ((_action.isAction(VERB_LOOK, NOUN_TARGET_MODULE) && _game._objects.isInRoom(0x17)) || _action.isAction(VERB_LOOK, NOUN_CHEST)) _game._player._needToWalk = true; } void Scene408::actions() { - if (_action.isAction(VERB_WALK_INTO, 0x2B3)) { + if (_action.isAction(VERB_WALK_INTO, NOUN_CORRIDOR_TO_SOUTH)) { _scene->_nextSceneId = 405; _vm->_sound->command(58); - } else if (_action.isAction(VERB_TAKE, 0x167) && (_game._objects.isInRoom(OBJ_TARGET_MODULE) || _game._trigger)) { + } else if (_action.isAction(VERB_TAKE, NOUN_TARGET_MODULE) && (_game._objects.isInRoom(OBJ_TARGET_MODULE) || _game._trigger)) { switch (_game._trigger) { case (0): _vm->_sound->command(57); @@ -2913,84 +2913,84 @@ void Scene408::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK, 0x2BC)) + } else if (_action.isAction(VERB_LOOK, NOUN_ARMORED_VEHICLE)) _vm->_dialogs->show(40810); - else if (_action.isAction(VERB_TAKE, 0x2BC) || _action.isAction(VERB_TAKE, 0x261) || _action.isAction(VERB_TAKE, 0x25F)) + else if (_action.isAction(VERB_TAKE, NOUN_ARMORED_VEHICLE) || _action.isAction(VERB_TAKE, NOUN_ANVIL) || _action.isAction(VERB_TAKE, NOUN_TWO_TON_WEIGHT)) _vm->_dialogs->show(40811); - else if (_action.isAction(VERB_LOOK, 0x2BE)) + else if (_action.isAction(VERB_LOOK, NOUN_MISSILE)) _vm->_dialogs->show(40812); - else if (_action.isAction(VERB_TAKE, 0x2BE)) + else if (_action.isAction(VERB_TAKE, NOUN_MISSILE)) _vm->_dialogs->show(40813); - else if (_action.isAction(VERB_LOOK, 0x2C2)) + else if (_action.isAction(VERB_LOOK, NOUN_GRENADE)) _vm->_dialogs->show(40814); - else if (_action.isAction(VERB_TAKE, 0x2C2)) + else if (_action.isAction(VERB_TAKE, NOUN_GRENADE)) _vm->_dialogs->show(40815); - else if (_action.isAction(VERB_TAKE, 0x47B) || _action.isAction(VERB_PULL, 0x47B)) + else if (_action.isAction(VERB_TAKE, NOUN_PIN) || _action.isAction(VERB_PULL, NOUN_PIN)) _vm->_dialogs->show(40816); - else if (_action.isAction(VERB_LOOK, 0x26D)) + else if (_action.isAction(VERB_LOOK, NOUN_BLIMP)) _vm->_dialogs->show(40817); - else if (_action.isAction(VERB_TAKE, 0x26D)) + else if (_action.isAction(VERB_TAKE, NOUN_BLIMP)) _vm->_dialogs->show(40818); - else if (_action.isAction(VERB_LOOK, 0x2BB)) + else if (_action.isAction(VERB_LOOK, NOUN_AMMUNITION)) _vm->_dialogs->show(40819); - else if (_action.isAction(VERB_TAKE, 0x2BB)) + else if (_action.isAction(VERB_TAKE, NOUN_AMMUNITION)) _vm->_dialogs->show(40820); - else if (_action.isAction(VERB_LOOK, 0x269)) + else if (_action.isAction(VERB_LOOK, NOUN_CATAPULT)) _vm->_dialogs->show(40821); - else if (_action.isAction(VERB_TAKE, 0x269)) + else if (_action.isAction(VERB_TAKE, NOUN_CATAPULT)) _vm->_dialogs->show(40822); - else if (_action.isAction(VERB_LOOK, 0x263)) { + else if (_action.isAction(VERB_LOOK, NOUN_CHEST)) { if (_game._objects.isInRoom(OBJ_TARGET_MODULE)) _vm->_dialogs->show(40823); else _vm->_dialogs->show(40824); - } else if (_action.isAction(VERB_TAKE, 0x263)) + } else if (_action.isAction(VERB_TAKE, NOUN_CHEST)) _vm->_dialogs->show(40825); - else if (_action.isAction(VERB_LOOK, 0x2BF)) + else if (_action.isAction(VERB_LOOK, NOUN_SUIT_OF_ARMOR)) _vm->_dialogs->show(40826); - else if (_action.isAction(VERB_TAKE, 0x2BF)) + else if (_action.isAction(VERB_TAKE, NOUN_SUIT_OF_ARMOR)) _vm->_dialogs->show(40827); - else if (_action.isAction(VERB_LOOK, 0x7B)) + else if (_action.isAction(VERB_LOOK, NOUN_ESCAPE_HATCH)) _vm->_dialogs->show(40828); - else if (_action.isAction(VERB_OPEN, 0x7B) || _action.isAction(VERB_PULL, 0x7B)) + else if (_action.isAction(VERB_OPEN, NOUN_ESCAPE_HATCH) || _action.isAction(VERB_PULL, NOUN_ESCAPE_HATCH)) _vm->_dialogs->show(40829); - else if (_action.isAction(VERB_LOOK, 0x26B)) + else if (_action.isAction(VERB_LOOK, NOUN_BARRELS)) _vm->_dialogs->show(40830); - else if (_action.isAction(VERB_TAKE, 0x26B)) + else if (_action.isAction(VERB_TAKE, NOUN_BARRELS)) _vm->_dialogs->show(40831); - else if (_action.isAction(VERB_LOOK, 0x2C1)) + else if (_action.isAction(VERB_LOOK, NOUN_INFLATABLE_RAFT)) _vm->_dialogs->show(40832); - else if (_action.isAction(VERB_TAKE, 0x2C1)) + else if (_action.isAction(VERB_TAKE, NOUN_INFLATABLE_RAFT)) _vm->_dialogs->show(40833); - else if (_action.isAction(VERB_LOOK, 0x2BD)) + else if (_action.isAction(VERB_LOOK, NOUN_TOMATO)) _vm->_dialogs->show(40834); - else if (_action.isAction(VERB_TAKE, 0x2BD)) + else if (_action.isAction(VERB_TAKE, NOUN_TOMATO)) _vm->_dialogs->show(40835); - else if (_action.isAction(VERB_LOOK, 0x261)) + else if (_action.isAction(VERB_LOOK, NOUN_ANVIL)) _vm->_dialogs->show(40836); - else if (_action.isAction(VERB_LOOK, 0x25F)) + else if (_action.isAction(VERB_LOOK, NOUN_TWO_TON_WEIGHT)) _vm->_dialogs->show(40837); - else if (_action.isAction(VERB_LOOK, 0x2C0)) + else if (_action.isAction(VERB_LOOK, NOUN_POWDER_CONTAINER)) _vm->_dialogs->show(40838); - else if (_action.isAction(VERB_LOOK, 0x47C)) + else if (_action.isAction(VERB_LOOK, NOUN_POWDER_PUFF)) _vm->_dialogs->show(40839); - else if (_action.isAction(VERB_TAKE, 0x47C)) + else if (_action.isAction(VERB_TAKE, NOUN_POWDER_PUFF)) _vm->_dialogs->show(40840); - else if (_action.isAction(VERB_LOOK, 0x265)) + else if (_action.isAction(VERB_LOOK, NOUN_CARTON)) _vm->_dialogs->show(40841); - else if (_action.isAction(VERB_TAKE, 0x265)) + else if (_action.isAction(VERB_TAKE, NOUN_CARTON)) _vm->_dialogs->show(40842); - else if (_action.isAction(VERB_OPEN, 0x265)) + else if (_action.isAction(VERB_OPEN, NOUN_CARTON)) _vm->_dialogs->show(40843); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(40844); else if (_action._lookFlag) _vm->_dialogs->show(40845); - else if (_action.isAction(VERB_LOOK, 0x167) && _game._objects.isInRoom(OBJ_TARGET_MODULE)) + else if (_action.isAction(VERB_LOOK, NOUN_TARGET_MODULE) && _game._objects.isInRoom(OBJ_TARGET_MODULE)) _vm->_dialogs->show(40846); - else if (_action.isAction(VERB_LOOK, 0x26C)) + else if (_action.isAction(VERB_LOOK, NOUN_LOADING_RAMP)) _vm->_dialogs->show(40848); - else if (_action.isAction(VERB_OPEN, 0x263)) + else if (_action.isAction(VERB_OPEN, NOUN_CHEST)) _vm->_dialogs->show(40849); else return; @@ -3028,24 +3028,24 @@ void Scene409::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x181)) + if (_action.isAction(VERB_LOOK, NOUN_VIEWPORT)) _vm->_dialogs->show(40910); - else if (_action.isAction(VERB_PEER_THROUGH, 0x181)) + else if (_action.isAction(VERB_PEER_THROUGH, NOUN_VIEWPORT)) _vm->_dialogs->show(40910); - else if (_action.isAction(VERB_LOOK, 0xC4)) + else if (_action.isAction(VERB_LOOK, NOUN_KEYPAD)) _vm->_dialogs->show(40911); - else if (_action.isAction(VERB_INSPECT, 0xC4)) + else if (_action.isAction(VERB_INSPECT, NOUN_KEYPAD)) _vm->_dialogs->show(40911); - else if (_action.isAction(VERB_LOOK, 0x1CC)) + else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY)) _vm->_dialogs->show(40912); - else if (_action.isAction(VERB_LOOK, 0x1D1) || _action.isAction(VERB_LOOK, 0x1D2) - || _action.isAction(VERB_LOOK, 0x1D3) || _action.isAction(VERB_LOOK, 0x1D4) - || _action.isAction(VERB_LOOK, 0x1D5) || _action.isAction(VERB_LOOK, 0x1D6) - || _action.isAction(VERB_LOOK, 0x1D7) || _action.isAction(VERB_LOOK, 0x1D8) - || _action.isAction(VERB_LOOK, 0x1D9) || _action.isAction(VERB_LOOK, 0x1D0) - || _action.isAction(VERB_LOOK, 0x1DB) || _action.isAction(VERB_LOOK, 0x1DA)) + else if (_action.isAction(VERB_LOOK, NOUN_1_KEY) || _action.isAction(VERB_LOOK, NOUN_2_KEY) + || _action.isAction(VERB_LOOK, NOUN_3_KEY) || _action.isAction(VERB_LOOK, NOUN_4_KEY) + || _action.isAction(VERB_LOOK, NOUN_5_KEY) || _action.isAction(VERB_LOOK, NOUN_6_KEY) + || _action.isAction(VERB_LOOK, NOUN_7_KEY) || _action.isAction(VERB_LOOK, NOUN_8_KEY) + || _action.isAction(VERB_LOOK, NOUN_9_KEY) || _action.isAction(VERB_LOOK, NOUN_0_KEY) + || _action.isAction(VERB_LOOK, NOUN_SMILE_KEY) || _action.isAction(VERB_LOOK, NOUN_FROWN_KEY)) _vm->_dialogs->show(40913); - else if (_action.isAction(VERB_LOOK, 0x1CF)) + else if (_action.isAction(VERB_LOOK, NOUN_DEVICE)) _vm->_dialogs->show(40914); else if (_action._lookFlag) _vm->_dialogs->show(40914); @@ -3116,20 +3116,20 @@ void Scene410::preActions() { if (_action.isAction(VERB_TAKE) && !_action.isAction(0x48)) _game._player._needToWalk = false; - if (_action.isAction(VERB_LOOK, 0x48) && _game._objects.isInRoom(OBJ_CHARGE_CASES)) + if (_action.isAction(VERB_LOOK, NOUN_CHARGE_CASES) && _game._objects.isInRoom(OBJ_CHARGE_CASES)) _game._player._needToWalk = true; - if (_action.isAction(VERB_OPEN, 0x278) || _action.isAction(VERB_OPEN, 0x214)) + if (_action.isAction(VERB_OPEN, NOUN_SACKS) || _action.isAction(VERB_OPEN, NOUN_SACK)) _game._player._needToWalk = false; - if (_action.isAction(VERB_LOOK, 0x272)) + if (_action.isAction(VERB_LOOK, NOUN_CAN)) _game._player._needToWalk = true; } void Scene410::actions() { - if (_action.isAction(VERB_WALK_INTO, 0x2B3)) + if (_action.isAction(VERB_WALK_INTO, NOUN_CORRIDOR_TO_SOUTH)) _scene->_nextSceneId = 406; - else if (_action.isAction(VERB_TAKE, 0x48) && (_game._objects.isInRoom(OBJ_CHARGE_CASES) || _game._trigger)) { + else if (_action.isAction(VERB_TAKE, NOUN_CHARGE_CASES) && (_game._objects.isInRoom(OBJ_CHARGE_CASES) || _game._trigger)) { switch (_game._trigger) { case (0): _vm->_sound->command(57); @@ -3162,52 +3162,52 @@ void Scene410::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK, 0x276)) + } else if (_action.isAction(VERB_LOOK, NOUN_BARREL)) _vm->_dialogs->show(41010); - else if (_action.isAction(VERB_TAKE, 0x276)) + else if (_action.isAction(VERB_TAKE, NOUN_BARREL)) _vm->_dialogs->show(41011); - else if (_action.isAction(VERB_OPEN, 0x276)) + else if (_action.isAction(VERB_OPEN, NOUN_BARREL)) _vm->_dialogs->show(41012); - else if (_action.isAction(VERB_LOOK, 0x270)) + else if (_action.isAction(VERB_LOOK, NOUN_RUG)) _vm->_dialogs->show(41013); - else if (_action.isAction(VERB_TAKE, 0x270)) + else if (_action.isAction(VERB_TAKE, NOUN_RUG)) _vm->_dialogs->show(41014); - else if (_action.isAction(VERB_LOOK, 0x265) || _action.isAction(VERB_OPEN, 0x265)) { + else if (_action.isAction(VERB_LOOK, NOUN_CARTON) || _action.isAction(VERB_OPEN, NOUN_CARTON)) { if (_game._objects.isInRoom(OBJ_CHARGE_CASES)) _vm->_dialogs->show(41015); else _vm->_dialogs->show(41016); - } else if (_action.isAction(VERB_LOOK, 0x26E)) + } else if (_action.isAction(VERB_LOOK, NOUN_FLOUR)) _vm->_dialogs->show(41017); - else if (_action.isAction(VERB_TAKE, 0x26E)) + else if (_action.isAction(VERB_TAKE, NOUN_FLOUR)) _vm->_dialogs->show(41018); - else if (_action.isAction(VERB_LOOK, 0x278)) + else if (_action.isAction(VERB_LOOK, NOUN_SACKS)) _vm->_dialogs->show(41019); - else if (_action.isAction(VERB_LOOK, 0x214)) + else if (_action.isAction(VERB_LOOK, NOUN_SACK)) _vm->_dialogs->show(41019); - else if (_action.isAction(VERB_OPEN, 0x278)) + else if (_action.isAction(VERB_OPEN, NOUN_SACKS)) _vm->_dialogs->show(41020); - else if (_action.isAction(VERB_OPEN, 0x214)) + else if (_action.isAction(VERB_OPEN, NOUN_SACK)) _vm->_dialogs->show(41020); - else if (_action.isAction(VERB_LOOK, 0x277)) + else if (_action.isAction(VERB_LOOK, NOUN_BUCKET_OF_TAR)) _vm->_dialogs->show(41021); - else if (_action.isAction(VERB_TAKE, 0x277)) + else if (_action.isAction(VERB_TAKE, NOUN_BUCKET_OF_TAR)) _vm->_dialogs->show(41022); - else if (_action.isAction(VERB_LOOK, 0x272)) + else if (_action.isAction(VERB_LOOK, NOUN_CAN)) _vm->_dialogs->show(41023); - else if (_action.isAction(VERB_TAKE, 0x272)) + else if (_action.isAction(VERB_TAKE, NOUN_CAN)) _vm->_dialogs->show(41024); - else if (_action.isAction(VERB_LOOK, 0x48) && _game._objects.isInRoom(OBJ_CHARGE_CASES)) + else if (_action.isAction(VERB_LOOK, NOUN_CHARGE_CASES) && _game._objects.isInRoom(OBJ_CHARGE_CASES)) _vm->_dialogs->show(41025); - else if (_action.isAction(VERB_LOOK, 0x2C3)) + else if (_action.isAction(VERB_LOOK, NOUN_FENCE)) _vm->_dialogs->show(41027); - else if (_action.isAction(VERB_LOOK, 0x47D)) + else if (_action.isAction(VERB_LOOK, NOUN_SHELVES)) _vm->_dialogs->show(41028); - else if (_action.isAction(VERB_LOOK, 0x275)) + else if (_action.isAction(VERB_LOOK, NOUN_RAT)) _vm->_dialogs->show(41029); - else if (_action.isAction(VERB_TAKE, 0x275)) + else if (_action.isAction(VERB_TAKE, NOUN_RAT)) _vm->_dialogs->show(41030); - else if (_action.isAction(VERB_THROW, 0x275)) + else if (_action.isAction(VERB_THROW, NOUN_RAT)) _vm->_dialogs->show(41031); else if (_action._lookFlag) _vm->_dialogs->show(41033); @@ -3679,21 +3679,21 @@ void Scene411::step() { } void Scene411::preActions() { - if (_action.isAction(VERB_LOOK, 0x2D7) && (_game._objects.isInRoom(OBJ_PETROX))) + if (_action.isAction(VERB_LOOK, NOUN_PETROX) && (_game._objects.isInRoom(OBJ_PETROX))) _game._player._needToWalk = true; - if (_action.isAction(VERB_LOOK, 0x3A9) && (_game._objects.isInRoom(OBJ_LECITHIN))) + if (_action.isAction(VERB_LOOK, NOUN_LECITHIN) && (_game._objects.isInRoom(OBJ_LECITHIN))) _game._player._needToWalk = true; - if (_action.isAction(VERB_LOOK, 0x2D6) && (_game._objects.isInRoom(OBJ_FORMALDEHYDE))) + if (_action.isAction(VERB_LOOK, NOUN_FORMALDEHYDE) && (_game._objects.isInRoom(OBJ_FORMALDEHYDE))) _game._player._needToWalk = true; - if (_action.isAction(VERB_LOOK, 0x3AB) || _action.isAction(VERB_LOOK, 0x30D) || _action.isAction(VERB_LOOK, 0x47F) || - _action.isAction(VERB_LOOK, 0x24D) || _action.isAction(VERB_LOOK, 0x216) || _action.isAction(VERB_PUT, 0x216) || - _action.isAction(VERB_LOOK, 0x284) || _action.isAction(VERB_LOOK, 0x285)) + if (_action.isAction(VERB_LOOK, NOUN_EXPLOSIVES) || _action.isAction(VERB_LOOK, NOUN_KETTLE) || _action.isAction(VERB_LOOK, NOUN_MISHAP) || + _action.isAction(VERB_LOOK, NOUN_ALCOVE) || _action.isAction(VERB_LOOK, NOUN_SINK) || _action.isAction(VERB_PUT, NOUN_SINK) || + _action.isAction(VERB_LOOK, NOUN_EXPERIMENT) || _action.isAction(VERB_LOOK, NOUN_DRAWING_BOARD)) _game._player._needToWalk = true; - if (_action.isAction(VERB_PULL, 0x280) || _action.isAction(VERB_PUSH, 0x280)) + if (_action.isAction(VERB_PULL, NOUN_KNIFE_SWITCH) || _action.isAction(VERB_PUSH, NOUN_KNIFE_SWITCH)) _game._player._needToWalk = false; } @@ -3704,14 +3704,14 @@ void Scene411::actions() { return; } - if (_action.isAction(VERB_WALK_INTO, 0x2B3)) { + if (_action.isAction(VERB_WALK_INTO, NOUN_CORRIDOR_TO_SOUTH)) { _scene->_nextSceneId = 406; _vm->_sound->command(10); _action._inProgress = false; return; } - if ((_globals[kNextIngredient] >= 4) && (_action.isAction(VERB_TAKE, 0x3AB) || _action.isAction(VERB_PUT, 0x48, 0x3AB)) + if ((_globals[kNextIngredient] >= 4) && (_action.isAction(VERB_TAKE, NOUN_EXPLOSIVES) || _action.isAction(VERB_PUT, NOUN_CHARGE_CASES, 0x3AB)) && !_game._objects[OBJ_CHARGE_CASES].getQuality(3) && _game._objects.isInInventory(OBJ_CHARGE_CASES)) { switch (_game._trigger) { @@ -3759,13 +3759,13 @@ void Scene411::actions() { } _action._inProgress = false; return; - } else if (!_game._objects.isInInventory(OBJ_CHARGE_CASES) && _action.isAction(VERB_TAKE, 0x3AB)) { + } else if (!_game._objects.isInInventory(OBJ_CHARGE_CASES) && _action.isAction(VERB_TAKE, NOUN_EXPLOSIVES)) { _vm->_dialogs->show(41143); _action._inProgress = false; return; } - if (_action.isAction(VERB_TAKE, 0x2D7) && (_game._objects.isInRoom(OBJ_PETROX) || _game._trigger)) { + if (_action.isAction(VERB_TAKE, NOUN_PETROX) && (_game._objects.isInRoom(OBJ_PETROX) || _game._trigger)) { switch (_game._trigger) { case (0): _vm->_sound->command(57); @@ -3802,7 +3802,7 @@ void Scene411::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x3A9) && (_game._objects.isInRoom(OBJ_LECITHIN) || _game._trigger)) { + if (_action.isAction(VERB_TAKE, NOUN_LECITHIN) && (_game._objects.isInRoom(OBJ_LECITHIN) || _game._trigger)) { switch (_game._trigger) { case (0): _vm->_sound->command(57); @@ -3838,7 +3838,7 @@ void Scene411::actions() { return; } - if (_action.isAction(VERB_TAKE, 0x2D6) && _game._objects.isInRoom(OBJ_FORMALDEHYDE) && (_game._trigger == 0)) { + if (_action.isAction(VERB_TAKE, NOUN_FORMALDEHYDE) && _game._objects.isInRoom(OBJ_FORMALDEHYDE) && (_game._trigger == 0)) { _vm->_sound->command(57); _game._player._stepEnabled = false; _game._player._visible = false; @@ -3862,7 +3862,7 @@ void Scene411::actions() { if (_game._trigger == 10) _vm->_dialogs->showItem(OBJ_FORMALDEHYDE, 41124); - if (_action.isAction(VERB_PUT, 0x30D)) { + if (_action.isAction(VERB_PUT, NOUN_KETTLE)) { if (_action.isAction(0x2D7) || _action.isAction(0x2D6) || _action.isAction(0x3A9) || _action.isAction(0x306)) { _newIngredient = _game._objects.getIdFromDesc(_action._activeAction._objectNameId); switch (_newIngredient) { @@ -3889,67 +3889,67 @@ void Scene411::actions() { } - if (_action.isAction(VERB_LOOK, 0xE2)) + if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) _vm->_dialogs->show(41110); - else if (_action.isAction(VERB_LOOK, 0x287)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_PURIFIER)) _vm->_dialogs->show(41111); - else if (_action.isAction(VERB_LOOK, 0x27B)) + else if (_action.isAction(VERB_LOOK, NOUN_LAB_EQUIPMENT)) _vm->_dialogs->show(41112); - else if (_action.isAction(VERB_LOOK, 0x280)) + else if (_action.isAction(VERB_LOOK, NOUN_KNIFE_SWITCH)) _vm->_dialogs->show(41113); - else if (_action.isAction(VERB_PUSH, 0x280) || _action.isAction(VERB_PULL, 0x280)) + else if (_action.isAction(VERB_PUSH, NOUN_KNIFE_SWITCH) || _action.isAction(VERB_PULL, NOUN_KNIFE_SWITCH)) _vm->_dialogs->show(41114); - else if (_action.isAction(VERB_LOOK, 0x283)) + else if (_action.isAction(VERB_LOOK, NOUN_TOXIC_WASTE)) _vm->_dialogs->show(41115); - else if (_action.isAction(VERB_TAKE, 0x283)) + else if (_action.isAction(VERB_TAKE, NOUN_TOXIC_WASTE)) _vm->_dialogs->show(41116); - else if (_action.isAction(VERB_LOOK, 0x285)) + else if (_action.isAction(VERB_LOOK, NOUN_DRAWING_BOARD)) _vm->_dialogs->show(41117); - else if (_action.isAction(VERB_LOOK, 0x284)) + else if (_action.isAction(VERB_LOOK, NOUN_EXPERIMENT)) _vm->_dialogs->show(41118); - else if (_action.isAction(VERB_LOOK, 0x2D7) && _game._objects.isInRoom(OBJ_PETROX)) + else if (_action.isAction(VERB_LOOK, NOUN_PETROX) && _game._objects.isInRoom(OBJ_PETROX)) _vm->_dialogs->show(41119); - else if (_action.isAction(VERB_LOOK, 0x24D)) + else if (_action.isAction(VERB_LOOK, NOUN_ALCOVE)) _vm->_dialogs->show(41121); - else if ((_action.isAction(VERB_LOOK, 0x2D6)) && (_game._objects.isInRoom(OBJ_FORMALDEHYDE))) + else if ((_action.isAction(VERB_LOOK, NOUN_FORMALDEHYDE)) && (_game._objects.isInRoom(OBJ_FORMALDEHYDE))) _vm->_dialogs->show(41122); - else if ((_action.isAction(VERB_LOOK, 0x3A9)) && (_game._objects.isInRoom(OBJ_LECITHIN))) + else if ((_action.isAction(VERB_LOOK, NOUN_LECITHIN)) && (_game._objects.isInRoom(OBJ_LECITHIN))) _vm->_dialogs->show(41123); - else if (_action.isAction(VERB_LOOK, 0x30D)) { + else if (_action.isAction(VERB_LOOK, NOUN_KETTLE)) { if (_globals[kNextIngredient] > 0 && !_game._objects[OBJ_CHARGE_CASES].getQuality(3)) { _vm->_dialogs->show(41126); } else if (_globals[kNextIngredient] == 0 || _game._objects[OBJ_CHARGE_CASES].getQuality(3)) { _vm->_dialogs->show(41125); } - } else if (_action.isAction(VERB_LOOK, 0x3AB) && _game._objects[OBJ_CHARGE_CASES].getQuality(3) == 0) { + } else if (_action.isAction(VERB_LOOK, NOUN_EXPLOSIVES) && _game._objects[OBJ_CHARGE_CASES].getQuality(3) == 0) { _vm->_dialogs->show(41127); - } else if (_action.isAction(VERB_TAKE, 0x30D)) + } else if (_action.isAction(VERB_TAKE, NOUN_KETTLE)) _vm->_dialogs->show(41128); - else if (_action.isAction(VERB_LOOK, 0x59)) + else if (_action.isAction(VERB_LOOK, NOUN_CONTROL_PANEL)) _vm->_dialogs->show(41129); - else if (_action.isAction(VERB_LOOK, 0x47F)) + else if (_action.isAction(VERB_LOOK, NOUN_MISHAP)) _vm->_dialogs->show(41130); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(41131); else if (_action._lookFlag) _vm->_dialogs->show(41132); - else if (_action.isAction(VERB_LOOK, 0x27C)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_HORN)) _vm->_dialogs->show(41133); - else if (_action.isAction(VERB_LOOK, 0x218)) + else if (_action.isAction(VERB_LOOK, NOUN_DEBRIS)) _vm->_dialogs->show(41134); - else if (_action.isAction(VERB_LOOK, 0x282)) + else if (_action.isAction(VERB_LOOK, NOUN_HEATER)) _vm->_dialogs->show(41135); - else if (_action.isAction(VERB_LOOK, 0x10C)) + else if (_action.isAction(VERB_LOOK, NOUN_PIPE)) _vm->_dialogs->show(41136); - else if (_action.isAction(VERB_LOOK, 0x216)) + else if (_action.isAction(VERB_LOOK, NOUN_SINK)) _vm->_dialogs->show(41137); - else if (_action.isAction(VERB_PUT, 0x216)) + else if (_action.isAction(VERB_PUT, NOUN_SINK)) _vm->_dialogs->show(41138); - else if (_action.isAction(VERB_TAKE, 0x284)) + else if (_action.isAction(VERB_TAKE, NOUN_EXPERIMENT)) _vm->_dialogs->show(41139); - else if (_action.isAction(VERB_LOOK, 0x47E)) + else if (_action.isAction(VERB_LOOK, NOUN_ELECTRODES)) _vm->_dialogs->show(41140); - else if (_action.isAction(VERB_TAKE, 0x47E)) + else if (_action.isAction(VERB_TAKE, NOUN_ELECTRODES)) _vm->_dialogs->show(41141); else return; @@ -4076,41 +4076,41 @@ void Scene413::step() { } void Scene413::preActions() { - if (_action.isAction(VERB_TAKE) || _action.isAction(VERB_PUT, 0x319)) + if (_action.isAction(VERB_TAKE) || _action.isAction(VERB_PUT, NOUN_CONVEYOR_BELT)) _game._player._needToWalk = false; - if (_action.isAction(VERB_LOOK, 0x2C4) || _action.isAction(VERB_LOOK, 0x1CC) - || _action.isAction(VERB_LOOK, 0x289) || _action.isAction(VERB_LOOK, 0x10E)) { + if (_action.isAction(VERB_LOOK, NOUN_WOODEN_STATUE) || _action.isAction(VERB_LOOK, NOUN_DISPLAY) + || _action.isAction(VERB_LOOK, NOUN_PICTURE) || _action.isAction(VERB_LOOK, NOUN_PLANT)) { _game._player._needToWalk = true; } } void Scene413::actions() { - if (_action.isAction(VERB_WALK_INSIDE, 0x16C)) { + if (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER)) { _game._player._stepEnabled = false; _game._player._visible = false; _scene->_nextSceneId = 409; - } else if (_action.isAction(VERB_WALK_INSIDE, 0x2B3)) + } else if (_action.isAction(VERB_WALK_INSIDE, NOUN_CORRIDOR_TO_SOUTH)) _scene->_nextSceneId = 405; - else if (_action.isAction(VERB_LOOK, 0x2C4)) + else if (_action.isAction(VERB_LOOK, NOUN_WOODEN_STATUE)) _vm->_dialogs->show(41310); - else if (_action.isAction(VERB_TAKE, 0x2C4)) + else if (_action.isAction(VERB_TAKE, NOUN_WOODEN_STATUE)) _vm->_dialogs->show(41311); - else if (_action.isAction(VERB_LOOK, 0x319)) + else if (_action.isAction(VERB_LOOK, NOUN_CONVEYOR_BELT)) _vm->_dialogs->show(41312); - else if (_action.isAction(VERB_PUT, 0x319)) + else if (_action.isAction(VERB_PUT, NOUN_CONVEYOR_BELT)) _vm->_dialogs->show(41313); - else if (_action.isAction(VERB_LOOK, 0x16C)) + else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER)) _vm->_dialogs->show(41314); - else if (_action.isAction(VERB_LOOK, 0x1CC)) + else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY)) _vm->_dialogs->show(41315); - else if (_action.isAction(VERB_LOOK, 0x2B3)) + else if (_action.isAction(VERB_LOOK, NOUN_CORRIDOR_TO_SOUTH)) _vm->_dialogs->show(41316); - else if (_action.isAction(VERB_LOOK, 0x289)) + else if (_action.isAction(VERB_LOOK, NOUN_PICTURE)) _vm->_dialogs->show(41317); - else if (_action.isAction(VERB_LOOK, 0x10E)) + else if (_action.isAction(VERB_LOOK, NOUN_PLANT)) _vm->_dialogs->show(41318); - else if (_action.isAction(VERB_TAKE, 0x10E)) + else if (_action.isAction(VERB_TAKE, NOUN_PLANT)) _vm->_dialogs->show(41319); else if (_action._lookFlag) _vm->_dialogs->show(41320); diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp index ef50e1289e..02dc90dbc3 100644 --- a/engines/mads/nebular/nebular_scenes5.cpp +++ b/engines/mads/nebular/nebular_scenes5.cpp @@ -279,7 +279,7 @@ void Scene501::preActions() { } void Scene501::actions() { - if (_action.isAction(VERB_GET_INTO, 0x324)) { + if (_action.isAction(VERB_GET_INTO, NOUN_CAR)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -326,9 +326,9 @@ void Scene501::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, 0x131, 0x251)) + } else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251)) _vm->_dialogs->show(50113); - else if (_action.isAction(VERB_PUT, 0x305, 0x251)) { + else if (_action.isAction(VERB_PUT, NOUN_FAKE_ID, 0x251)) { switch (_game._trigger) { case 0: case 1: @@ -372,7 +372,7 @@ void Scene501::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, 0xB3, 0x251)) { + } else if (_action.isAction(VERB_PUT, NOUN_ID_CARD, 0x251)) { switch (_game._trigger) { case 0: case 1: @@ -417,34 +417,34 @@ void Scene501::actions() { default: break; } - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x31E)) + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_STREET)) _vm->_dialogs->show(50121); - else if (_action.isAction(VERB_LOOK, 0x6E)) + else if (_action.isAction(VERB_LOOK, NOUN_DOOR)) _vm->_dialogs->show(50110); - else if (_action.isAction(VERB_LOOK, 0x251)) + else if (_action.isAction(VERB_LOOK, NOUN_CARD_SLOT)) _vm->_dialogs->show(50112); - else if (_action.isAction(VERB_LOOK, 0x244)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGN)) _vm->_dialogs->show(50114); - else if (_action.isAction(VERB_TAKE, 0x244)) + else if (_action.isAction(VERB_TAKE, NOUN_SIGN)) _vm->_dialogs->show(50115); - else if (_action.isAction(VERB_LOOK, 0x322)) + else if (_action.isAction(VERB_LOOK, NOUN_SIDEWALK_TO_EAST)) _vm->_dialogs->show(50118); - else if (_action.isAction(VERB_LOOK, 0x361) || _action.isAction(VERB_LOOK, 0x360) - || _action.isAction(VERB_WALK_DOWN, 0x361) || _action.isAction(VERB_WALK_DOWN, 0x360)) + else if (_action.isAction(VERB_LOOK, NOUN_SIDEWALK_TO_WEST) || _action.isAction(VERB_LOOK, NOUN_STREET_TO_WEST) + || _action.isAction(VERB_WALK_DOWN, NOUN_SIDEWALK_TO_WEST) || _action.isAction(VERB_WALK_DOWN, NOUN_STREET_TO_WEST)) _vm->_dialogs->show(50119); - else if (_action.isAction(VERB_LOOK, 0x323)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING)) _vm->_dialogs->show(50120); - else if (_action.isAction(VERB_OPEN, 0x6E)) + else if (_action.isAction(VERB_OPEN, NOUN_DOOR)) _vm->_dialogs->show(50122); - else if (_action.isAction(VERB_LOOK, 0x1E6)) + else if (_action.isAction(VERB_LOOK, NOUN_FIRE_HYDRANT)) _vm->_dialogs->show(50123); - else if (_action.isAction(VERB_OPEN, 0x1E6)) + else if (_action.isAction(VERB_OPEN, NOUN_FIRE_HYDRANT)) _vm->_dialogs->show(50124); - else if (_action.isAction(VERB_LOOK, 0x369)) + else if (_action.isAction(VERB_LOOK, NOUN_EQUIPMENT_OVERHEAD)) _vm->_dialogs->show(50125); - else if (_action.isAction(VERB_LOOK, 0x1FA) || _action.isAction(VERB_LOOK, 0x10C)) + else if (_action.isAction(VERB_LOOK, NOUN_PIPES) || _action.isAction(VERB_LOOK, NOUN_PIPE)) _vm->_dialogs->show(50126); - else if (_action.isAction(VERB_LOOK, 0x324)) { + else if (_action.isAction(VERB_LOOK, NOUN_CAR)) { if (!_game._visitedScenes.exists(504)) _vm->_dialogs->show(50116); else @@ -490,21 +490,21 @@ void Scene502::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(VERB_PEER_THROUGH, 0x181)) + if (_action.isAction(VERB_LOOK, NOUN_VIEWPORT) || _action.isAction(VERB_PEER_THROUGH, NOUN_VIEWPORT)) _vm->_dialogs->show(50210); - else if (_action.isAction(VERB_LOOK, 0xC4)) + else if (_action.isAction(VERB_LOOK, NOUN_KEYPAD)) _vm->_dialogs->show(50211); - else if (_action.isAction(VERB_LOOK, 0x1CC)) + else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY)) _vm->_dialogs->show(50212); - else if (_action.isAction(VERB_LOOK, 0x1D0) || _action.isAction(VERB_LOOK, 0x1D1) - || _action.isAction(VERB_LOOK, 0x1D2) || _action.isAction(VERB_LOOK, 0x1D3) - || _action.isAction(VERB_LOOK, 0x1D4) || _action.isAction(VERB_LOOK, 0x1D5) - || _action.isAction(VERB_LOOK, 0x1D6) || _action.isAction(VERB_LOOK, 0x1D7) - || _action.isAction(VERB_LOOK, 0x1D8) || _action.isAction(VERB_LOOK, 0x1D9) - || _action.isAction(VERB_LOOK, 0x1DB) || _action.isAction(VERB_LOOK, 0x7A) - || _action.isAction(VERB_LOOK, 0x1DA)) + else if (_action.isAction(VERB_LOOK, NOUN_0_KEY) || _action.isAction(VERB_LOOK, NOUN_1_KEY) + || _action.isAction(VERB_LOOK, NOUN_2_KEY) || _action.isAction(VERB_LOOK, NOUN_3_KEY) + || _action.isAction(VERB_LOOK, NOUN_4_KEY) || _action.isAction(VERB_LOOK, NOUN_5_KEY) + || _action.isAction(VERB_LOOK, NOUN_6_KEY) || _action.isAction(VERB_LOOK, NOUN_7_KEY) + || _action.isAction(VERB_LOOK, NOUN_8_KEY) || _action.isAction(VERB_LOOK, NOUN_9_KEY) + || _action.isAction(VERB_LOOK, NOUN_SMILE_KEY) || _action.isAction(VERB_LOOK, NOUN_ENTER_KEY) + || _action.isAction(VERB_LOOK, NOUN_FROWN_KEY)) _vm->_dialogs->show(50213); - else if (_action.isAction(VERB_LOOK, 0x1CF) || _action._lookFlag) + else if (_action.isAction(VERB_LOOK, NOUN_DEVICE) || _action._lookFlag) _vm->_dialogs->show(50214); else return; @@ -544,9 +544,9 @@ void Scene503::enter() { } void Scene503::actions() { - if (_action.isAction(VERB_WALK, 0xF9)) + if (_action.isAction(VERB_WALK, NOUN_OUTSIDE)) _scene->_nextSceneId = 501; - else if (_action.isAction(VERB_TAKE, 0x6A)) { + else if (_action.isAction(VERB_TAKE, NOUN_DETONATORS)) { if ( _game._trigger || !_game._objects.isInInventory(OBJ_DETONATORS)) { switch (_game._trigger) { case 0: @@ -591,42 +591,42 @@ void Scene503::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(50328); - else if (_action.isAction(VERB_LOOK, 0x36F)) + else if (_action.isAction(VERB_LOOK, NOUN_MONITORING_EQUIPMENT)) _vm->_dialogs->show(50310); - else if (_action.isAction(VERB_LOOK, 0x36E)) + else if (_action.isAction(VERB_LOOK, NOUN_PHOTON_RIFLES)) _vm->_dialogs->show(50311); - else if (_action.isAction(VERB_TAKE, 0x36E) || _action.isAction(VERB_TAKE, 0x36C)) + else if (_action.isAction(VERB_TAKE, NOUN_PHOTON_RIFLES) || _action.isAction(VERB_TAKE, NOUN_NUCLEAR_SLINGSHOT)) _vm->_dialogs->show(50312); - else if (_action.isAction(VERB_LOOK, 0x36D)) + else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY_CASE)) _vm->_dialogs->show(50313); - else if (_action.isAction(VERB_LOOK, 0x36C)) + else if (_action.isAction(VERB_LOOK, NOUN_NUCLEAR_SLINGSHOT)) _vm->_dialogs->show(50314); - else if (_action.isAction(VERB_LOOK, 0x331)) + else if (_action.isAction(VERB_LOOK, NOUN_WATER_COOLER)) _vm->_dialogs->show(50315); - else if (_action.isAction(VERB_LOOK, 0x330)) + else if (_action.isAction(VERB_LOOK, NOUN_STORAGE_BOX)) _vm->_dialogs->show(50316); - else if (_action.isAction(VERB_OPEN, 0x330)) + else if (_action.isAction(VERB_OPEN, NOUN_STORAGE_BOX)) _vm->_dialogs->show(50317); - else if (_action.isAction(VERB_LOOK, 0x36B)) + else if (_action.isAction(VERB_LOOK, NOUN_WARNING_LABEL)) _vm->_dialogs->show(50318); - else if (_action.isAction(VERB_LOOK, 0x1E4)) + else if (_action.isAction(VERB_LOOK, NOUN_DESK)) _vm->_dialogs->show(50319); - else if (_action.isAction(VERB_LOOK, 0xE2)) + else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) _vm->_dialogs->show(50320); - else if (_action.isAction(VERB_LOOK, 0x481)) + else if (_action.isAction(VERB_LOOK, NOUN_FILE_CABINETS)) _vm->_dialogs->show(50322); - else if (_action.isAction(VERB_LOOK, 0x332)) { + else if (_action.isAction(VERB_LOOK, NOUN_BOX)) { if (_game._objects.isInRoom(OBJ_DETONATORS)) _vm->_dialogs->show(50323); else _vm->_dialogs->show(50324); - } else if (_action.isAction(VERB_LOOK, 0x6A) && (_action._savedFields._mainObjectSource == 4)) + } else if (_action.isAction(VERB_LOOK, NOUN_DETONATORS) && (_action._savedFields._mainObjectSource == 4)) _vm->_dialogs->show(50325); - else if (_action.isAction(VERB_LOOK, 0x32E)) + else if (_action.isAction(VERB_LOOK, NOUN_WINDOWS)) _vm->_dialogs->show(50327); - else if (_action.isAction(VERB_OPEN, 0x36D)) + else if (_action.isAction(VERB_OPEN, NOUN_DISPLAY_CASE)) _vm->_dialogs->show(50329); - else if (_action.isAction(VERB_THROW, 0x36D) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) + else if (_action.isAction(VERB_THROW, NOUN_DISPLAY_CASE) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) _vm->_dialogs->show(50330); else return; @@ -742,10 +742,10 @@ void Scene504::preActions() { } void Scene504::actions() { - if (_action.isAction(VERB_EXIT_FROM, 0x324)) { + if (_action.isAction(VERB_EXIT_FROM, NOUN_CAR)) { _vm->_sound->command(15); _scene->_nextSceneId = _globals[kHoverCarLocation]; - } else if (_action.isAction(VERB_ACTIVATE, 0x380)) { + } else if (_action.isAction(VERB_ACTIVATE, NOUN_CAR_CONTROLS)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -803,27 +803,27 @@ void Scene504::actions() { default: break; } - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x388)) + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_INTERIOR_OF_CAR)) _vm->_dialogs->show(50412); - else if (_action.isAction(VERB_LOOK, 0x383)) + else if (_action.isAction(VERB_LOOK, NOUN_GLOVE_COMPARTMENT)) _vm->_dialogs->show(50410); - else if (_action.isAction(VERB_LOOK, 0x380) || _action.isAction(VERB_LOOK, 0x387)) + else if (_action.isAction(VERB_LOOK, NOUN_CAR_CONTROLS) || _action.isAction(VERB_LOOK, NOUN_DASHBOARD)) _vm->_dialogs->show(50411); - else if (_action.isAction(VERB_LOOK, 0x381)) + else if (_action.isAction(VERB_LOOK, NOUN_SCENT_PACKET)) _vm->_dialogs->show(50413); - else if (_action.isAction(VERB_LOOK, 0x385)) + else if (_action.isAction(VERB_LOOK, NOUN_SODA_CANS)) _vm->_dialogs->show(50414); - else if (_action.isAction(VERB_LOOK, 0x382)) + else if (_action.isAction(VERB_LOOK, NOUN_KITTY)) _vm->_dialogs->show(50415); - else if (_action.isAction(VERB_LOOK, 0x386) || _action.isAction(VERB_LOOK_THROUGH, 0x386)) + else if (_action.isAction(VERB_LOOK, NOUN_WINDSHIELD) || _action.isAction(VERB_LOOK_THROUGH, NOUN_WINDSHIELD)) _vm->_dialogs->show(50416); - else if (_action.isAction(VERB_LOOK, 0x120)) + else if (_action.isAction(VERB_LOOK, NOUN_REARVIEW_MIRROR)) _vm->_dialogs->show(50417); - else if (_action.isAction(VERB_TAKE, 0x120)) + else if (_action.isAction(VERB_TAKE, NOUN_REARVIEW_MIRROR)) _vm->_dialogs->show(50418); - else if (_action.isAction(VERB_LOOK, 0x384)) + else if (_action.isAction(VERB_LOOK, NOUN_MOLDY_SOCK)) _vm->_dialogs->show(50419); - else if (_action.isAction(VERB_TAKE, 0x384)) + else if (_action.isAction(VERB_TAKE, NOUN_MOLDY_SOCK)) _vm->_dialogs->show(50420); else return; @@ -1073,11 +1073,11 @@ void Scene505::step() { void Scene505::actions() { if (_action.isAction(VERB_PRESS)) _nextButtonId = _action._activeAction._objectNameId; - else if (_action.isAction(VERB_RETURN_TO, 0x38C)) + else if (_action.isAction(VERB_RETURN_TO, NOUN_INSIDE_OF_CAR)) _scene->_nextSceneId = 504; - else if (_action.isAction(VERB_LOOK, 0x180)) + else if (_action.isAction(VERB_LOOK, NOUN_VIEW_SCREEN)) _vm->_dialogs->show(50510); - else if (_action.isAction(VERB_LOOK, 0x59)) + else if (_action.isAction(VERB_LOOK, NOUN_CONTROL_PANEL)) _vm->_dialogs->show(50511); else return; @@ -1186,7 +1186,7 @@ void Scene506::room_506_door_sequences() { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; if (_firstDoorFl) { - if (_action.isAction(VERB_WALK_INTO, 0x336) || ((_scene->_priorSceneId == 507) && !_actionFl)) { + if (_action.isAction(VERB_WALK_INTO, NOUN_SOFTWARE_STORE) || ((_scene->_priorSceneId == 507) && !_actionFl)) { _doorDepth = 13; _doorSpriteIdx = _globals._spriteIndexes[2]; _doorSequenceIdx = _globals._sequenceIndexes[2]; @@ -1266,21 +1266,21 @@ void Scene506::room_506_door_sequences() { } void Scene506::actions() { - if (_action.isAction(VERB_WALK_INTO, 0x37D)) { + if (_action.isAction(VERB_WALK_INTO, NOUN_LABORATORY)) { if (_firstDoorFl) { _heroFacing = FACING_NORTHWEST; _doorPos = Common::Point(16, 111); } _actionFl = true; room_506_door_sequences(); - } else if (_action.isAction(VERB_WALK_INTO, 0x336)) { + } else if (_action.isAction(VERB_WALK_INTO, NOUN_SOFTWARE_STORE)) { if (_firstDoorFl) { _heroFacing = FACING_NORTHWEST; _doorPos = Common::Point(80, 102); } _actionFl = true; room_506_door_sequences(); - } else if (_action.isAction(VERB_GET_INTO, 0x324)) { + } else if (_action.isAction(VERB_GET_INTO, NOUN_CAR)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1317,29 +1317,29 @@ void Scene506::actions() { default: break; } - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x31E)) + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_STREET)) _vm->_dialogs->show(50618); - else if (_action.isAction(VERB_LOOK, 0x372)) + else if (_action.isAction(VERB_LOOK, NOUN_RESTAURANT)) _vm->_dialogs->show(50610); - else if (_action.isAction(VERB_LOOK, 0x371)) + else if (_action.isAction(VERB_LOOK, NOUN_MOTEL)) _vm->_dialogs->show(50611); - else if (_action.isAction(VERB_LOOK, 0x482)) + else if (_action.isAction(VERB_LOOK, NOUN_CYCLE_SHOP)) _vm->_dialogs->show(50612); - else if (_action.isAction(VERB_LOOK, 0x483)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_BIKE)) _vm->_dialogs->show(50613); - else if (_action.isAction(VERB_TAKE, 0x483)) + else if (_action.isAction(VERB_TAKE, NOUN_AIR_BIKE)) _vm->_dialogs->show(50614); - else if (_action.isAction(VERB_LOOK, 0x336)) + else if (_action.isAction(VERB_LOOK, NOUN_SOFTWARE_STORE)) _vm->_dialogs->show(50615); - else if (_action.isAction(VERB_LOOK, 0x37D)) + else if (_action.isAction(VERB_LOOK, NOUN_LABORATORY)) _vm->_dialogs->show(50616); - else if (_action.isAction(VERB_LOOK, 0x360) || _action.isAction(VERB_WALK_DOWN, 0x360)) + else if (_action.isAction(VERB_LOOK, NOUN_STREET_TO_WEST) || _action.isAction(VERB_WALK_DOWN, NOUN_STREET_TO_WEST)) _vm->_dialogs->show(50617); - else if (_action.isAction(VERB_LOOK, 0x373)) + else if (_action.isAction(VERB_LOOK, NOUN_SOFTWARE_STORE_SIGN)) _vm->_dialogs->show(50619); - else if (_action.isAction(VERB_LOOK, 0x324)) + else if (_action.isAction(VERB_LOOK, NOUN_CAR)) _vm->_dialogs->show(50620); - else if (_action.isAction(VERB_LOOK, 0x142)) + else if (_action.isAction(VERB_LOOK, NOUN_SKY)) _vm->_dialogs->show(50621); else return; @@ -1374,9 +1374,9 @@ void Scene507::enter() { sceneEntrySound(); } void Scene507::actions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x378)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_ENTRANCE)) _scene->_nextSceneId = 506; - else if (_action.isAction(VERB_TAKE, 0x106)) { + else if (_action.isAction(VERB_TAKE, NOUN_PENLIGHT)) { if (_game._trigger || !_game._objects.isInInventory(OBJ_PENLIGHT)) { switch (_game._trigger) { case 0: @@ -1409,48 +1409,48 @@ void Scene507::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(50722); - else if (_action.isAction(VERB_LOOK, 0x299)) + else if (_action.isAction(VERB_LOOK, NOUN_SWIRLING_LIGHT)) _vm->_dialogs->show(50710); - else if (_action.isAction(VERB_TAKE, 0x299)) + else if (_action.isAction(VERB_TAKE, NOUN_SWIRLING_LIGHT)) _vm->_dialogs->show(50711); - else if (_action.isAction(VERB_LOOK, 0x376)) + else if (_action.isAction(VERB_LOOK, NOUN_OLD_SOFTWARE)) _vm->_dialogs->show(50712); - else if (_action.isAction(VERB_TAKE, 0x376)) + else if (_action.isAction(VERB_TAKE, NOUN_OLD_SOFTWARE)) _vm->_dialogs->show(50713); - else if (_action.isAction(VERB_LOOK, 0x375)) + else if (_action.isAction(VERB_LOOK, NOUN_ADVERTISEMENT)) _vm->_dialogs->show(50714); - else if (_action.isAction(VERB_LOOK, 0x374)) + else if (_action.isAction(VERB_LOOK, NOUN_ADVERTISING_POSTER)) _vm->_dialogs->show(50715); - else if (_action.isAction(VERB_LOOK, 0x244)) { + else if (_action.isAction(VERB_LOOK, NOUN_SIGN)) { if (_scene->_customDest.x < 100) _vm->_dialogs->show(50726); else _vm->_dialogs->show(50716); - } else if (_action.isAction(VERB_LOOK, 0x2A7)) + } else if (_action.isAction(VERB_LOOK, NOUN_HOTTEST_SOFTWARE)) _vm->_dialogs->show(50717); - else if (_action.isAction(VERB_LOOK, 0x2A6)) + else if (_action.isAction(VERB_LOOK, NOUN_SOFTWARE_SHELF)) _vm->_dialogs->show(50718); - else if (_action.isAction(VERB_LOOK, 0x2A0)) + else if (_action.isAction(VERB_LOOK, NOUN_SENSOR)) _vm->_dialogs->show(50719); - else if (_action.isAction(VERB_LOOK, 0x377)) + else if (_action.isAction(VERB_LOOK, NOUN_CASH_REGISTER)) _vm->_dialogs->show(50720); - else if (_action.isAction(VERB_LOOK, 0xFE)) + else if (_action.isAction(VERB_LOOK, NOUN_PAD_OF_PAPER)) _vm->_dialogs->show(50721); - else if (_action.isAction(VERB_OPEN, 0x377)) + else if (_action.isAction(VERB_OPEN, NOUN_CASH_REGISTER)) _vm->_dialogs->show(50723); - else if (_action.isAction(VERB_LOOK, 0x28E)) + else if (_action.isAction(VERB_LOOK, NOUN_BARGAIN_VAT)) _vm->_dialogs->show(50724); - else if (_action.isAction(VERB_LOOK, 0x197)) + else if (_action.isAction(VERB_LOOK, NOUN_WINDOW)) _vm->_dialogs->show(50725); - else if (_action.isAction(VERB_LOOK, 0x29F)) { + else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) { if (_game._objects.isInRoom(OBJ_PENLIGHT)) _vm->_dialogs->show(50728); else _vm->_dialogs->show(50727); - } else if (_action.isAction(VERB_LOOK, 0x106) && !_game._objects.isInInventory(OBJ_PENLIGHT)) { + } else if (_action.isAction(VERB_LOOK, NOUN_PENLIGHT) && !_game._objects.isInInventory(OBJ_PENLIGHT)) { if (_game._objects.isInRoom(OBJ_PENLIGHT)) _vm->_dialogs->show(50729); - } else if (_action.isAction(VERB_LOOK, 0x484)) + } else if (_action.isAction(VERB_LOOK, NOUN_EMERGENCY_LIGHT)) _vm->_dialogs->show(50731); else return; @@ -1528,7 +1528,7 @@ void Scene508::enter() { } void Scene508::preActions() { - if (_action.isAction(VERB_WALK, 0xF9)) + if (_action.isAction(VERB_WALK, NOUN_OUTSIDE)) _game._player._walkOffScreenSceneId = 506; } @@ -1586,7 +1586,7 @@ void Scene508::handlePedestral() { } void Scene508::actions() { - if (_action.isAction(VERB_PULL, 0x2AC)) { + if (_action.isAction(VERB_PULL, NOUN_LEVER)) { if (!_globals[kLaserOn]) { switch (_game._trigger) { case 0: @@ -1651,60 +1651,60 @@ void Scene508::actions() { } else { _vm->_dialogs->show(50837); } - } else if (_action.isAction(VERB_REFLECT, 0x120, 0x343) || _action.isAction(VERB_PUT, 0x120, 0x344) || _action.isAction(VERB_PUT, 0x120, 0x343)) { + } else if (_action.isAction(VERB_REFLECT, 0x120, 0x343) || _action.isAction(VERB_PUT, NOUN_REARVIEW_MIRROR, 0x344) || _action.isAction(VERB_PUT, NOUN_REARVIEW_MIRROR, 0x343)) { _chosenObject = 1; handlePedestral(); - } else if (_action.isAction(VERB_PUT, 0x57, 0x344) || _action.isAction(VERB_PUT, 0x57, 0x343) || _action.isAction(VERB_REFLECT, 0x57, 0x343)) { + } else if (_action.isAction(VERB_PUT, NOUN_COMPACT_CASE, 0x344) || _action.isAction(VERB_PUT, NOUN_COMPACT_CASE, 0x343) || _action.isAction(VERB_REFLECT, 0x57, 0x343)) { _chosenObject = 2; handlePedestral(); } else if (_action._lookFlag) _vm->_dialogs->show(50822); - else if (_action.isAction(VERB_LOOK, 0x485)) + else if (_action.isAction(VERB_LOOK, NOUN_TARGET_AREA)) _vm->_dialogs->show(50810); - else if (_action.isAction(VERB_LOOK, 0x364)) + else if (_action.isAction(VERB_LOOK, NOUN_SPINACH_PATCH_DOLL)) _vm->_dialogs->show(50811); - else if (_action.isAction(VERB_TAKE, 0x364)) + else if (_action.isAction(VERB_TAKE, NOUN_SPINACH_PATCH_DOLL)) _vm->_dialogs->show(50812); - else if (_action.isAction(VERB_LOOK, 0x37A)) + else if (_action.isAction(VERB_LOOK, NOUN_SAND_BAGS)) _vm->_dialogs->show(50816); - else if (_action.isAction(VERB_TAKE, 0x37A)) + else if (_action.isAction(VERB_TAKE, NOUN_SAND_BAGS)) _vm->_dialogs->show(50817); - else if (_action.isAction(VERB_LOOK, 0x2AF)) + else if (_action.isAction(VERB_LOOK, NOUN_CONTROL_STATION)) _vm->_dialogs->show(50818); - else if (_action.isAction(VERB_LOOK, 0xE2)) { + else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) { if (_globals[kLaserOn]) _vm->_dialogs->show(50820); else _vm->_dialogs->show(50819); - } else if (_action.isAction(VERB_LOOK, 0x379)) { + } else if (_action.isAction(VERB_LOOK, NOUN_LASER_CANNON)) { if (_globals[kLaserOn]) _vm->_dialogs->show(50822); else _vm->_dialogs->show(50821); - } else if (_action.isAction(VERB_TAKE, 0x379)) + } else if (_action.isAction(VERB_TAKE, NOUN_LASER_CANNON)) _vm->_dialogs->show(50823); - else if (_action.isAction(VERB_LOOK, 0x2AC)) { + else if (_action.isAction(VERB_LOOK, NOUN_LEVER)) { if (_globals[kLaserOn]) _vm->_dialogs->show(50825); else _vm->_dialogs->show(50824); - } else if (_action.isAction(VERB_PUSH, 0x2AC)) + } else if (_action.isAction(VERB_PUSH, NOUN_LEVER)) _vm->_dialogs->show(50826); - else if (_action.isAction(VERB_LOOK, 0x343)) { + else if (_action.isAction(VERB_LOOK, NOUN_LASER_BEAM)) { if (_globals[kLaserHoleIsThere]) _vm->_dialogs->show(50828); else _vm->_dialogs->show(50827); - } else if (_action.isAction(VERB_TAKE, 0x343)) + } else if (_action.isAction(VERB_TAKE, NOUN_LASER_BEAM)) _vm->_dialogs->show(50829); - else if (_action.isAction(VERB_LOOK, 0x46)) { + else if (_action.isAction(VERB_LOOK, NOUN_CEILING)) { if (_globals[kLaserHoleIsThere]) _vm->_dialogs->show(50831); else _vm->_dialogs->show(50830); - } else if (_action.isAction(VERB_LOOK, 0x18D)) + } else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(50832); - else if (_action.isAction(VERB_LOOK, 0x344)) { + else if (_action.isAction(VERB_LOOK, NOUN_PEDESTAL)) { if (!_globals[kLaserOn]) _vm->_dialogs->show(50813); else if (!_globals[kLaserHoleIsThere]) @@ -1882,9 +1882,9 @@ void Scene511::preActions() { } void Scene511::actions() { - if (_action.isAction(VERB_WALK_INTO, 0x372)) + if (_action.isAction(VERB_WALK_INTO, NOUN_RESTAURANT)) _scene->_nextSceneId = 512; - else if (_action.isAction(VERB_GET_INTO, 0x324)) { + else if (_action.isAction(VERB_GET_INTO, NOUN_CAR)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1922,7 +1922,7 @@ void Scene511::actions() { default: break; } - } else if (_action.isAction(VERB_TAKE, 0x87)) { + } else if (_action.isAction(VERB_TAKE, NOUN_FISHING_LINE)) { if (!_globals[kBoatRaised]) { if (_globals[kLineStatus] == 2) { if (_globals[kLineStatus] != 3) { @@ -1983,7 +1983,7 @@ void Scene511::actions() { } } } - } else if (_action.isAction(VERB_LOOK, 0x31E) || _action._lookFlag) { + } else if (_action.isAction(VERB_LOOK, NOUN_STREET) || _action._lookFlag) { if (_globals[kLineStatus] == 2) _vm->_dialogs->show(51110); else { @@ -1992,17 +1992,17 @@ void Scene511::actions() { else _vm->_dialogs->show(51112); } - } else if (_action.isAction(VERB_LOOK, 0x324)) + } else if (_action.isAction(VERB_LOOK, NOUN_CAR)) _vm->_dialogs->show(51113); - else if (_action.isAction(VERB_LOOK, 0x31D)) + else if (_action.isAction(VERB_LOOK, NOUN_SIDEWALK)) _vm->_dialogs->show(51114); - else if (_action.isAction(VERB_WALK_DOWN, 0x322) || _action.isAction(VERB_WALK_DOWN, 0x361) || _action.isAction(VERB_WALK_DOWN, 0x321)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_SIDEWALK_TO_EAST) || _action.isAction(VERB_WALK_DOWN, NOUN_SIDEWALK_TO_WEST) || _action.isAction(VERB_WALK_DOWN, NOUN_STREET_TO_EAST)) _vm->_dialogs->show(51115); - else if (_action.isAction(VERB_LOOK, 0x37B)) + else if (_action.isAction(VERB_LOOK, NOUN_PLEASURE_DOME)) _vm->_dialogs->show(51116); - else if (_action.isAction(VERB_LOOK, 0x34A)) + else if (_action.isAction(VERB_LOOK, NOUN_TICKET_BOOTH)) _vm->_dialogs->show(51117); - else if (_action.isAction(VERB_LOOK, 0x37C)) + 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)) _vm->_dialogs->show(51119); @@ -2010,27 +2010,27 @@ void Scene511::actions() { && (_action.isAction(0x171) || _action.isAction(0x2A) || _action.isAction(0x2B)) && _action.isAction(0x37C)) _vm->_dialogs->show(51120); - else if (_action.isAction(VERB_LOOK, 0x372)) { + else if (_action.isAction(VERB_LOOK, NOUN_RESTAURANT)) { if (_globals[kBoatRaised]) _vm->_dialogs->show(51121); else _vm->_dialogs->show(51128); - } else if (_action.isAction(VERB_LOOK, 0x349)) + } else if (_action.isAction(VERB_LOOK, NOUN_PORTHOLE)) _vm->_dialogs->show(51122); - else if (_action.isAction(VERB_LOOK, 0x87) && (_action._mainObjectSource == 4) && (_globals[kLineStatus] == 2)) + else if (_action.isAction(VERB_LOOK, NOUN_FISHING_LINE) && (_action._mainObjectSource == 4) && (_globals[kLineStatus] == 2)) _vm->_dialogs->show(51126); - else if (_action.isAction(VERB_LOOK, 0x87) && (_action._mainObjectSource == 4) && (_globals[kLineStatus] == 3)) + else if (_action.isAction(VERB_LOOK, NOUN_FISHING_LINE) && (_action._mainObjectSource == 4) && (_globals[kLineStatus] == 3)) _vm->_dialogs->show(51133); - else if (_action.isAction(VERB_LOOK, 0x2CD)) + else if (_action.isAction(VERB_LOOK, NOUN_STATUE)) _vm->_dialogs->show(51127); - else if (_action.isAction(VERB_LOOK, 0x345)) + else if (_action.isAction(VERB_LOOK, NOUN_BOAT)) if (_globals[kBoatRaised]) _vm->_dialogs->show(51123); else if (_globals[kLineStatus] != 3) _vm->_dialogs->show(51124); else _vm->_dialogs->show(51125); - else if (_action.isAction(VERB_LOOK, 0x87) && (_globals[kLineStatus] == 3)) + else if (_action.isAction(VERB_LOOK, NOUN_FISHING_LINE) && (_globals[kLineStatus] == 3)) _vm->_dialogs->show(51125); else return; @@ -2102,9 +2102,9 @@ void Scene512::enter() { } void Scene512::actions() { - if (_action.isAction(VERB_WALK, 0xF9)) + if (_action.isAction(VERB_WALK, NOUN_OUTSIDE)) _scene->_nextSceneId = 511; - else if (_action.isAction(VERB_TAKE, 0x88)) { + else if (_action.isAction(VERB_TAKE, NOUN_FISHING_ROD)) { if (_game._trigger || !_game._objects.isInInventory(OBJ_FISHING_ROD)) { switch (_game._trigger) { case 0: @@ -2134,7 +2134,7 @@ void Scene512::actions() { break; } } - } else if (_action.isAction(VERB_OPEN, 0x377)) { + } else if (_action.isAction(VERB_OPEN, NOUN_CASH_REGISTER)) { if (!_globals[kRegisterOpen]) { switch (_game._trigger) { case 0: @@ -2195,7 +2195,7 @@ void Scene512::actions() { } } else _vm->_dialogs->show(51239); - } else if (_action.isAction(VERB_CLOSE, 0x377) && _globals[kRegisterOpen]) { + } else if (_action.isAction(VERB_CLOSE, NOUN_CASH_REGISTER) && _globals[kRegisterOpen]) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2231,7 +2231,7 @@ void Scene512::actions() { default: break; } - } else if (_action.isAction(VERB_TAKE, 0xFF)) { + } else if (_action.isAction(VERB_TAKE, NOUN_PADLOCK_KEY)) { if (_game._trigger || !_game._objects.isInInventory(OBJ_PADLOCK_KEY)) { switch (_game._trigger) { case 0: @@ -2278,48 +2278,48 @@ void Scene512::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(51225); - else if (_action.isAction(VERB_LOOK, 0xFF) && _game._objects.isInRoom(OBJ_PADLOCK_KEY)) + else if (_action.isAction(VERB_LOOK, NOUN_PADLOCK_KEY) && _game._objects.isInRoom(OBJ_PADLOCK_KEY)) _vm->_dialogs->show(51215); - else if (_action.isAction(VERB_LOOK, 0x88) && (_scene->_activeAnimation->getCurrentFrame() == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_FISHING_ROD) && (_scene->_activeAnimation->getCurrentFrame() == 4)) _vm->_dialogs->show(51216); - else if (_action.isAction(VERB_LOOK, 0x354)) + else if (_action.isAction(VERB_LOOK, NOUN_SHIPS_WHEEL)) _vm->_dialogs->show(51218); - else if (_action.isAction(VERB_TAKE, 0x354)) + else if (_action.isAction(VERB_TAKE, NOUN_SHIPS_WHEEL)) _vm->_dialogs->show(51219); - else if (_action.isAction(VERB_LOOK, 0x349) || _action.isAction(VERB_PEER_THROUGH, 0x349)) + else if (_action.isAction(VERB_LOOK, NOUN_PORTHOLE) || _action.isAction(VERB_PEER_THROUGH, NOUN_PORTHOLE)) _vm->_dialogs->show(51220); - else if (_action.isAction(VERB_LOOK, 0x160)) + else if (_action.isAction(VERB_LOOK, NOUN_TABLE)) _vm->_dialogs->show(51221); - else if (_action.isAction(VERB_LOOK, 0x34E)) + else if (_action.isAction(VERB_LOOK, NOUN_STARFISH)) _vm->_dialogs->show(51222); - else if (_action.isAction(VERB_TAKE, 0x34E)) + else if (_action.isAction(VERB_TAKE, NOUN_STARFISH)) _vm->_dialogs->show(51223); - else if (_action.isAction(VERB_LOOK, 0xF9)) + else if (_action.isAction(VERB_LOOK, NOUN_OUTSIDE)) _vm->_dialogs->show(51224); - else if (_action.isAction(VERB_LOOK, 0x117)) + else if (_action.isAction(VERB_LOOK, NOUN_POSTER)) _vm->_dialogs->show(51227); - else if (_action.isAction(VERB_TAKE, 0x117)) + else if (_action.isAction(VERB_TAKE, NOUN_POSTER)) _vm->_dialogs->show(51228); - else if (_action.isAction(VERB_LOOK, 0x1BB)) { + else if (_action.isAction(VERB_LOOK, NOUN_TROPHY)) { if (_game._visitedScenes.exists(604)) _vm->_dialogs->show(51229); else _vm->_dialogs->show(51230); - } if (_action.isAction(VERB_LOOK, 0x47)) + } if (_action.isAction(VERB_LOOK, NOUN_CHAIR)) _vm->_dialogs->show(51231); - else if (_action.isAction(VERB_LOOK, 0x347)) + else if (_action.isAction(VERB_LOOK, NOUN_ROPE)) _vm->_dialogs->show(51232); - else if (_action.isAction(VERB_TAKE, 0x347)) + else if (_action.isAction(VERB_TAKE, NOUN_ROPE)) _vm->_dialogs->show(51233); - else if (_action.isAction(VERB_LOOK, 0x2F6)) + else if (_action.isAction(VERB_LOOK, NOUN_LAMP)) _vm->_dialogs->show(51234); - else if (_action.isAction(VERB_LOOK, 0x29F)) + else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) _vm->_dialogs->show(51235); - else if (_action.isAction(VERB_LOOK, 0x486)) + else if (_action.isAction(VERB_LOOK, NOUN_ICE_CHESTS)) _vm->_dialogs->show(51237); - else if (_action.isAction(VERB_OPEN, 0x486)) + else if (_action.isAction(VERB_OPEN, NOUN_ICE_CHESTS)) _vm->_dialogs->show(51238); - else if (_action.isAction(VERB_LOOK, 0x377)) { + else if (_action.isAction(VERB_LOOK, NOUN_CASH_REGISTER)) { if (!_globals[kRegisterOpen]) _vm->_dialogs->show(51212); else if (_game._objects.isInRoom(OBJ_PADLOCK_KEY)) @@ -2436,7 +2436,7 @@ void Scene513::step() { } void Scene513::actions() { - if (_action.isAction(VERB_GET_INTO, 0x324)) { + if (_action.isAction(VERB_GET_INTO, NOUN_CAR)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2474,7 +2474,7 @@ void Scene513::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, 0xB3, 0x251) || _action.isAction(VERB_PUT, 0x305, 0x251)) { + } else if (_action.isAction(VERB_PUT, NOUN_ID_CARD, 0x251) || _action.isAction(VERB_PUT, NOUN_FAKE_ID, 0x251)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2523,31 +2523,31 @@ void Scene513::actions() { default: break; } - } else if ((_action._lookFlag) || _action.isAction(VERB_LOOK, 0x31E)) + } else if ((_action._lookFlag) || _action.isAction(VERB_LOOK, NOUN_STREET)) _vm->_dialogs->show(51318); - else if (_action.isAction(VERB_LOOK, 0x317)) + else if (_action.isAction(VERB_LOOK, NOUN_ELEVATOR)) _vm->_dialogs->show(51310); - else if (_action.isAction(VERB_LOOK, 0x367)) + else if (_action.isAction(VERB_LOOK, NOUN_ELEVATOR_DOOR)) _vm->_dialogs->show(51311); - else if (_action.isAction(VERB_LOOK, 0x251)) + else if (_action.isAction(VERB_LOOK, NOUN_CARD_SLOT)) _vm->_dialogs->show(51312); - else if (_action.isAction(VERB_LOOK, 0x355)) + else if (_action.isAction(VERB_LOOK, NOUN_HANDICAP_SIGN)) _vm->_dialogs->show(51313); - else if (_action.isAction(VERB_LOOK, 0x358)) + else if (_action.isAction(VERB_LOOK, NOUN_BIKE_RACK)) _vm->_dialogs->show(51314); - else if (_action.isAction(VERB_LOOK, 0x323)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING)) _vm->_dialogs->show(51315); - else if (_action.isAction(VERB_LOOK, 0x244)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGN)) _vm->_dialogs->show(51316); - else if (_action.isAction(VERB_LOOK, 0x360) || _action.isAction(VERB_WALK_DOWN, 0x360)) + else if (_action.isAction(VERB_LOOK, NOUN_STREET_TO_WEST) || _action.isAction(VERB_WALK_DOWN, NOUN_STREET_TO_WEST)) _vm->_dialogs->show(51317); - else if (_action.isAction(VERB_OPEN, 0x367) || _action.isAction(VERB_OPEN, 0x317)) + else if (_action.isAction(VERB_OPEN, NOUN_ELEVATOR_DOOR) || _action.isAction(VERB_OPEN, NOUN_ELEVATOR)) _vm->_dialogs->show(51319); - else if (_action.isAction(VERB_LOOK, 0x324)) + else if (_action.isAction(VERB_LOOK, NOUN_CAR)) _vm->_dialogs->show(51321); - else if (_action.isAction(VERB_LOOK, 0x357)) + else if (_action.isAction(VERB_LOOK, NOUN_BRICK_WALL)) _vm->_dialogs->show(51322); - else if (_action.isAction(VERB_PUT, 0x131, 0x251)) + else if (_action.isAction(VERB_PUT, NOUN_SECURITY_CARD, 0x251)) _vm->_dialogs->show(51320); else return; @@ -2686,32 +2686,32 @@ void Scene551::preActions() { } void Scene551::actions() { - if (_action.isAction(VERB_STEP_INTO, 0x16C)) + if (_action.isAction(VERB_STEP_INTO, NOUN_TELEPORTER)) _scene->_nextSceneId = 502; else if ((_action._lookFlag)) _vm->_dialogs->show(55117); - else if (_action.isAction(VERB_LOOK, 0x35E)) + else if (_action.isAction(VERB_LOOK, NOUN_SKELETON)) _vm->_dialogs->show(55110); - else if (_action.isAction(VERB_LOOK, 0x318)) + else if (_action.isAction(VERB_LOOK, NOUN_ELEVATOR_SHAFT)) _vm->_dialogs->show(55111); - else if (_action.isAction(VERB_WALKTO, 0x318)) + else if (_action.isAction(VERB_WALKTO, NOUN_ELEVATOR_SHAFT)) _vm->_dialogs->show(55112); - else if (_action.isAction(VERB_LOOK, 0x323)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING)) _vm->_dialogs->show(55113); - else if (_action.isAction(VERB_LOOK, 0x16C)) + else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER)) _vm->_dialogs->show(55114); - else if (_action.isAction(VERB_LOOK, 0x323)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING)) _vm->_dialogs->show(55115); - else if (_action.isAction(VERB_LOOK, 0x361)) { + else if (_action.isAction(VERB_LOOK, NOUN_SIDEWALK_TO_WEST)) { if (_game._visitedScenes.exists(505)) _vm->_dialogs->show(55116); else _vm->_dialogs->show(55115); - } else if (_action.isAction(VERB_LOOK, 0x31D)) + } else if (_action.isAction(VERB_LOOK, NOUN_SIDEWALK)) _vm->_dialogs->show(55118); - else if (_action.isAction(VERB_LOOK, 0x369)) + else if (_action.isAction(VERB_LOOK, NOUN_EQUIPMENT_OVERHEAD)) _vm->_dialogs->show(55119); - else if (_action.isAction(VERB_LOOK, 0x249)) + else if (_action.isAction(VERB_LOOK, NOUN_RAILING)) _vm->_dialogs->show(55120); else return; diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp index a8f9ac159c..acadb820b4 100644 --- a/engines/mads/nebular/nebular_scenes6.cpp +++ b/engines/mads/nebular/nebular_scenes6.cpp @@ -147,7 +147,7 @@ void Scene601::step() { } void Scene601::actions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x378)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_ENTRANCE)) _scene->_nextSceneId = 602; else if (_action.isAction(0x325, 0x324)) { switch (_game._trigger) { @@ -186,28 +186,28 @@ void Scene601::actions() { default: break; } - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x31E)) { + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_STREET)) { if (!_globals[kLaserHoleIsThere]) _vm->_dialogs->show(60110); else _vm->_dialogs->show(60111); - } else if (_action.isAction(VERB_LOOK, 0x324)) + } else if (_action.isAction(VERB_LOOK, NOUN_CAR)) _vm->_dialogs->show(60112); - else if (_action.isAction(VERB_LOOK, 0x32C)) + else if (_action.isAction(VERB_LOOK, NOUN_PAPERS)) _vm->_dialogs->show(60113); - else if (_action.isAction(VERB_LOOK, 0x323)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING)) _vm->_dialogs->show(60114); - else if (_action.isAction(VERB_WALK_DOWN, 0x31E)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_STREET)) _vm->_dialogs->show(60115); - else if (_action.isAction(VERB_LOOK, 0x48E)) + else if (_action.isAction(VERB_LOOK, NOUN_BALCONY)) _vm->_dialogs->show(60116); - else if (_action.isAction(VERB_LOOK, 0x378)) + else if (_action.isAction(VERB_LOOK, NOUN_ENTRANCE)) _vm->_dialogs->show(60117); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(60118); - else if (_action.isAction(VERB_LOOK, 0x38F)) + else if (_action.isAction(VERB_LOOK, NOUN_CITY)) _vm->_dialogs->show(60119); - else if (_action.isAction(VERB_LOOK, 0x3C4)) + else if (_action.isAction(VERB_LOOK, NOUN_FOUNTAIN)) _vm->_dialogs->show(60120); else return; @@ -383,15 +383,15 @@ void Scene602::handleSafeActions() { } void Scene602::actions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x1F9)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_HALLWAY)) _scene->_nextSceneId = 601; - else if (_action.isAction(VERB_WALK_THROUGH, 0x70)) + else if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY)) _scene->_nextSceneId = 603; - else if (_action.isAction(VERB_OPEN, 0x3D3) && ((_globals[kSafeStatus] == 0) || (_globals[kSafeStatus] == 2))) { + else if (_action.isAction(VERB_OPEN, NOUN_SAFE) && ((_globals[kSafeStatus] == 0) || (_globals[kSafeStatus] == 2))) { _safeMode = 1; _cycleIndex = -2; handleSafeActions(); - } else if (_action.isAction(VERB_CLOSE, 0x3D3) && ((_globals[kSafeStatus] == 1) || (_globals[kSafeStatus] == 3))) { + } else if (_action.isAction(VERB_CLOSE, NOUN_SAFE) && ((_globals[kSafeStatus] == 1) || (_globals[kSafeStatus] == 3))) { _safeMode = 2; _cycleIndex = -1; handleSafeActions(); @@ -401,7 +401,7 @@ void Scene602::actions() { _cycleIndex = -2; handleSafeActions(); } - } else if ((_action.isAction(VERB_PUT, 0x120, 0x343) || _action.isAction(VERB_PUT, 0x57, 0x343) + } else if ((_action.isAction(VERB_PUT, NOUN_REARVIEW_MIRROR, 0x343) || _action.isAction(VERB_PUT, NOUN_COMPACT_CASE, 0x343) || _action.isAction(VERB_REFLECT, 0x57, 0x343) || _action.isAction(VERB_REFLECT, 0x120, 0x343)) && (_globals[kSafeStatus] == 0)) { switch (_game._trigger) { case 0: @@ -439,7 +439,7 @@ void Scene602::actions() { default: break; } - } else if (_action.isAction(VERB_TAKE, 0x6F) && (_game._trigger || _game._objects.isInRoom(OBJ_DOOR_KEY))) { + } else if (_action.isAction(VERB_TAKE, NOUN_DOOR_KEY) && (_game._trigger || _game._objects.isInRoom(OBJ_DOOR_KEY))) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -470,29 +470,29 @@ void Scene602::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(60210); - else if (_action.isAction(VERB_LOOK, 0x89)) + else if (_action.isAction(VERB_LOOK, NOUN_FLOOR)) _vm->_dialogs->show(60211); - else if (_action.isAction(VERB_LOOK, 0x1F9)) + else if (_action.isAction(VERB_LOOK, NOUN_HALLWAY)) _vm->_dialogs->show(60212); - else if (_action.isAction(VERB_LOOK, 0x160)) + else if (_action.isAction(VERB_LOOK, NOUN_TABLE)) _vm->_dialogs->show(60213); - else if (_action.isAction(VERB_LOOK, 0x47) || _action.isAction(VERB_LOOK, 0x3CA)) + else if (_action.isAction(VERB_LOOK, NOUN_CHAIR) || _action.isAction(VERB_LOOK, NOUN_LOUNGE_CHAIR)) _vm->_dialogs->show(60214); - else if (_action.isAction(VERB_LOOK, 0x492)) + else if (_action.isAction(VERB_LOOK, NOUN_NEON_LIGHTS)) _vm->_dialogs->show(60215); - else if (_action.isAction(VERB_LOOK, 0x3D8)) + else if (_action.isAction(VERB_LOOK, NOUN_FIREPLACE)) _vm->_dialogs->show(60216); - else if (_action.isAction(VERB_LOOK, 0x289)) + else if (_action.isAction(VERB_LOOK, NOUN_PICTURE)) _vm->_dialogs->show(60217); - else if (_action.isAction(VERB_LOOK, 0x2F6)) + else if (_action.isAction(VERB_LOOK, NOUN_LAMP)) _vm->_dialogs->show(60218); - else if (_action.isAction(VERB_LOOK, 0x491)) + else if (_action.isAction(VERB_LOOK, NOUN_MASKS)) _vm->_dialogs->show(60219); - else if (_action.isAction(VERB_LOOK, 0x493)) + else if (_action.isAction(VERB_LOOK, NOUN_GLASS_BLOCK_WALL)) _vm->_dialogs->show(60220); - else if (_action.isAction(VERB_LOOK, 0x70)) + else if (_action.isAction(VERB_LOOK, NOUN_DOORWAY)) _vm->_dialogs->show(60221); - else if (_action.isAction(VERB_LOOK, 0x3D3)) { + else if (_action.isAction(VERB_LOOK, NOUN_SAFE)) { if (_globals[kSafeStatus] == 0) _vm->_dialogs->show(60222); else if (_globals[kSafeStatus] == 1) { @@ -508,19 +508,19 @@ void Scene602::actions() { _vm->_dialogs->show(60236); } else if (_action.isAction(VERB_UNLOCK, 0x6F, 0x3D3) || _action.isAction(VERB_UNLOCK, 0xFF, 0x3D3)) _vm->_dialogs->show(60225); - else if (_action.isAction(VERB_PULL, 0x3D3)) + else if (_action.isAction(VERB_PULL, NOUN_SAFE)) _vm->_dialogs->show(60226); - else if (_action.isAction(VERB_PUT, 0x3D8) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) + else if (_action.isAction(VERB_PUT, NOUN_FIREPLACE) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) _vm->_dialogs->show(60227); - else if (_action.isAction(VERB_LOOK, 0x342)) + else if (_action.isAction(VERB_LOOK, NOUN_HOLE)) _vm->_dialogs->show(60228); - else if (_action.isAction(VERB_LOOK, 0x343)) + else if (_action.isAction(VERB_LOOK, NOUN_LASER_BEAM)) _vm->_dialogs->show(60229); - else if (_action.isAction(VERB_LOOK, 0x3F5)) + else if (_action.isAction(VERB_LOOK, NOUN_FLOWER_BOX)) _vm->_dialogs->show(60231); - else if (_action.isAction(VERB_THROW, 0x2A, 0x3D3) || _action.isAction(VERB_THROW, 0x2B, 0x3D3)) + else if (_action.isAction(VERB_THROW, NOUN_BOMB, 0x3D3) || _action.isAction(VERB_THROW, NOUN_BOMBS, 0x3D3)) _vm->_dialogs->show(60232); - else if (_action.isAction(VERB_PUT, 0x171)) + else if (_action.isAction(VERB_PUT, NOUN_TIMEBOMB)) _vm->_dialogs->show(60233); else return; @@ -564,9 +564,9 @@ void Scene603::enter() { } void Scene603::actions() { - if (_action.isAction(VERB_WALK_TOWARDS, 0x3F1)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_LIVINGROOM)) _scene->_nextSceneId = 602; - else if (_action.isAction(VERB_TAKE, 0x57)) { + else if (_action.isAction(VERB_TAKE, NOUN_COMPACT_CASE)) { if ( _game._trigger || !_game._objects.isInInventory(OBJ_COMPACT_CASE)) { switch (_game._trigger) { case 0: @@ -597,7 +597,7 @@ void Scene603::actions() { break; } } - } else if (_action.isAction(VERB_TAKE, 0x3A8)) { + } else if (_action.isAction(VERB_TAKE, NOUN_NOTE)) { if ( _game._trigger || !_game._objects.isInInventory(OBJ_NOTE)) { if (_game._trigger == 0) { _game._player._stepEnabled = false; @@ -618,46 +618,46 @@ void Scene603::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(60310); - else if (_action.isAction(VERB_LOOK, 0x1CB)) + else if (_action.isAction(VERB_LOOK, NOUN_BED)) _vm->_dialogs->show(60311); - else if (_action.isAction(VERB_LOOK, 0x3E5)) + else if (_action.isAction(VERB_LOOK, NOUN_WIG_STAND)) _vm->_dialogs->show(60312); - else if (_action.isAction(VERB_TAKE, 0x3E5)) + else if (_action.isAction(VERB_TAKE, NOUN_WIG_STAND)) _vm->_dialogs->show(60313); - else if (_action.isAction(VERB_LOOK, 0x3EE)) + else if (_action.isAction(VERB_LOOK, NOUN_REVIEW)) _vm->_dialogs->show(60314); - else if (_action.isAction(VERB_LOOK, 0x3ED)) + else if (_action.isAction(VERB_LOOK, NOUN_SOUVENIR_TICKETS)) _vm->_dialogs->show(60315); - else if (_action.isAction(VERB_LOOK, 0x49D)) + else if (_action.isAction(VERB_LOOK, NOUN_PHOTOGRAPH)) _vm->_dialogs->show(60316); - else if (_action.isAction(VERB_LOOK, 0x2F6)) + else if (_action.isAction(VERB_LOOK, NOUN_LAMP)) _vm->_dialogs->show(60317); - else if (_action.isAction(VERB_LOOK, 0x49E) || _action.isAction(VERB_LOOK, 0x49F) || _action.isAction(VERB_LOOK, 0x3E7)) + else if (_action.isAction(VERB_LOOK, NOUN_DIRECTORS_SLATE) || _action.isAction(VERB_LOOK, NOUN_CROP) || _action.isAction(VERB_LOOK, NOUN_MEGAPHONE)) _vm->_dialogs->show(60318); - else if (_action.isAction(VERB_LOOK, 0x3DE)) + else if (_action.isAction(VERB_LOOK, NOUN_SNAPSHOT)) _vm->_dialogs->show(60319); - else if (_action.isAction(VERB_TAKE, 0x3DE)) + else if (_action.isAction(VERB_TAKE, NOUN_SNAPSHOT)) _vm->_dialogs->show(60320); - else if (_action.isAction(VERB_LOOK, 0x3DF)) + else if (_action.isAction(VERB_LOOK, NOUN_PERFUME)) _vm->_dialogs->show(60321); - else if (_action.isAction(VERB_TAKE, 0x3DF)) + else if (_action.isAction(VERB_TAKE, NOUN_PERFUME)) _vm->_dialogs->show(60322); - else if (_action.isAction(VERB_TAKE, 0x3A8)) + else if (_action.isAction(VERB_TAKE, NOUN_NOTE)) _vm->_dialogs->show(60323); - else if (_action.isAction(VERB_LOOK, 0x3A8)) { + else if (_action.isAction(VERB_LOOK, NOUN_NOTE)) { if (_game._objects[OBJ_NOTE]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(60324); - } else if (_action.isAction(VERB_LOOK, 0x3E3)) { + } else if (_action.isAction(VERB_LOOK, NOUN_CORNER_TABLE)) { if (_game._objects[OBJ_NOTE]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(60326); else _vm->_dialogs->show(60325); - } else if (_action.isAction(VERB_LOOK, 0x3EA)) { + } else if (_action.isAction(VERB_LOOK, NOUN_VANITY)) { if (_game._objects[OBJ_COMPACT_CASE]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(60327); else _vm->_dialogs->show(60328); - } else if (_action.isAction(VERB_LOOK, 0x57) && (_action._mainObjectSource == 4)) + } 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))) @@ -890,10 +890,10 @@ void Scene604::actions() { default: break; } - } else if ((_action.isAction(VERB_PUT, 0x3F6) || _action.isAction(VERB_PUT, 0x181) || _action.isAction(VERB_THROW, 0x181)) + } 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))) _vm->_dialogs->show(60420); - else if (_action.isAction(VERB_PUT, 0x171, 0x3F6) || _action.isAction(VERB_PUT, 0x171, 0x181)) { + else if (_action.isAction(VERB_PUT, NOUN_TIMEBOMB, 0x3F6) || _action.isAction(VERB_PUT, NOUN_TIMEBOMB, 0x181)) { _bombMode = 1; if ((_game._difficulty == DIFFICULTY_HARD) || _globals[kWarnedFloodCity]) handleBombActions(); @@ -906,30 +906,30 @@ void Scene604::actions() { _vm->_dialogs->show(60425); _globals[kWarnedFloodCity] = true; } - } else if (_action.isAction(VERB_TAKE, 0x171)) { + } else if (_action.isAction(VERB_TAKE, NOUN_TIMEBOMB)) { if (_game._trigger || !_game._objects.isInInventory(OBJ_TIMEBOMB)) { _bombMode = 2; handleBombActions(); } } else if (_action._lookFlag) _vm->_dialogs->show(60411); - else if (_action.isAction(VERB_LOOK, 0x181)) { + else if (_action.isAction(VERB_LOOK, NOUN_VIEWPORT)) { if (_monsterActive) { _vm->_dialogs->show(60413); } else { _vm->_dialogs->show(60412); } - } else if (_action.isAction(VERB_LOOK, 0x18D)) + } else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(60414); - else if (_action.isAction(VERB_LOOK, 0x3F4)) + else if (_action.isAction(VERB_LOOK, NOUN_VENT)) _vm->_dialogs->show(60415); - else if (_action.isAction(VERB_LOOK, 0x479)) + else if (_action.isAction(VERB_LOOK, NOUN_INDICATOR)) _vm->_dialogs->show(60416); - else if (_action.isAction(VERB_LOOK, 0x3F2)) + else if (_action.isAction(VERB_LOOK, NOUN_SCULPTURE)) _vm->_dialogs->show(60417); - else if (_action.isAction(VERB_LOOK, 0x324)) + else if (_action.isAction(VERB_LOOK, NOUN_CAR)) _vm->_dialogs->show(60418); - else if (_action.isAction(VERB_LOOK, 0x3C4)) + else if (_action.isAction(VERB_LOOK, NOUN_FOUNTAIN)) _vm->_dialogs->show(60419); else return; @@ -1293,23 +1293,23 @@ void Scene607::handleThrowingBone() { } void Scene607::preActions() { - if (_action.isAction(VERB_TALKTO, 0x471)) + if (_action.isAction(VERB_TALKTO, NOUN_OBNOXIOUS_DOG)) _game._player._needToWalk = false; - if (_action.isAction(VERB_WALK_THROUGH, 0x478) && (_globals[kDogStatus] == 2) && (_game._difficulty != DIFFICULTY_EASY)) { + if (_action.isAction(VERB_WALK_THROUGH, NOUN_SIDE_ENTRANCE) && (_globals[kDogStatus] == 2) && (_game._difficulty != DIFFICULTY_EASY)) { _shopAvailable = true; _dogTimer = 0; } - if (_action.isAction(VERB_THROW, 0x2D, 0x471) || _action.isAction(VERB_THROW, 0x2C, 0x471)) + if (_action.isAction(VERB_THROW, NOUN_BONES, 0x471) || _action.isAction(VERB_THROW, NOUN_BONE, 0x471)) _game._player.walk(Common::Point(193, 100), FACING_NORTHEAST); - if (_action.isAction(VERB_THROW, 0x2D, 0x2C3) || _action.isAction(VERB_THROW, 0x2C, 0x2C3)) + if (_action.isAction(VERB_THROW, NOUN_BONES, 0x2C3) || _action.isAction(VERB_THROW, NOUN_BONE, 0x2C3)) _game._player.walk(Common::Point(201, 107), FACING_SOUTHEAST); } void Scene607::actions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x478)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_SIDE_ENTRANCE)) _scene->_nextSceneId = 608; else if (_action.isAction(0x325, 0x324)) { switch (_game._trigger) { @@ -1348,7 +1348,7 @@ void Scene607::actions() { default: break; } - } else if (_action.isAction(VERB_THROW, 0x2D, 0x471) || _action.isAction(VERB_THROW, 0x2C, 0x471)) { + } else if (_action.isAction(VERB_THROW, NOUN_BONES, 0x471) || _action.isAction(VERB_THROW, NOUN_BONE, 0x471)) { if (_game._difficulty != DIFFICULTY_EASY) { _animationMode = 1; _scene->_kernelMessages.reset(); @@ -1357,7 +1357,7 @@ void Scene607::actions() { handleThrowingBone(); } - } else if ((_action.isAction(VERB_THROW, 0x2D, 0x2C3) || _action.isAction(VERB_THROW, 0x2C, 0x2C3)) && (_game._difficulty != DIFFICULTY_EASY) + } else if ((_action.isAction(VERB_THROW, NOUN_BONES, 0x2C3) || _action.isAction(VERB_THROW, NOUN_BONE, 0x2C3)) && (_game._difficulty != DIFFICULTY_EASY) && ((_globals[kDogStatus] == 1) || _game._trigger)) { _animationMode = 2; if (_game._trigger == 0) { @@ -1365,48 +1365,48 @@ void Scene607::actions() { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x2F6)); } handleThrowingBone(); - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x31E)) { + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_STREET)) { if ((_globals[kDogStatus] == 1) || (_game._difficulty == DIFFICULTY_EASY)) _vm->_dialogs->show(60710); else _vm->_dialogs->show(60711); - } else if (_action.isAction(VERB_LOOK, 0x18D)) + } else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(60712); - else if (_action.isAction(VERB_LOOK, 0x2C3)) + else if (_action.isAction(VERB_LOOK, NOUN_FENCE)) _vm->_dialogs->show(60713); - else if (_action.isAction(VERB_LOOK, 0x324)) + else if (_action.isAction(VERB_LOOK, NOUN_CAR)) _vm->_dialogs->show(60714); - else if (_action.isAction(VERB_LOOK, 0x3FB)) + else if (_action.isAction(VERB_LOOK, NOUN_MANHOLE)) _vm->_dialogs->show(60715); - else if (_action.isAction(VERB_LOOK, 0x1E6) && (_globals[kDogStatus] == 1)) + else if (_action.isAction(VERB_LOOK, NOUN_FIRE_HYDRANT) && (_globals[kDogStatus] == 1)) _vm->_dialogs->show(60716); - else if (_action.isAction(VERB_LOOK, 0x244)) + else if (_action.isAction(VERB_LOOK, NOUN_SIGN)) _vm->_dialogs->show(60717); - else if (_action.isAction(VERB_LOOK, 0x3FD)) + else if (_action.isAction(VERB_LOOK, NOUN_BROKEN_WINDOW)) _vm->_dialogs->show(60718); - else if (_action.isAction(VERB_LOOK, 0x3FF)) + else if (_action.isAction(VERB_LOOK, NOUN_GARAGE_DOOR)) _vm->_dialogs->show(60719); - else if (_action.isAction(VERB_LOOK, 0x31D)) + else if (_action.isAction(VERB_LOOK, NOUN_SIDEWALK)) _vm->_dialogs->show(60720); - else if (_action.isAction(VERB_LOOK, 0x3F9)) + else if (_action.isAction(VERB_LOOK, NOUN_AIR_HOSE)) _vm->_dialogs->show(60721); - else if (_action.isAction(VERB_LOOK, 0x3FA)) { + else if (_action.isAction(VERB_LOOK, NOUN_AUTO_SHOP)) { if (_globals[kDogStatus] == 1) _vm->_dialogs->show(60723); else _vm->_dialogs->show(60722); - } else if (_action.isAction(VERB_LOOK, 0x478)) { + } else if (_action.isAction(VERB_LOOK, NOUN_SIDE_ENTRANCE)) { if (_globals[kDogStatus] == 1) _vm->_dialogs->show(60725); else _vm->_dialogs->show(60724); - } else if (_action.isAction(VERB_LOOK, 0x471)) + } else if (_action.isAction(VERB_LOOK, NOUN_OBNOXIOUS_DOG)) _vm->_dialogs->show(60726); - else if (_action.isAction(VERB_TALKTO, 0x471)) + else if (_action.isAction(VERB_TALKTO, NOUN_OBNOXIOUS_DOG)) _vm->_dialogs->show(60727); - else if (_action.isAction(VERB_LOOK, 0x31F)) + else if (_action.isAction(VERB_LOOK, NOUN_BARRICADE)) _vm->_dialogs->show(60728); - else if (_action.isAction(VERB_WALK_DOWN, 0x31E)) + 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))) _vm->_dialogs->show(60731); @@ -2070,20 +2070,20 @@ void Scene608::step() { void Scene608::preActions() { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; - if ((_action.isAction(VERB_THROW, 0x2C, 0x410) || _action.isAction(VERB_THROW, 0x2D, 0x410) - || _action.isAction(VERB_THROW, 0x2C, 0x411) || _action.isAction(VERB_THROW, 0x2D, 0x411) - || _action.isAction(VERB_THROW, 0x2D, 0x471) || _action.isAction(VERB_THROW, 0x2C, 0x471)) && _dogActiveFl) { + 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) { _game._player._stepEnabled = false; _game._player.walk(Common::Point(56, 146), FACING_EAST); } - if ((_action.isAction(VERB_THROW, 0x2D, 0x41D) || _action.isAction(VERB_THROW, 0x2C, 0x41D) - || _action.isAction(VERB_THROW, 0x2D, 0x41E) || _action.isAction(VERB_THROW, 0x2C, 0x41E)) && _dogActiveFl) { + 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) { _game._player._stepEnabled = false; _game._player.walk(Common::Point(75, 136), FACING_EAST); } - if (_action.isAction(VERB_PUSH, 0x403) && _dogUnderCar) { + if (_action.isAction(VERB_PUSH, NOUN_DOWN_BUTTON) && _dogUnderCar) { _buttonPressedonTimeFl = true; _dogDeathMode = 1; } else @@ -2091,9 +2091,9 @@ void Scene608::preActions() { } void Scene608::actions() { - if (_action.isAction(VERB_WALK_THROUGH, 0x70)) + if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY)) _scene->_nextSceneId = 607; - else if (_action.isAction(VERB_PUSH, 0x403)) { + else if (_action.isAction(VERB_PUSH, NOUN_DOWN_BUTTON)) { _game._player._stepEnabled = true; switch (_game._trigger) { case 0: @@ -2168,7 +2168,7 @@ void Scene608::actions() { default: break; } - } else if (_action.isAction(VERB_PUSH, 0x402)) { + } else if (_action.isAction(VERB_PUSH, NOUN_UP_BUTTON)) { switch (_game._trigger) { case 0: if ((_globals[kCarStatus] == 3) || (_globals[kCarStatus] == 4)) { @@ -2217,8 +2217,8 @@ void Scene608::actions() { default: break; } - } else if (_action.isAction(VERB_THROW, 0x2C, 0x410) || _action.isAction(VERB_THROW, 0x2D, 0x410) - || _action.isAction(VERB_THROW, 0x2D, 0x471) || _action.isAction(VERB_THROW, 0x2C, 0x471)) { + } 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)) { _game._player._stepEnabled = true; if (_dogActiveFl) { if (_game._trigger == 0) { @@ -2229,7 +2229,7 @@ void Scene608::actions() { handleThrowingBone(); } else _vm->_dialogs->show(60841); - } else if (_action.isAction(VERB_THROW, 0x2C, 0x411) || _action.isAction(VERB_THROW, 0x2D, 0x411)) { + } else if (_action.isAction(VERB_THROW, NOUN_BONE, 0x411) || _action.isAction(VERB_THROW, NOUN_BONES, 0x411)) { _game._player._stepEnabled = true; if (_dogActiveFl) { if (_game._trigger == 0) { @@ -2240,8 +2240,8 @@ void Scene608::actions() { handleThrowingBone(); } else _vm->_dialogs->show(60841); - } else if (_action.isAction(VERB_THROW, 0x2D, 0x41D) || _action.isAction(VERB_THROW, 0x2C, 0x41D) - || _action.isAction(VERB_THROW, 0x2D, 0x41E) || _action.isAction(VERB_THROW, 0x2C, 0x41E)) { + } 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)) { _game._player._stepEnabled = true; if ((_globals[kCarStatus] == 0) && _dogActiveFl) { if (_dogActiveFl) { @@ -2255,7 +2255,7 @@ void Scene608::actions() { _vm->_dialogs->show(60841); } else _vm->_dialogs->show(60842); - } else if (_action.isAction(VERB_TAKE, 0x115) && (_game._trigger || !_game._objects.isInInventory(OBJ_POLYCEMENT))) { + } else if (_action.isAction(VERB_TAKE, NOUN_POLYCEMENT) && (_game._trigger || !_game._objects.isInInventory(OBJ_POLYCEMENT))) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2283,7 +2283,7 @@ void Scene608::actions() { default: break; } - } else if (_action.isAction(VERB_TAKE, 0x120) && (_game._trigger || !_game._objects.isInInventory(OBJ_REARVIEW_MIRROR))) { + } else if (_action.isAction(VERB_TAKE, NOUN_REARVIEW_MIRROR) && (_game._trigger || !_game._objects.isInInventory(OBJ_REARVIEW_MIRROR))) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2324,51 +2324,51 @@ void Scene608::actions() { else if (_action.isAction(VERB_TAKE) && (_action.isAction(0x412) || _action.isAction(0x408) || _action.isAction(0x414) || _action.isAction(0x40D) || _action.isAction(0x41C))) _vm->_dialogs->show(60814); - else if (_action.isAction(VERB_LOOK, 0x409) || _action.isAction(VERB_LOOK, 0x411) || _action.isAction(VERB_LOOK, 0x410)) { + 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) _vm->_dialogs->show(60815); else _vm->_dialogs->show(60816); - } else if (_action.isAction(VERB_LOOK, 0x495)) + } else if (_action.isAction(VERB_LOOK, NOUN_SPARE_RIBS)) _vm->_dialogs->show(60817); - else if (_action.isAction(VERB_TAKE, 0x495)) { + else if (_action.isAction(VERB_TAKE, NOUN_SPARE_RIBS)) { if (_game._difficulty == DIFFICULTY_HARD) _vm->_dialogs->show(60818); else _vm->_dialogs->show(60819); - } else if (_action.isAction(VERB_LOOK, 0x402)) + } else if (_action.isAction(VERB_LOOK, NOUN_UP_BUTTON)) _vm->_dialogs->show(60820); - else if (_action.isAction(VERB_LOOK, 0x403)) + else if (_action.isAction(VERB_LOOK, NOUN_DOWN_BUTTON)) _vm->_dialogs->show(60821); - else if (_action.isAction(VERB_LOOK, 0x41A)) + else if (_action.isAction(VERB_LOOK, NOUN_TRASH_CAN)) _vm->_dialogs->show(60822); - else if (_action.isAction(VERB_LOOK, 0x418)) + else if (_action.isAction(VERB_LOOK, NOUN_CALENDAR)) _vm->_dialogs->show(60823); - else if (_action.isAction(VERB_LOOK, 0x330)) { + else if (_action.isAction(VERB_LOOK, NOUN_STORAGE_BOX)) { if (_game._objects[OBJ_REARVIEW_MIRROR]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(60825); else _vm->_dialogs->show(60824); - } else if (_action.isAction(VERB_OPEN, 0x330)) + } else if (_action.isAction(VERB_OPEN, NOUN_STORAGE_BOX)) _vm->_dialogs->show(60826); - else if (_action.isAction(VERB_LOOK, 0x120) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_REARVIEW_MIRROR) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(60828); - else if (_action.isAction(VERB_LOOK, 0x406)) { + else if (_action.isAction(VERB_LOOK, NOUN_TOOL_BOX)) { if (_game._objects[OBJ_POLYCEMENT]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(60829); else _vm->_dialogs->show(60830); - } else if (_action.isAction(VERB_OPEN, 0x406)) + } else if (_action.isAction(VERB_OPEN, NOUN_TOOL_BOX)) _vm->_dialogs->show(60831); - else if ((_action.isAction(VERB_LOOK, 0x115)) && (_game._objects.isInRoom(OBJ_POLYCEMENT))) + else if ((_action.isAction(VERB_LOOK, NOUN_POLYCEMENT)) && (_game._objects.isInRoom(OBJ_POLYCEMENT))) _vm->_dialogs->show(60832); - else if (_action.isAction(VERB_LOOK, 0x417) || _action.isAction(VERB_LOOK, 0x40E)) + else if (_action.isAction(VERB_LOOK, NOUN_GREASE_CAN) || _action.isAction(VERB_LOOK, NOUN_OIL_CAN)) _vm->_dialogs->show(60834); - else if (_action.isAction(VERB_LOOK, 0x407)) + else if (_action.isAction(VERB_LOOK, NOUN_CAR_LIFT)) _vm->_dialogs->show(60835); - else if (_action.isAction(VERB_LOOK, 0x47) || _action.isAction(VERB_LOOK, 0x4A0)) + else if (_action.isAction(VERB_LOOK, NOUN_CHAIR) || _action.isAction(VERB_LOOK, NOUN_HAT)) _vm->_dialogs->show(60836); - else if (_action.isAction(VERB_LOOK, 0x41E)) + else if (_action.isAction(VERB_LOOK, NOUN_DANGER_ZONE)) _vm->_dialogs->show(60838); else return; @@ -2586,9 +2586,9 @@ void Scene609::preActions() { } void Scene609::actions() { - if (_action.isAction(VERB_WALK_TOWARDS, 0x423)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_ALLEY)) _scene->_nextSceneId = 611; - else if (_action.isAction(VERB_WALK_THROUGH, 0x425)) { + else if (_action.isAction(VERB_WALK_THROUGH, NOUN_VIDEO_STORE_DOOR)) { if (!_globals[kBeenInVideoStore]) { switch (_game._trigger) { case 0: @@ -2672,26 +2672,26 @@ void Scene609::actions() { } } else if (_action._lookFlag) _vm->_dialogs->show(60910); - else if (_action.isAction(VERB_LOOK, 0x31E)) + else if (_action.isAction(VERB_LOOK, NOUN_STREET)) _vm->_dialogs->show(60911); - else if (_action.isAction(VERB_LOOK, 0x421)) + else if (_action.isAction(VERB_LOOK, NOUN_SPOT_A_POT)) _vm->_dialogs->show(60912); - else if (_action.isAction(VERB_LOOK, 0x427)) + else if (_action.isAction(VERB_LOOK, NOUN_VIDEO_STORE)) _vm->_dialogs->show(60913); - else if (_action.isAction(VERB_LOOK, 0x33A)) + else if (_action.isAction(VERB_LOOK, NOUN_BILLBOARD)) _vm->_dialogs->show(60914); - else if (_action.isAction(VERB_LOOK, 0x2CD)) + else if (_action.isAction(VERB_LOOK, NOUN_STATUE)) _vm->_dialogs->show(60915); - else if (_action.isAction(VERB_LOOK, 0x324)) + else if (_action.isAction(VERB_LOOK, NOUN_CAR)) _vm->_dialogs->show(60916); - else if (_action.isAction(VERB_LOOK, 0x41F)) + else if (_action.isAction(VERB_LOOK, NOUN_NEWSSTAND)) _vm->_dialogs->show(60917); - else if (_action.isAction(VERB_LOOK, 0x425)) { + else if (_action.isAction(VERB_LOOK, NOUN_VIDEO_STORE_DOOR)) { if (!_globals[kBeenInVideoStore]) _vm->_dialogs->show(60918); else _vm->_dialogs->show(60919); - } else if (_action.isAction(VERB_WALK_DOWN, 0x31E)) + } else if (_action.isAction(VERB_WALK_DOWN, NOUN_STREET)) _vm->_dialogs->show(60730); else return; @@ -2763,9 +2763,9 @@ void Scene610::step() { } void Scene610::actions() { - if (_action.isAction(VERB_EXIT_FROM, 0x427)) + if (_action.isAction(VERB_EXIT_FROM, NOUN_VIDEO_STORE)) _scene->_nextSceneId = 609; - else if (_action.isAction(VERB_TAKE, 0x108)) { + else if (_action.isAction(VERB_TAKE, NOUN_PHONE_HANDSET)) { if ( _game._trigger || !_game._objects.isInInventory(OBJ_PHONE_HANDSET)) { switch (_game._trigger) { case 0: @@ -2796,7 +2796,7 @@ void Scene610::actions() { break; } } - } else if (_action.isAction(VERB_PUT, 0x108, 0x42F)) { + } else if (_action.isAction(VERB_PUT, NOUN_PHONE_HANDSET, 0x42F)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2828,42 +2828,42 @@ void Scene610::actions() { default: break; } - } else if (_action.isAction(VERB_LOOK, 0x442)) + } else if (_action.isAction(VERB_LOOK, NOUN_PIPPY_BILLBOARD)) _vm->_dialogs->show(61010); - else if (_action.isAction(VERB_LOOK, 0x44B)) + else if (_action.isAction(VERB_LOOK, NOUN_CIVILIZATION_AD)) _vm->_dialogs->show(61011); - else if (_action.isAction(VERB_LOOK, 0x441)) + else if (_action.isAction(VERB_LOOK, NOUN_MARX_BROS_POSTER)) _vm->_dialogs->show(61012); - else if (_action.isAction(VERB_LOOK, 0x43C)) + else if (_action.isAction(VERB_LOOK, NOUN_VIDEO_MONITOR)) _vm->_dialogs->show(61013); - else if (_action.isAction(VERB_LOOK, 0x427)) + else if (_action.isAction(VERB_LOOK, NOUN_VIDEO_STORE)) _vm->_dialogs->show(61014); else if (_action._lookFlag) _vm->_dialogs->show(61015); - else if (_action.isAction(VERB_LOOK, 0x4A1)) + else if (_action.isAction(VERB_LOOK, NOUN_LOGO)) _vm->_dialogs->show(61018); - else if (_action.isAction(VERB_LOOK, 0x498)) { + else if (_action.isAction(VERB_LOOK, NOUN_CEMENT)) { if (_game._visitedScenes.exists(601)) _vm->_dialogs->show(61020); else _vm->_dialogs->show(61019); - } else if (_action.isAction(VERB_LOOK, 0x29F)) + } else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) _vm->_dialogs->show(61021); - else if (_action.isAction(VERB_LOOK, 0x429)) + else if (_action.isAction(VERB_LOOK, NOUN_PHONE_ANTENNA)) _vm->_dialogs->show(61022); - else if (_action.isAction(VERB_LOOK, 0x42D)) + else if (_action.isAction(VERB_LOOK, NOUN_SMELLY_SNEAKER)) _vm->_dialogs->show(61023); - else if (_action.isAction(VERB_TAKE, 0x42D)) + else if (_action.isAction(VERB_TAKE, NOUN_SMELLY_SNEAKER)) _vm->_dialogs->show(61024); - else if (_action.isAction(VERB_LOOK, 0x431)) + else if (_action.isAction(VERB_LOOK, NOUN_SPOTLIGHT)) _vm->_dialogs->show(61025); - else if (_action.isAction(VERB_LOOK, 0x108) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_PHONE_HANDSET) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(61026); - else if (_action.isAction(VERB_LOOK, 0x42F)) + else if (_action.isAction(VERB_LOOK, NOUN_PHONE_CRADLE)) _vm->_dialogs->show(61027); - else if (_action.isAction(VERB_LOOK, 0x42A)) + else if (_action.isAction(VERB_LOOK, NOUN_RETURN_SLOT)) _vm->_dialogs->show(61028); - else if (_action.isAction(VERB_PUT, 0x42A) + 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) @@ -4130,7 +4130,7 @@ void Scene611::step() { } void Scene611::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x423)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_ALLEY)) _game._player._walkOffScreenSceneId = 609; if (_resetBatterieText) @@ -4140,11 +4140,11 @@ void Scene611::preActions() { void Scene611::actions() { if (_game._screenObjects._inputMode == 1) handleDialog(); - else if ((_action.isAction(VERB_GIVE, 0x107, 0x45A)) || (_action.isAction(VERB_GIVE, 0x73, 0x45A))) { + else if ((_action.isAction(VERB_GIVE, NOUN_PHONE_CELLS, 0x45A)) || (_action.isAction(VERB_GIVE, NOUN_DURAFAIL_CELLS, 0x45A))) { _action._activeAction._verbId = 0x294; _giveBatteriesFl = true; handleSubDialog1(); - } else if (_action.isAction(VERB_GIVE, 0x45A)) { + } else if (_action.isAction(VERB_GIVE, NOUN_HERMIT)) { _scene->_kernelMessages.reset(); Common::String curQuote = _game.getQuote(0x323); @@ -4182,7 +4182,7 @@ void Scene611::actions() { _dialog2.start(); _duringDialogFl = true; } - } else if (_action.isAction(VERB_TALKTO, 0x45A)) { + } else if (_action.isAction(VERB_TALKTO, NOUN_HERMIT)) { if (!_dialog1.read(0x287)) { _scene->_kernelMessages.reset(); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x27A)); @@ -4227,29 +4227,29 @@ void Scene611::actions() { _vm->_dialogs->show(61111); else _vm->_dialogs->show(61110); - } else if (_action.isAction(VERB_LOOK, 0x45A)) + } else if (_action.isAction(VERB_LOOK, NOUN_HERMIT)) _vm->_dialogs->show(61112); - else if (_action.isAction(VERB_LOOK, 0x25C)) + else if (_action.isAction(VERB_LOOK, NOUN_TRASH)) _vm->_dialogs->show(61113); - else if (_action.isAction(VERB_TAKE, 0x25C)) + else if (_action.isAction(VERB_TAKE, NOUN_TRASH)) _vm->_dialogs->show(61114); - else if (_action.isAction(VERB_LOOK, 0x49A)) + else if (_action.isAction(VERB_LOOK, NOUN_CARDBOARD_BOX)) _vm->_dialogs->show(61115); - else if (_action.isAction(VERB_TAKE, 0x49A)) + else if (_action.isAction(VERB_TAKE, NOUN_CARDBOARD_BOX)) _vm->_dialogs->show(61116); - else if (_action.isAction(VERB_OPEN, 0x49A)) + else if (_action.isAction(VERB_OPEN, NOUN_CARDBOARD_BOX)) _vm->_dialogs->show(61117); - else if (_action.isAction(VERB_LOOK, 0x122)) + else if (_action.isAction(VERB_LOOK, NOUN_REFRIGERATOR)) _vm->_dialogs->show(61118); - else if (_action.isAction(VERB_OPEN, 0x122)) + else if (_action.isAction(VERB_OPEN, NOUN_REFRIGERATOR)) _vm->_dialogs->show(61119); - else if (_action.isAction(VERB_TAKE, 0x122)) + else if (_action.isAction(VERB_TAKE, NOUN_REFRIGERATOR)) _vm->_dialogs->show(61120); - else if (_action.isAction(VERB_LOOK, 0x323)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING)) _vm->_dialogs->show(61121); - else if (_action.isAction(VERB_LOOK, 0x49C)) + else if (_action.isAction(VERB_LOOK, NOUN_GRAFFITI)) _vm->_dialogs->show(61122); - else if (_action.isAction(VERB_LOOK, 0x45B)) + else if (_action.isAction(VERB_LOOK, NOUN_METAL_PIPE)) _vm->_dialogs->show(61123); else return; @@ -4428,37 +4428,37 @@ void Scene612::actions() { _cycleIndex = -2; action = 1; handleWinchMovement(); - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x466)) + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_EXPRESSWAY)) _vm->_dialogs->show(61210); - else if (_action.isAction(VERB_LOOK, 0x347) || _action.isAction(VERB_LOOK, 0x45E)) { + else if (_action.isAction(VERB_LOOK, NOUN_ROPE) || _action.isAction(VERB_LOOK, NOUN_ARMATURE)) { if (_globals[kBoatRaised]) _vm->_dialogs->show(61211); else _vm->_dialogs->show(61212); - } else if (_action.isAction(VERB_TAKE, 0x347)) + } else if (_action.isAction(VERB_TAKE, NOUN_ROPE)) _vm->_dialogs->show(61213); - else if (_action.isAction(VERB_LOOK, 0x45F)) { + else if (_action.isAction(VERB_LOOK, NOUN_CONTROL_BOX)) { if (_globals[kBoatRaised]) _vm->_dialogs->show(61214); else _vm->_dialogs->show(61216); - } else if (_action.isAction(VERB_OPEN, 0x45F)) + } else if (_action.isAction(VERB_OPEN, NOUN_CONTROL_BOX)) _vm->_dialogs->show(61215); - else if (_action.isAction(VERB_LOOK, 0x33D)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDINGS)) _vm->_dialogs->show(61218); - else if (_action.isAction(VERB_LOOK, 0x464)) + else if (_action.isAction(VERB_LOOK, NOUN_DOME)) _vm->_dialogs->show(61219); - else if (_action.isAction(VERB_LOOK, 0x2CD)) + else if (_action.isAction(VERB_LOOK, NOUN_STATUE)) _vm->_dialogs->show(61220); - else if (_action.isAction(VERB_LOOK, 0x4A2)) + else if (_action.isAction(VERB_LOOK, NOUN_MAINTENANCE_BUILDING)) _vm->_dialogs->show(61221); - else if (_action.isAction(VERB_OPEN, 0x4A2)) + else if (_action.isAction(VERB_OPEN, NOUN_MAINTENANCE_BUILDING)) _vm->_dialogs->show(61222); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(61223); - else if (_action.isAction(VERB_LOOK, 0x257)) + else if (_action.isAction(VERB_LOOK, NOUN_SUPPORT)) _vm->_dialogs->show(61224); - else if (_action.isAction(VERB_WALK_DOWN, 0x461) || _action.isAction(VERB_WALK_DOWN, 0x463)) + else if (_action.isAction(VERB_WALK_DOWN, NOUN_EXPRESSWAY_TO_EAST) || _action.isAction(VERB_WALK_DOWN, NOUN_EXPRESSWAY_TO_WEST)) _vm->_dialogs->show(61225); else return; diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp index 2d85b2e784..a4dd432f11 100644 --- a/engines/mads/nebular/nebular_scenes7.cpp +++ b/engines/mads/nebular/nebular_scenes7.cpp @@ -1010,57 +1010,57 @@ void Scene703::actions() { _curSequence = 4; else _curSequence = 1; - } else if (_action.isAction(VERB_THROW, 0x2C, 0x468) || _action.isAction(VERB_THROW, 0x2D, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_BONE, 0x468) || _action.isAction(VERB_THROW, NOUN_BONES, 0x468)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); _scene->_activeAnimation->setCurrentFrame(19); - } else if (_action.isAction(VERB_THROW, 0x49, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_CHICKEN, 0x468)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); - } else if (_action.isAction(VERB_THROW, 0x17A, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_TWINKIFRUIT, 0x468)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); _scene->_activeAnimation->setCurrentFrame(39); - } else if (_action.isAction(VERB_THROW, 0x2A, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_BOMB, 0x468)) { _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); _scene->_activeAnimation->setCurrentFrame(59); - } else if (_action.isAction(VERB_THROW, 0x4A, 0x468)) { + } else if (_action.isAction(VERB_THROW, NOUN_CHICKEN_BOMB, 0x468)) { _useBomb = true; _game._player._stepEnabled = false; _scene->freeAnimation(); _monsterMode = 2; _scene->loadAnimation(formAnimName('C', -1)); - } else if (_action.isAction(VERB_PUT, 0x2E, 0x18F) || _action.isAction(0x85, 0x2E, 0x18F)) { + } else if (_action.isAction(VERB_PUT, NOUN_BOTTLE, 0x18F) || _action.isAction(0x85, 0x2E, 0x18F)) { if (_globals[kBottleStatus] != 4) { handleBottleInterface(); _dialog1.start(); } else _vm->_dialogs->show(70323); - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x468)) { + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_SEA_MONSTER)) { if (_globals[kMonsterAlive]) _vm->_dialogs->show(70310); - } else if (_action.isAction(VERB_LOOK, 0x18F)) { + } else if (_action.isAction(VERB_LOOK, NOUN_WATER)) { if (!_globals[kMonsterAlive]) _vm->_dialogs->show(70311); else _vm->_dialogs->show(70312); - } else if (_action.isAction(VERB_LOOK, 0x3B2)) { + } else if (_action.isAction(VERB_LOOK, NOUN_BUILDING_TO_NORTH)) { if (_globals[kMonsterAlive]) _vm->_dialogs->show(70313); else if (_game._visitedScenes.exists(710)) _vm->_dialogs->show(70314); else _vm->_dialogs->show(70315); - } else if (_action.isAction(VERB_LOOK, 0x3B3)) + } else if (_action.isAction(VERB_LOOK, NOUN_VOLCANO_RIM)) _vm->_dialogs->show(70316); else return; @@ -1367,7 +1367,7 @@ void Scene704::actions() { _animationMode = 4; else _animationMode = 1; - } else if (_action.isAction(VERB_TAKE, 0x2E)) { + } else if (_action.isAction(VERB_TAKE, NOUN_BOTTLE)) { if (!_game._objects.isInInventory(OBJ_BOTTLE)) { _game._player._stepEnabled = false; _takeBottleFl = true; @@ -1377,7 +1377,7 @@ void Scene704::actions() { _animationMode = 7; } } - } else if (_action.isAction(VERB_PUT, 0x2E, 0x18F) || _action.isAction(0x85, 0x2E, 0x18F)) { + } else if (_action.isAction(VERB_PUT, NOUN_BOTTLE, 0x18F) || _action.isAction(0x85, 0x2E, 0x18F)) { if (_game._objects.isInInventory(OBJ_BOTTLE)) { if (_globals[kBottleStatus] != 4) { _takeBottleFl = false; @@ -1386,20 +1386,20 @@ void Scene704::actions() { } else _vm->_dialogs->show(70323); } - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x18F)) + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_WATER)) _vm->_dialogs->show(70410); - else if (_action.isAction(VERB_LOOK, 0x3B2)) { + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING_TO_NORTH)) { if (_game._visitedScenes.exists(710)) _vm->_dialogs->show(70411); else _vm->_dialogs->show(70412); - } else if (_action.isAction(VERB_LOOK, 0x3B3)) + } else if (_action.isAction(VERB_LOOK, NOUN_VOLCANO_RIM)) _vm->_dialogs->show(70413); - else if (_action.isAction(VERB_LOOK, 0x2E) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_BOTTLE) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(70414); - else if (_action.isAction(VERB_LOOK, 0x3B4)) + else if (_action.isAction(VERB_LOOK, NOUN_OPEN_WATER_TO_SOUTH)) _vm->_dialogs->show(70416); - else if (_action.isAction(VERB_LOOK, 0x142)) + else if (_action.isAction(VERB_LOOK, NOUN_SKY)) _vm->_dialogs->show(70417); else return; @@ -1625,7 +1625,7 @@ void Scene705::actions() { default: break; } - } else if (_action.isAction(VERB_CLIMB_THROUGH, 0x197)) { + } else if (_action.isAction(VERB_CLIMB_THROUGH, NOUN_WINDOW)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1647,23 +1647,23 @@ void Scene705::actions() { default: break; } - } else if (_action.isAction(0x85, 0x2E, 0x18F) || _action.isAction(VERB_PUT, 0x2E, 0x18F)) { + } else if (_action.isAction(0x85, 0x2E, 0x18F) || _action.isAction(VERB_PUT, NOUN_BOTTLE, 0x18F)) { if (_globals[kBottleStatus] != 4) { handleBottleInterface(); _dialog1.start(); } else _vm->_dialogs->show(70323); - } if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x18F)) + } if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_WATER)) _vm->_dialogs->show(70511); - else if (_action.isAction(VERB_LOOK, 0x3B3)) + else if (_action.isAction(VERB_LOOK, NOUN_VOLCANO_RIM)) _vm->_dialogs->show(70512); - else if (_action.isAction(VERB_LOOK, 0x3B4)) + else if (_action.isAction(VERB_LOOK, NOUN_OPEN_WATER_TO_SOUTH)) _vm->_dialogs->show(70513); - else if (_action.isAction(VERB_LOOK, 0x142)) + else if (_action.isAction(VERB_LOOK, NOUN_SKY)) _vm->_dialogs->show(70514); - else if (_action.isAction(VERB_LOOK, 0x323)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING)) _vm->_dialogs->show(70515); - else if (_action.isAction(VERB_LOOK, 0x197)) + else if (_action.isAction(VERB_LOOK, NOUN_WINDOW)) _vm->_dialogs->show(70516); else return; @@ -1845,12 +1845,12 @@ void Scene706::step() { } void Scene706::preActions() { - if (_action.isAction(VERB_LOOK, 0x46E)) + if (_action.isAction(VERB_LOOK, NOUN_PORTRAIT)) _game._player._needToWalk = true; } void Scene706::actions() { - if (_action.isAction(VERB_WALK_INSIDE, 0x16C)) { + if (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER)) { _game._player._stepEnabled = false; _game._player._visible = false; _scene->_nextSceneId = 707; @@ -1858,13 +1858,13 @@ void Scene706::actions() { return; } - if (_action.isAction(VERB_EXIT, 0x2FA)) { + if (_action.isAction(VERB_EXIT, NOUN_ROOM)) { _scene->_nextSceneId = 705; _action._inProgress = false; return; } - if (_action.isAction(VERB_TAKE, 0x17D)) { + if (_action.isAction(VERB_TAKE, NOUN_VASE)) { if (_game._difficulty != DIFFICULTY_EASY) { _animationMode = 1; handleRexDeath(); @@ -1876,7 +1876,7 @@ void Scene706::actions() { return; } - if (_action.isAction(VERB_PUT, 0x2E, 0x344)) { + if (_action.isAction(VERB_PUT, NOUN_BOTTLE, 0x344)) { if ((_globals[kBottleStatus] == 2 && _game._difficulty == DIFFICULTY_HARD) || (_globals[kBottleStatus] != 0 && _game._difficulty != DIFFICULTY_HARD)) { if (!_game._objects.isInInventory(OBJ_VASE) || _game._trigger) { @@ -1893,47 +1893,47 @@ void Scene706::actions() { } } - if (_action.isAction(VERB_PUT, 0x344) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { + if (_action.isAction(VERB_PUT, NOUN_PEDESTAL) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { int objectId = _game._objects.getIdFromDesc(_action._activeAction._objectNameId); if (_game._objects[objectId].hasQuality(10)) _vm->_dialogs->show(70626); else _vm->_dialogs->show(70627); - } else if (_action.isAction(VERB_TAKE, 0x2E) && _game._objects.isInInventory(OBJ_VASE)) + } else if (_action.isAction(VERB_TAKE, NOUN_BOTTLE) && _game._objects.isInInventory(OBJ_VASE)) _vm->_dialogs->show(70631); else if (_action._lookFlag) { if (_game._objects[OBJ_VASE]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(70610); else _vm->_dialogs->show(70611); - } else if (_action.isAction(VERB_LOOK, 0x89)) + } else if (_action.isAction(VERB_LOOK, NOUN_FLOOR)) _vm->_dialogs->show(70612); - else if (_action.isAction(VERB_LOOK, 0x32B)) + else if (_action.isAction(VERB_LOOK, NOUN_PILLAR)) _vm->_dialogs->show(70613); - else if (_action.isAction(VERB_LOOK, 0x46B)) + else if (_action.isAction(VERB_LOOK, NOUN_OLD_TEA_CUP)) _vm->_dialogs->show(70614); - else if (_action.isAction(VERB_TAKE, 0x46B)) + else if (_action.isAction(VERB_TAKE, NOUN_OLD_TEA_CUP)) _vm->_dialogs->show(70615); - else if (_action.isAction(VERB_LOOK, 0x46D)) + else if (_action.isAction(VERB_LOOK, NOUN_OLD_VASE)) _vm->_dialogs->show(70616); - else if (_action.isAction(VERB_LOOK, 0x46E)) + else if (_action.isAction(VERB_LOOK, NOUN_PORTRAIT)) _vm->_dialogs->show(70617); - else if (_action.isAction(VERB_LOOK, 0x46C)) + else if (_action.isAction(VERB_LOOK, NOUN_NAME_PLATE)) _vm->_dialogs->show(70618); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(70619); - else if (_action.isAction(VERB_LOOK, 0x344)) { + else if (_action.isAction(VERB_LOOK, NOUN_PEDESTAL)) { if (_game._objects[OBJ_VASE]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(70620); else if (_game._objects[OBJ_BOTTLE]._roomNumber == _scene->_currentSceneId) _vm->_dialogs->show(70622); else _vm->_dialogs->show(70621); - } else if (_action.isAction(VERB_LOOK, 0x16C)) + } else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER)) _vm->_dialogs->show(70623); - else if (_action.isAction(VERB_LOOK, 0x17D) && (_game._objects[OBJ_VASE]._roomNumber == _scene->_currentSceneId)) + else if (_action.isAction(VERB_LOOK, NOUN_VASE) && (_game._objects[OBJ_VASE]._roomNumber == _scene->_currentSceneId)) _vm->_dialogs->show(70624); - else if (_action.isAction(VERB_LOOK, 0x2E) && (_action._mainObjectSource == 4)) + else if (_action.isAction(VERB_LOOK, NOUN_BOTTLE) && (_action._mainObjectSource == 4)) _vm->_dialogs->show(70632); else return; @@ -1970,21 +1970,21 @@ void Scene707::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(VERB_PEER_THROUGH, 0x181)) + if (_action.isAction(VERB_LOOK, NOUN_VIEWPORT) || _action.isAction(VERB_PEER_THROUGH, NOUN_VIEWPORT)) _vm->_dialogs->show(70710); - else if (_action.isAction(VERB_LOOK, 0xC4)) + else if (_action.isAction(VERB_LOOK, NOUN_KEYPAD)) _vm->_dialogs->show(70711); - else if (_action.isAction(VERB_LOOK, 0x1CC)) + else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY)) _vm->_dialogs->show(70712); - else if (_action.isAction(VERB_LOOK, 0x1D0) || _action.isAction(VERB_LOOK, 0x1D1) - || _action.isAction(VERB_LOOK, 0x1D2) || _action.isAction(VERB_LOOK, 0x1D3) - || _action.isAction(VERB_LOOK, 0x1D4) || _action.isAction(VERB_LOOK, 0x1D5) - || _action.isAction(VERB_LOOK, 0x1D6) || _action.isAction(VERB_LOOK, 0x1D7) - || _action.isAction(VERB_LOOK, 0x1D8) || _action.isAction(VERB_LOOK, 0x1D9) - || _action.isAction(VERB_LOOK, 0x1DB) || _action.isAction(VERB_LOOK, 0x7A) - || _action.isAction(VERB_LOOK, 0x1DA)) + else if (_action.isAction(VERB_LOOK, NOUN_0_KEY) || _action.isAction(VERB_LOOK, NOUN_1_KEY) + || _action.isAction(VERB_LOOK, NOUN_2_KEY) || _action.isAction(VERB_LOOK, NOUN_3_KEY) + || _action.isAction(VERB_LOOK, NOUN_4_KEY) || _action.isAction(VERB_LOOK, NOUN_5_KEY) + || _action.isAction(VERB_LOOK, NOUN_6_KEY) || _action.isAction(VERB_LOOK, NOUN_7_KEY) + || _action.isAction(VERB_LOOK, NOUN_8_KEY) || _action.isAction(VERB_LOOK, NOUN_9_KEY) + || _action.isAction(VERB_LOOK, NOUN_SMILE_KEY) || _action.isAction(VERB_LOOK, NOUN_ENTER_KEY) + || _action.isAction(VERB_LOOK, NOUN_FROWN_KEY)) _vm->_dialogs->show(70713); - else if (_action.isAction(VERB_LOOK, 0x1CF) || _action._lookFlag) + else if (_action.isAction(VERB_LOOK, NOUN_DEVICE) || _action._lookFlag) _vm->_dialogs->show(70714); else return; @@ -2214,13 +2214,13 @@ void Scene751::step() { } void Scene751::preActions() { - if (_action.isAction(VERB_LOOK, 0x470)) + if (_action.isAction(VERB_LOOK, NOUN_TALL_BUILDING)) _game._player.walk(Common::Point(154, 129), FACING_NORTHEAST); - if (_action.isAction(VERB_LOOK, 0x27, 0x470)) + if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x470)) _game._player.walk(Common::Point(154, 129), FACING_NORTH); - if (_action.isAction(VERB_WALKTO, 0x4AA)) + if (_action.isAction(VERB_WALKTO, NOUN_EAST_END_OF_PLATFORM)) _game._player._walkOffScreenSceneId = 752; if (!_rexHandingLine) @@ -2229,7 +2229,7 @@ void Scene751::preActions() { if (_action.isAction(VERB_LOOK) || _action.isAction(0x87) || _action.isAction(VERB_TALKTO)) _game._player._needToWalk = false; - if ((!_action.isAction(VERB_PUT, 0x87, 0x467) || !_action.isAction(0x170, 0x87, 0x467) || !_action.isAction(0x19, 0x87, 0x467)) + if ((!_action.isAction(VERB_PUT, NOUN_FISHING_LINE, 0x467) || !_action.isAction(0x170, 0x87, 0x467) || !_action.isAction(0x19, 0x87, 0x467)) && (_game._player._needToWalk)) { switch (_game._trigger) { case 0: @@ -2256,9 +2256,9 @@ void Scene751::preActions() { } void Scene751::actions() { - if (_action.isAction(VERB_WALK_ALONG, 0x22C)) + if (_action.isAction(VERB_WALK_ALONG, NOUN_PLATFORM)) ; // Nothing - else if (_action.isAction(VERB_LOOK, 0x27, 0x470)) { + else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, 0x470)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2284,7 +2284,7 @@ void Scene751::actions() { default: break; } - } else if (_action.isAction(VERB_STEP_INTO, 0x317)) { + } else if (_action.isAction(VERB_STEP_INTO, NOUN_ELEVATOR)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -2326,7 +2326,7 @@ void Scene751::actions() { default: break; } - } else if (_action.isAction(VERB_PUT, 0x87, 0x467) || _action.isAction(0x170, 0x87, 0x467) || _action.isAction(0x19, 0x87, 0x467)) { + } else if (_action.isAction(VERB_PUT, NOUN_FISHING_LINE, 0x467) || _action.isAction(0x170, 0x87, 0x467) || _action.isAction(0x19, 0x87, 0x467)) { if (_globals[kLineStatus] == 1) { switch (_game._trigger) { case 0: @@ -2374,28 +2374,28 @@ void Scene751::actions() { break; } } - } else if (_action._lookFlag || _action.isAction(VERB_LOOK, 0x38F)) + } else if (_action._lookFlag || _action.isAction(VERB_LOOK, NOUN_CITY)) _vm->_dialogs->show(75110); - else if (_action.isAction(VERB_LOOK, 0x317)) + else if (_action.isAction(VERB_LOOK, NOUN_ELEVATOR)) _vm->_dialogs->show(75112); - else if (_action.isAction(VERB_LOOK, 0x22C)) + else if (_action.isAction(VERB_LOOK, NOUN_PLATFORM)) _vm->_dialogs->show(75113); - else if (_action.isAction(VERB_LOOK, 0x316)) + else if (_action.isAction(VERB_LOOK, NOUN_CEMENT_PYLON)) _vm->_dialogs->show(75114); - else if ((_action.isAction(VERB_LOOK, 0x467) || _action.isAction(VERB_LOOK, 0x87)) + else if ((_action.isAction(VERB_LOOK, NOUN_HOOK) || _action.isAction(VERB_LOOK, NOUN_FISHING_LINE)) && (_globals[kLineStatus] == 2 || _globals[kLineStatus] == 3)) _vm->_dialogs->show(75116); - else if (_action.isAction(VERB_LOOK, 0x467)) + else if (_action.isAction(VERB_LOOK, NOUN_HOOK)) _vm->_dialogs->show(75115); - else if (_action.isAction(VERB_LOOK, 0x128)) + else if (_action.isAction(VERB_LOOK, NOUN_ROCK)) _vm->_dialogs->show(75117); - else if (_action.isAction(VERB_TAKE, 0x128)) + else if (_action.isAction(VERB_TAKE, NOUN_ROCK)) _vm->_dialogs->show(75118); - else if (_action.isAction(VERB_LOOK, 0x4AA)) + else if (_action.isAction(VERB_LOOK, NOUN_EAST_END_OF_PLATFORM)) _vm->_dialogs->show(75119); - else if (_action.isAction(VERB_TAKE, 0x87) && (_globals[kLineStatus] == 3 || _globals[kLineStatus] == 2)) + else if (_action.isAction(VERB_TAKE, NOUN_FISHING_LINE) && (_globals[kLineStatus] == 3 || _globals[kLineStatus] == 2)) _vm->_dialogs->show(75121); - else if (_action.isAction(VERB_LOOK, 0x470)) + 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)) _vm->_dialogs->show(75123); diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp index 6ecde8ae3d..3604c8bde1 100644 --- a/engines/mads/nebular/nebular_scenes8.cpp +++ b/engines/mads/nebular/nebular_scenes8.cpp @@ -243,13 +243,13 @@ void Scene801::step() { } void Scene801::preActions() { - if (_action.isAction(VERB_LOOK, 0x59)) { + if (_action.isAction(VERB_LOOK, NOUN_CONTROL_PANEL)) { _game._player.walk(Common::Point(148, 110), FACING_NORTH); _game._player._needToWalk = true; _game._player._readyToWalk = true; } - if (_action.isAction(VERB_WALK_INSIDE, 0x16C) && _globals[kBeamIsUp]) { + if (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER) && _globals[kBeamIsUp]) { _globals[kCutX] = _game._player._playerPos.x; _globals[kCutY] = _game._player._playerPos.y; _globals[kCutFacing] = _game._player._facing; @@ -260,13 +260,13 @@ void Scene801::preActions() { } void Scene801::actions() { - if (_action.isAction(VERB_LOOK, 0x59)) + if (_action.isAction(VERB_LOOK, NOUN_CONTROL_PANEL)) _scene->_nextSceneId = 808; - else if (_action.isAction(VERB_WALK_INSIDE, 0x16C)) { + else if (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER)) { _game._player._stepEnabled = false; _game._player._visible = false; _scene->_nextSceneId = 807; - } else if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && (_game._player._playerPos == Common::Point(270, 118))) { + } else if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOOR) && (_game._player._playerPos == Common::Point(270, 118))) { _game._player._stepEnabled = false; _game._player._facing = FACING_EAST; _game._player.selectSeries(); @@ -278,21 +278,21 @@ void Scene801::actions() { _scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 5); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 13); _vm->_sound->command(11); - } else if (_action.isAction(VERB_LOOK, 0x46)) + } else if (_action.isAction(VERB_LOOK, NOUN_CEILING)) _vm->_dialogs->show(80110); - else if (_action.isAction(VERB_LOOK, 0xE2)) + else if (_action.isAction(VERB_LOOK, NOUN_MONITOR)) _vm->_dialogs->show(80111); - else if (_action.isAction(VERB_LOOK, 0x16C)) + else if (_action.isAction(VERB_LOOK, NOUN_TELEPORTER)) _vm->_dialogs->show(80112); - else if (_action.isAction(VERB_LOOK, 0x2C7) || _action._lookFlag) + else if (_action.isAction(VERB_LOOK, NOUN_EQUIPMENT) || _action._lookFlag) _vm->_dialogs->show(80113); - else if (_action.isAction(VERB_LOOK, 0x390)) + else if (_action.isAction(VERB_LOOK, NOUN_SPEAKER)) _vm->_dialogs->show(80114); - else if (_action.isAction(VERB_LOOK, 0x391)) + else if (_action.isAction(VERB_LOOK, NOUN_EYE_CHART)) _vm->_dialogs->show(80115); - else if (_action.isAction(VERB_LOOK, 0x18D)) + else if (_action.isAction(VERB_LOOK, NOUN_WALL)) _vm->_dialogs->show(80116); - else if (_action.isAction(VERB_LOOK, 0x6E)) + else if (_action.isAction(VERB_LOOK, NOUN_DOOR)) _vm->_dialogs->show(80117); else return; @@ -391,20 +391,20 @@ void Scene802::step() { } void Scene802::preActions() { - if (_action.isAction(VERB_WALK_TOWARDS, 0x393)) + if (_action.isAction(VERB_WALK_TOWARDS, NOUN_BUILDING_TO_WEST)) _game._player._walkOffScreenSceneId = 801; - if (_action.isAction(VERB_WALK_DOWN, 0x1C1)) { + if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_EAST)) { _game._player._walkOffScreenSceneId = 803; _globals[kForceBeamDown] = false; } - if (_action.isAction(VERB_TAKE, 0x139)) + if (_action.isAction(VERB_TAKE, NOUN_SHIP)) _game._player._needToWalk = false; } void Scene802::actions() { - if (_action.isAction(VERB_TAKE, 0x137) && !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) { + if (_action.isAction(VERB_TAKE, NOUN_SHIELD_MODULATOR) && !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) { switch (_game._trigger) { case (0): _game._player._stepEnabled = false; @@ -436,7 +436,7 @@ void Scene802::actions() { default: break; } - } else if ((_action.isAction(VERB_TAKE, 0x123)) && (!_game._objects.isInInventory(OBJ_REMOTE))) { + } else if ((_action.isAction(VERB_TAKE, NOUN_REMOTE)) && (!_game._objects.isInInventory(OBJ_REMOTE))) { switch (_game._trigger) { case (0): _game._player._stepEnabled = false; @@ -470,37 +470,37 @@ void Scene802::actions() { break; } } else if (!_globals[kRemoteOnGround] && (_game._objects.isInInventory(OBJ_SHIELD_MODULATOR) || _globals[kShieldModInstalled]) - && (_action.isAction(VERB_LOOK, 0x392) || _action._lookFlag)) + && (_action.isAction(VERB_LOOK, NOUN_LAUNCH_PAD) || _action._lookFlag)) _vm->_dialogs->show(80210); else if (!_globals[kRemoteOnGround]&& !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR) && !_globals[kShieldModInstalled] - && (_action.isAction(VERB_LOOK, 0x392) || _action._lookFlag)) + && (_action.isAction(VERB_LOOK, NOUN_LAUNCH_PAD) || _action._lookFlag)) _vm->_dialogs->show(80211); else if (_globals[kRemoteOnGround] && !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR) && !_globals[kShieldModInstalled] - && (_action.isAction(VERB_LOOK, 0x392) || _action._lookFlag)) + && (_action.isAction(VERB_LOOK, NOUN_LAUNCH_PAD) || _action._lookFlag)) _vm->_dialogs->show(80213); else if (_globals[kRemoteOnGround] && (_game._objects.isInInventory(OBJ_SHIELD_MODULATOR) || _globals[kShieldModInstalled]) - && (_action.isAction(VERB_LOOK, 0x392) || _action._lookFlag)) + && (_action.isAction(VERB_LOOK, NOUN_LAUNCH_PAD) || _action._lookFlag)) _vm->_dialogs->show(80212); - else if (!_game._objects.isInInventory(OBJ_SHIELD_MODULATOR) && !_globals[kShieldModInstalled] && _action.isAction(VERB_LOOK, 0x137)) + else if (!_game._objects.isInInventory(OBJ_SHIELD_MODULATOR) && !_globals[kShieldModInstalled] && _action.isAction(VERB_LOOK, NOUN_SHIELD_MODULATOR)) _vm->_dialogs->show(80214); - else if (_globals[kRemoteOnGround] && _action.isAction(VERB_LOOK, 0x123)) + else if (_globals[kRemoteOnGround] && _action.isAction(VERB_LOOK, NOUN_REMOTE)) _vm->_dialogs->show(80216); - else if (_action.isAction(VERB_LOOK, 0x139)) { + else if (_action.isAction(VERB_LOOK, NOUN_SHIP)) { if ((!_game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) && (!_globals[kShieldModInstalled])) _vm->_dialogs->show(80218); else _vm->_dialogs->show(80217); - } else if (_action.isAction(VERB_LOOK, 0x39)) + } else if (_action.isAction(VERB_LOOK, NOUN_BUSHES)) _vm->_dialogs->show(80219); - else if (_action.isAction(VERB_LOOK, 0x1C1)) + else if (_action.isAction(VERB_LOOK, NOUN_PATH_TO_EAST)) _vm->_dialogs->show(80220); - else if (_action.isAction(VERB_LOOK, 0x142)) + else if (_action.isAction(VERB_LOOK, NOUN_SKY)) _vm->_dialogs->show(80221); - else if (_action.isAction(VERB_TAKE, 0x139)) + else if (_action.isAction(VERB_TAKE, NOUN_SHIP)) _vm->_dialogs->show(80222); - else if (_action.isAction(VERB_LOOK, 0x174) || _action.isAction(VERB_LOOK, 0x175)) + else if (_action.isAction(VERB_LOOK, NOUN_TREE) || _action.isAction(VERB_LOOK, NOUN_TREES)) _vm->_dialogs->show(80224); - else if (_action.isAction(VERB_LOOK, 0x393)) + else if (_action.isAction(VERB_LOOK, NOUN_BUILDING_TO_WEST)) _vm->_dialogs->show(80225); else return; @@ -731,15 +731,15 @@ void Scene803::step() { } void Scene803::preActions() { - if (_action.isAction(VERB_WALK_DOWN, 0x1AE)) + if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_WEST)) _game._player._walkOffScreenSceneId = 802; - if (_action.isAction(VERB_TAKE, 0x139)) + if (_action.isAction(VERB_TAKE, NOUN_SHIP)) _game._player._needToWalk = false; } void Scene803::actions() { - if (_action.isAction(VERB_TAKE, 0x472)) { + if (_action.isAction(VERB_TAKE, NOUN_GUTS)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -783,7 +783,7 @@ void Scene803::actions() { default: break; } - } else if (_action.isAction(VERB_ENTER, 0x139)) { + } else if (_action.isAction(VERB_ENTER, NOUN_SHIP)) { _vm->_sound->command(17); _game._player._stepEnabled = false; _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; @@ -792,28 +792,28 @@ void Scene803::actions() { _scene->_sequences.setDepth(_globals._sequenceIndexes[6], 4); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 120); _globals[kBeamIsUp] = false; - } else if (_action.isAction(VERB_LOOK, 0x392)) + } else if (_action.isAction(VERB_LOOK, NOUN_LAUNCH_PAD)) _vm->_dialogs->show(80310); else if (_action._lookFlag) _vm->_dialogs->show(80310); - else if (_action.isAction(VERB_LOOK, 0x395)) + else if (_action.isAction(VERB_LOOK, NOUN_PAD_TO_WEST)) _vm->_dialogs->show(80311); - else if (_action.isAction(VERB_LOOK, 0x472)) { + else if (_action.isAction(VERB_LOOK, NOUN_GUTS)) { if (_game._storyMode == STORYMODE_NICE) _vm->_dialogs->show(80312); else _vm->_dialogs->show(80313); - } else if (_action.isAction(VERB_LOOK, 0x39)) + } else if (_action.isAction(VERB_LOOK, NOUN_BUSHES)) _vm->_dialogs->show(80315); - else if (_action.isAction(VERB_LOOK, 0x139)) + else if (_action.isAction(VERB_LOOK, NOUN_SHIP)) _vm->_dialogs->show(80317); - else if (_action.isAction(VERB_LOOK, 0x396)) + else if (_action.isAction(VERB_LOOK, NOUN_TOWER)) _vm->_dialogs->show(80318); - else if (_action.isAction(VERB_LOOK, 0x174) || _action.isAction(VERB_LOOK, 0x175)) + else if (_action.isAction(VERB_LOOK, NOUN_TREE) || _action.isAction(VERB_LOOK, NOUN_TREES)) _vm->_dialogs->show(80319); - else if (_action.isAction(VERB_LOOK, 0x142)) + else if (_action.isAction(VERB_LOOK, NOUN_SKY)) _vm->_dialogs->show(80320); - else if (_action.isAction(VERB_TAKE, 0x139)) + else if (_action.isAction(VERB_TAKE, NOUN_SHIP)) _vm->_dialogs->show(80321); else return; @@ -1132,39 +1132,39 @@ void Scene805::preActions() { } void Scene805::actions() { - if (_action.isAction(VERB_EXIT, 0x398)) + if (_action.isAction(VERB_EXIT, NOUN_SERVICE_PANEL)) _scene->_nextSceneId = 804; - else if (_action.isAction(VERB_INSTALL, 0x137) && _game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) { + else if (_action.isAction(VERB_INSTALL, NOUN_SHIELD_MODULATOR) && _game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], -1, -2); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 70); _game._player._stepEnabled = false; - } else if (_action.isAction(VERB_INSTALL, 0x167) && _game._objects.isInInventory(OBJ_TARGET_MODULE)) { + } else if (_action.isAction(VERB_INSTALL, NOUN_TARGET_MODULE) && _game._objects.isInInventory(OBJ_TARGET_MODULE)) { _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, -2); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 80); _game._player._stepEnabled = false; - } else if (_action.isAction(VERB_REMOVE, 0x137) && _globals[kShieldModInstalled]) { + } else if (_action.isAction(VERB_REMOVE, NOUN_SHIELD_MODULATOR) && _globals[kShieldModInstalled]) { _scene->_sequences.remove(_globals._sequenceIndexes[1]); _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], -1, -2); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71); _game._player._stepEnabled = false; - } else if (_action.isAction(VERB_REMOVE, 0x167) && _globals[kTargetModInstalled]) { + } else if (_action.isAction(VERB_REMOVE, NOUN_TARGET_MODULE) && _globals[kTargetModInstalled]) { _scene->_sequences.remove(_globals._sequenceIndexes[2]); _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, -2); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 81); _game._player._stepEnabled = false; - } else if (_action.isAction(VERB_INSTALL, 0x137) && !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) + } else if (_action.isAction(VERB_INSTALL, NOUN_SHIELD_MODULATOR) && !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) _vm->_dialogs->show(80511); - else if (_action.isAction(VERB_INSTALL, 0x167) && !_game._objects.isInInventory(OBJ_TARGET_MODULE)) + else if (_action.isAction(VERB_INSTALL, NOUN_TARGET_MODULE) && !_game._objects.isInInventory(OBJ_TARGET_MODULE)) _vm->_dialogs->show(80510); - else if (_action.isAction(VERB_REMOVE, 0x475)) + else if (_action.isAction(VERB_REMOVE, NOUN_LIFE_SUPPORT_MODULE)) _vm->_dialogs->show(80512); else return; @@ -1205,22 +1205,22 @@ void Scene807::actions() { return; } - if (_action.isAction(VERB_LOOK, 0x181)) + if (_action.isAction(VERB_LOOK, NOUN_VIEWPORT)) _vm->_dialogs->show(80710); - else if (_action.isAction(VERB_PEER_THROUGH, 0x181)) + else if (_action.isAction(VERB_PEER_THROUGH, NOUN_VIEWPORT)) _vm->_dialogs->show(80710); - else if (_action.isAction(VERB_LOOK, 0xC4) && _action.isAction(VERB_INSPECT, 0xC4)) + else if (_action.isAction(VERB_LOOK, NOUN_KEYPAD) && _action.isAction(VERB_INSPECT, NOUN_KEYPAD)) _vm->_dialogs->show(80711); - else if (_action.isAction(VERB_LOOK, 0x1CC)) + else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY)) _vm->_dialogs->show(80712); - else if (_action.isAction(VERB_LOOK, 0x1D1) || _action.isAction(VERB_LOOK, 0x1D2) - || _action.isAction(VERB_LOOK, 0x1D3) || _action.isAction(VERB_LOOK, 0x1D4) - || _action.isAction(VERB_LOOK, 0x1D5) || _action.isAction(VERB_LOOK, 0x1D6) - || _action.isAction(VERB_LOOK, 0x1D7) || _action.isAction(VERB_LOOK, 0x1D8) - || _action.isAction(VERB_LOOK, 0x1D9) || _action.isAction(VERB_LOOK, 0x1D0) - || _action.isAction(VERB_LOOK, 0x1DB) || _action.isAction(VERB_LOOK, 0x1DA)) + else if (_action.isAction(VERB_LOOK, NOUN_1_KEY) || _action.isAction(VERB_LOOK, NOUN_2_KEY) + || _action.isAction(VERB_LOOK, NOUN_3_KEY) || _action.isAction(VERB_LOOK, NOUN_4_KEY) + || _action.isAction(VERB_LOOK, NOUN_5_KEY) || _action.isAction(VERB_LOOK, NOUN_6_KEY) + || _action.isAction(VERB_LOOK, NOUN_7_KEY) || _action.isAction(VERB_LOOK, NOUN_8_KEY) + || _action.isAction(VERB_LOOK, NOUN_9_KEY) || _action.isAction(VERB_LOOK, NOUN_0_KEY) + || _action.isAction(VERB_LOOK, NOUN_SMILE_KEY) || _action.isAction(VERB_LOOK, NOUN_FROWN_KEY)) _vm->_dialogs->show(80713); - else if (_action.isAction(VERB_LOOK, 0x1CF) && _action._lookFlag) + else if (_action.isAction(VERB_LOOK, NOUN_DEVICE) && _action._lookFlag) _vm->_dialogs->show(80714); else return; @@ -1277,7 +1277,7 @@ void Scene808::enter() { } void Scene808::actions() { - if (_action.isAction(VERB_PRESS, 0x3BC)) { + if (_action.isAction(VERB_PRESS, NOUN_START_BUTTON_2)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1313,7 +1313,7 @@ void Scene808::actions() { default: break; } - } else if (_action.isAction(VERB_PRESS, 0x3BE)) { + } else if (_action.isAction(VERB_PRESS, NOUN_TIMER_BUTTON_2)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1343,7 +1343,7 @@ void Scene808::actions() { default: break; } - } else if (_action.isAction(VERB_PRESS, 0x3BD)) { + } else if (_action.isAction(VERB_PRESS, NOUN_REMOTE_BUTTON_2)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1374,7 +1374,7 @@ void Scene808::actions() { default: break; } - } else if (_action.isAction(VERB_PRESS, 0x3BF)) { + } else if (_action.isAction(VERB_PRESS, NOUN_START_BUTTON_1)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1391,7 +1391,7 @@ void Scene808::actions() { default: break; } - } else if (_action.isAction(VERB_PRESS, 0x3BB)) { + } else if (_action.isAction(VERB_PRESS, NOUN_REMOTE_BUTTON_1)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1408,7 +1408,7 @@ void Scene808::actions() { default: break; } - } else if (_action.isAction(VERB_PRESS, 0x3BA)) { + } else if (_action.isAction(VERB_PRESS, NOUN_TIMER_BUTTON_1)) { switch (_game._trigger) { case 0: _game._player._stepEnabled = false; @@ -1425,7 +1425,7 @@ void Scene808::actions() { default: break; } - } else if (_action.isAction(VERB_EXIT, 0x1E0)) { + } else if (_action.isAction(VERB_EXIT, NOUN_PANEL)) { _scene->_nextSceneId = 801; _globals[kBetweenRooms] = true; } else |