aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/mads/nebular/nebular_scenes.cpp8
-rw-r--r--engines/mads/nebular/nebular_scenes.h20
-rw-r--r--engines/mads/nebular/nebular_scenes2.cpp28
3 files changed, 38 insertions, 18 deletions
diff --git a/engines/mads/nebular/nebular_scenes.cpp b/engines/mads/nebular/nebular_scenes.cpp
index fb7bb057c9..3d26a41497 100644
--- a/engines/mads/nebular/nebular_scenes.cpp
+++ b/engines/mads/nebular/nebular_scenes.cpp
@@ -561,9 +561,9 @@ void SceneTeleporter::teleporterEnter() {
bool SceneTeleporter::teleporterActions() {
bool retVal = false;
- static int _buttonList[12] = { 0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x1D4, 0x1D5, 0x1D6, 0x1D7, 0x1D8, 0x1D9, 0x1DB, 0x1DA };
+ static int _buttonList[12] = { NOUN_0_KEY, NOUN_1_KEY, NOUN_2_KEY, NOUN_3_KEY, NOUN_4_KEY, NOUN_5_KEY, NOUN_6_KEY, NOUN_7_KEY, NOUN_8_KEY, NOUN_9_KEY, NOUN_SMILE_KEY, NOUN_FROWN_KEY };
- if (_action.isAction(0x11A) || _action.isAction(VERB_PUSH)) {
+ if (_action.isAction(VERB_PRESS) || _action.isAction(VERB_PUSH)) {
for (int i = 0; i < 12; i++) {
if (_action._activeAction._objectNameId == _buttonList[i])
_buttonTyped = i;
@@ -572,7 +572,7 @@ bool SceneTeleporter::teleporterActions() {
retVal = true;
}
- if (_action.isAction(0x1CE, 0x1CF)) {
+ if (_action.isAction(VERB_EXIT_FROM, NOUN_DEVICE)) {
_globals[kTeleporterCommand] = 3;
_scene->_nextSceneId = _teleporterSceneId;
retVal = true;
@@ -595,7 +595,7 @@ void SceneTeleporter::teleporterStep() {
} else {
digit = 10;
}
- _buttonTyped = digit;
+ _buttonTyped = digit;
_meteorologistCurPlace = place + 1;
_game._trigger = -1;
}
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index d02f6cbd51..dc35b11b80 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -52,6 +52,7 @@ enum Verb {
VERB_LOOK_IN = 0x0D2,
VERB_LOOK_THROUGH = 0x0D3,
VERB_PEER_THROUGH = 0x103,
+ VERB_PRESS = 0x11A,
VERB_READ = 0x11F,
VERB_SHOOT = 0x13A,
VERB_SIT_IN = 0x13F,
@@ -59,6 +60,7 @@ enum Verb {
VERB_WALK_THROUGH = 0x18B,
VERB_WALK_TOWARDS = 0x18C,
VERB_WALK_DOWN = 0x1AD,
+ VERB_EXIT_FROM = 0x1CE,
VERB_CLIMB_INTO = 0x2F7,
VERB_STEP_INTO = 0x2F9,
VERB_WALK_ALONG = 0x312,
@@ -76,8 +78,10 @@ enum Noun {
NOUN_CHAIR = 0x47,
NOUN_CHICKEN = 0x49,
NOUN_CHICKEN_BOMB = 0x4A,
+ NOUN_CONTROL_PANEL = 0x59,
NOUN_DEAD_FISH = 0x65,
NOUN_DOOR = 0x6E,
+ NOUN_ENTER_KEY = 0x7A,
NOUN_FISHING_LINE = 0x87,
NOUN_FRONT_WINDOW = 0x8E,
NOUN_FUZZY_DICE = 0x91,
@@ -85,6 +89,7 @@ enum Noun {
NOUN_HULL = 0x0A8,
NOUN_ID_CARD = 0x0B3,
NOUN_JUNGLE = 0x0B8,
+ NOUN_KEYPAD = 0x0C4,
NOUN_LADDER = 0x0C7,
NOUN_LIFE_SUPPORT_SECTION = 0x0CC,
NOUN_LOG = 0x0D0,
@@ -106,12 +111,27 @@ enum Noun {
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_PILE_OF_LEAVES = 0x1AA,
NOUN_STRANGE_DEVICE = 0x1B6,
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,
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index b38aaceec1..256bdad4b5 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -4861,7 +4861,7 @@ void Scene213::setup() {
}
void Scene213::enter() {
- if (_globals[kMeteorologistWatch] != METEOROLOGIST_ABSENT)
+ if (_globals[kMeteorologistWatch] != METEOROLOGIST_NORMAL)
_handSpriteId = _scene->_sprites.addSprites("*METHAND");
else if (_globals[kSexOfRex] == REX_MALE)
_handSpriteId = _scene->_sprites.addSprites("*REXHAND");
@@ -4872,7 +4872,7 @@ void Scene213::enter() {
// The original is calling Scene2xx::sceneEntrySound()
if (_vm->_musicFlag) {
- if (_globals[kMeteorologistWatch] == METEOROLOGIST_ABSENT)
+ if (_globals[kMeteorologistWatch] == METEOROLOGIST_NORMAL)
_vm->_sound->command(1);
else
_vm->_sound->command(9);
@@ -4890,23 +4890,23 @@ void Scene213::actions() {
return;
}
- if (_action.isAction(VERB_LOOK, 0x59))
+ if (_action.isAction(VERB_LOOK, NOUN_CONTROL_PANEL))
_vm->_dialogs->show(21301);
- else if (_action.isAction(VERB_LOOK, 0xC4) || _action.isAction (0xB7, 0xC4))
+ else if (_action.isAction(VERB_LOOK, NOUN_KEYPAD) || _action.isAction (VERB_INSPECT, NOUN_KEYPAD))
_vm->_dialogs->show(21302);
- else if (_action.isAction(VERB_LOOK, 0x1CC))
+ else if (_action.isAction(VERB_LOOK, NOUN_DISPLAY))
_vm->_dialogs->show(21303);
- else if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(0x103, 0x181))
+ else if (_action.isAction(VERB_LOOK, NOUN_VIEWPORT) || _action.isAction(VERB_PEER_THROUGH, NOUN_VIEWPORT))
_vm->_dialogs->show(21304);
- else if (_action.isAction(VERB_LOOK, 0x1CF))
+ else if (_action.isAction(VERB_LOOK, NOUN_DEVICE))
_vm->_dialogs->show(21305);
- 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_FROWN_KEY)
+ || _action.isAction(VERB_LOOK, NOUN_ENTER_KEY))
_vm->_dialogs->show(21306);
else
return;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 23:19:58 +0000