[Scummvm-git-logs] scummvm master -> 962459a07fc0242acf51efe41a1ba07530e3a65c
dreammaster
noreply at scummvm.org
Sun Aug 16 04:25:28 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
35beb32c65 MADS: NEBULAR: Fix warnings. PVS-Studio V1009, V560, V519, V547, V779
5669ec0010 MADS: NEBULAR: Fix warnings. PVS-Studio V512, V1048, V560
962459a07f MADS: NEBULAR: Change all player2.words comparisons to use words enum
Commit: 35beb32c6573df84cc6648034355b4807a06eb32
https://github.com/scummvm/scummvm/commit/35beb32c6573df84cc6648034355b4807a06eb32
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-16T13:49:02+10:00
Commit Message:
MADS: NEBULAR: Fix warnings. PVS-Studio V1009, V560, V519, V547, V779
Changed paths:
engines/mads/nebular/extra.cpp
engines/mads/nebular/mac_dialogs.cpp
engines/mads/nebular/main_menu.cpp
engines/mads/nebular/menus.cpp
engines/mads/nebular/mps_installer.cpp
diff --git a/engines/mads/nebular/extra.cpp b/engines/mads/nebular/extra.cpp
index 27c4828aa16..d6b346101db 100644
--- a/engines/mads/nebular/extra.cpp
+++ b/engines/mads/nebular/extra.cpp
@@ -321,11 +321,12 @@ RoomPtr room_load(int id, int variant, const char *base_path, Buffer *picture,
bool sceneFlag = id >= 0;
int width, height;
SeriesPtr sprites[10] = { nullptr };
- int16 spritesHandles[10] = { -1 };
+ int16 spritesHandles[10];
// Initialize structures
mem_last_alloc_loader = MODULE_ROOM_LOADER;
load_handle.open = false;
+ Common::fill(spritesHandles, spritesHandles + 10, -1);
// Open the room data file
room_resolve_base(base, temp_buf, id, base_path);
diff --git a/engines/mads/nebular/mac_dialogs.cpp b/engines/mads/nebular/mac_dialogs.cpp
index 5e00f7cfdea..95098d40460 100644
--- a/engines/mads/nebular/mac_dialogs.cpp
+++ b/engines/mads/nebular/mac_dialogs.cpp
@@ -89,7 +89,7 @@ bool MacNebularDialog::loadDialogResource(uint16 resourceID,
stream->skip(10);
itemResourceID = stream->readUint16BE();
/* Common::String title = */ stream->readPascalString();
- valid = valid && !stream->err() && _bounds.isValidRect();
+ valid = !stream->err() && _bounds.isValidRect();
}
delete stream;
return valid;
diff --git a/engines/mads/nebular/main_menu.cpp b/engines/mads/nebular/main_menu.cpp
index e13d14cdc90..d6dbe6d317e 100644
--- a/engines/mads/nebular/main_menu.cpp
+++ b/engines/mads/nebular/main_menu.cpp
@@ -344,8 +344,6 @@ void menu_control() {
going = true;
must_perform_matte = false;
- frame_clock = 0;
-
g_engine->_soundManager->init(7);
sound_queue(N_TitleScreen);
diff --git a/engines/mads/nebular/menus.cpp b/engines/mads/nebular/menus.cpp
index aaa656611cd..6a5e0a1138c 100644
--- a/engines/mads/nebular/menus.cpp
+++ b/engines/mads/nebular/menus.cpp
@@ -1311,10 +1311,7 @@ static void game_menu_save() {
image_marker = 0;
first_time = 0;
- if (special_sprite >= 0) {
- image_list[special_sprite].flags = IMAGE_ERASE;
- }
-
+ image_list[special_sprite].flags = IMAGE_ERASE;
game_menu_changed = false;
}
@@ -1505,10 +1502,7 @@ static void game_menu_restore() {
image_marker = 0;
first_time = 0;
- if (special_sprite >= 0) {
- image_list[special_sprite].flags = IMAGE_ERASE;
- }
-
+ image_list[special_sprite].flags = IMAGE_ERASE;
game_menu_changed = false;
}
diff --git a/engines/mads/nebular/mps_installer.cpp b/engines/mads/nebular/mps_installer.cpp
index 1cbb8f103f6..33dd6671551 100644
--- a/engines/mads/nebular/mps_installer.cpp
+++ b/engines/mads/nebular/mps_installer.cpp
@@ -105,8 +105,6 @@ Common::SharedArchiveContents MpsInstaller::readContentsForPath(const Common::Pa
Common::Path volumePath = _baseName.append(Common::String::format(".%03d", vol));
if (!fvol.open(volumePath)) {
error("Failed to open volume %s.%03d", volumePath.toString(Common::Path::kNativeSeparator).c_str(), vol);
- delete[] compressedBuf;
- return Common::SharedArchiveContents();
}
fvol.seek(off);
int32 actual = fvol.read(outptr, rem);
Commit: 5669ec001037f87309f5c703c3351cfb54775c7a
https://github.com/scummvm/scummvm/commit/5669ec001037f87309f5c703c3351cfb54775c7a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-16T13:57:32+10:00
Commit Message:
MADS: NEBULAR: Fix warnings. PVS-Studio V512, V1048, V560
Changed paths:
engines/mads/nebular/popup.cpp
engines/mads/nebular/rooms/room106.cpp
engines/mads/nebular/rooms/room201.cpp
engines/mads/nebular/rooms/room318.cpp
engines/mads/nebular/rooms/room319.cpp
diff --git a/engines/mads/nebular/popup.cpp b/engines/mads/nebular/popup.cpp
index 9ba56827223..8edb80bde0d 100644
--- a/engines/mads/nebular/popup.cpp
+++ b/engines/mads/nebular/popup.cpp
@@ -195,7 +195,7 @@ void popup_setup_cycle() {
memcpy(&cycling_palette[Graphics::PALETTE_COUNT - PALETTE_CYCLING_AREA].r,
&master_palette[Graphics::PALETTE_COUNT - PALETTE_CYCLING_AREA].r,
- PALETTE_CYCLING_AREA * 3);
+ PALETTE_CYCLING_AREA * sizeof(RGBcolor));
pal_grey(master_palette, DIALOG_CONTENT1_COLOR, 2, 36, 32);
pal_grey(master_palette, DIALOG_EDGE_COLOR, 2, 39, 28);
pal_grey(master_palette, DIALOG_FC_COLOR, 2, 36, 32);
diff --git a/engines/mads/nebular/rooms/room106.cpp b/engines/mads/nebular/rooms/room106.cpp
index 979a2d9d2ff..47f02b9938c 100644
--- a/engines/mads/nebular/rooms/room106.cpp
+++ b/engines/mads/nebular/rooms/room106.cpp
@@ -159,7 +159,6 @@ static void room_106_daemon() {
break;
default:
- msgId = -1;
player.commands_allowed = true;
break;
}
diff --git a/engines/mads/nebular/rooms/room201.cpp b/engines/mads/nebular/rooms/room201.cpp
index d247d56c9f9..548bafb2f03 100644
--- a/engines/mads/nebular/rooms/room201.cpp
+++ b/engines/mads/nebular/rooms/room201.cpp
@@ -83,7 +83,6 @@ static void room_201_init() {
case 3:
player.walker_visible = true;
player.commands_allowed = true;
- suffixNum = -1;
break;
case 4:
suffixNum = 2;
diff --git a/engines/mads/nebular/rooms/room318.cpp b/engines/mads/nebular/rooms/room318.cpp
index 2fc0aac2247..4e5dac01142 100644
--- a/engines/mads/nebular/rooms/room318.cpp
+++ b/engines/mads/nebular/rooms/room318.cpp
@@ -412,7 +412,7 @@ static void room_318_daemon() {
}
uint32 tmpFrame = timer_read();
- long diffFrame = tmpFrame - local._lastFrameCounter;
+ int32 diffFrame = tmpFrame - local._lastFrameCounter;
local._lastFrameCounter = tmpFrame;
if ((local._animMode == 2) && !local._internVisibleFl && player.commands_allowed) {
diff --git a/engines/mads/nebular/rooms/room319.cpp b/engines/mads/nebular/rooms/room319.cpp
index a3c53f2afc3..4cb38750c2d 100644
--- a/engines/mads/nebular/rooms/room319.cpp
+++ b/engines/mads/nebular/rooms/room319.cpp
@@ -461,7 +461,7 @@ static void room_319_parser() {
if ((player2.words[0] == 0x168) || (player2.words[0] == 0x167)) {
curDialog = &local._dialog1;
nextDocQuote = 0x161;
- } else if ((player2.words[0] == 0x174) || (player2.words[0] == 0x1753)) {
+ } else if ((player2.words[0] == 0x174) || (player2.words[0] == 0x173)) {
nextDocQuote = 0x16D;
curDialog = &local._dialog2;
} else {
Commit: 962459a07fc0242acf51efe41a1ba07530e3a65c
https://github.com/scummvm/scummvm/commit/962459a07fc0242acf51efe41a1ba07530e3a65c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-16T14:19:15+10:00
Commit Message:
MADS: NEBULAR: Change all player2.words comparisons to use words enum
Changed paths:
engines/mads/nebular/rooms/room202.cpp
engines/mads/nebular/rooms/room205.cpp
engines/mads/nebular/rooms/room210.cpp
engines/mads/nebular/rooms/room307.cpp
engines/mads/nebular/rooms/room318.cpp
engines/mads/nebular/rooms/room319.cpp
engines/mads/nebular/rooms/room320.cpp
engines/mads/nebular/rooms/room402.cpp
engines/mads/nebular/rooms/room411.cpp
engines/mads/nebular/rooms/room611.cpp
diff --git a/engines/mads/nebular/rooms/room202.cpp b/engines/mads/nebular/rooms/room202.cpp
index 3f955c561e7..2f2eea439e6 100644
--- a/engines/mads/nebular/rooms/room202.cpp
+++ b/engines/mads/nebular/rooms/room202.cpp
@@ -452,7 +452,7 @@ static void room_202_pre_parser() {
}
}
- if (player_said_2(look, binoculars) && (player2.words[2] > 0)) {
+ if (player_said_2(look, binoculars) && (player2.words[2] > words_none)) {
if (!player.ready_to_walk || local._ladderTopFl)
player.need_to_walk = false;
else
diff --git a/engines/mads/nebular/rooms/room205.cpp b/engines/mads/nebular/rooms/room205.cpp
index ce32e9da937..45458bbc19b 100644
--- a/engines/mads/nebular/rooms/room205.cpp
+++ b/engines/mads/nebular/rooms/room205.cpp
@@ -173,30 +173,30 @@ static void room_205_parser() {
player.commands_allowed = false;
kernel_message_add(quote_string(kernel.quotes, player2.words[0]), 0, 0, 0x1110, 120, 1, 18);
} else {
- if ((kernel.trigger > 1) || (player2.words[0] != 0x76))
+ if ((kernel.trigger > 1) || (player2.words[0] != words_eject))
player.commands_allowed = true;
switch (player2.words[0]) {
- case 0x5A:
+ case words_coral:
handleWomanSpeech(0x7A);
local._dialog1.write(0x78, true);
local._dialog1.write(0x5A, false);
break;
- case 0x74:
+ case words_eastern_cliff_face:
handleWomanSpeech(0x7C);
local._dialog1.write(0x74, false);
local._dialog1.write(0x76, true);
break;
- case 0x75:
- case 0x78:
+ case words_eat:
+ case words_engineering_controls:
handleWomanSpeech(0x7B);
local._dialog1.write(player2.words[0], false);
text_show(20501);
break;
- case 0x76:
+ case words_eject:
if (kernel.trigger == 1) {
handleWomanSpeech(0x7D);
kernel_timing_trigger(120, 2);
@@ -207,7 +207,7 @@ static void room_205_parser() {
}
break;
- case 0x77:
+ case words_empty:
kernel_message_add(quote_string(kernel.quotes, 0x7F), 186, 27, 0xFBFA, 120, 0, 0);
kernel_set_interface_mode(INTER_BUILDING_SENTENCES);
break;
@@ -216,7 +216,7 @@ static void room_205_parser() {
break;
}
- if (player2.words[0] != 0x77)
+ if (player2.words[0] != words_empty)
local._dialog1.start();
}
} else if (player.look_around)
diff --git a/engines/mads/nebular/rooms/room210.cpp b/engines/mads/nebular/rooms/room210.cpp
index 3219da1f5e6..fd5fe0a77e7 100644
--- a/engines/mads/nebular/rooms/room210.cpp
+++ b/engines/mads/nebular/rooms/room210.cpp
@@ -396,23 +396,23 @@ static void setDialogNode(int node) {
static void handleConversation1() {
switch (player2.words[0]) {
- case 180:
+ case words_ignite:
setDialogNode(2);
break;
- case 181:
+ case words_inflate:
setDialogNode(6);
break;
- case 182:
+ case words_insert:
setDialogNode(4);
break;
- case 183:
+ case words_inspect:
setDialogNode(9);
break;
- case 184:
+ case words_jungle:
setDialogNode(0);
break;
@@ -423,15 +423,15 @@ static void handleConversation1() {
static void handleConversation2() {
switch (player2.words[0]) {
- case 187:
+ case words_key_1:
setDialogNode(3);
break;
- case 188:
+ case words_key_2:
setDialogNode(4);
break;
- case 189:
+ case words_key_3:
setDialogNode(0);
break;
@@ -442,19 +442,19 @@ static void handleConversation2() {
static void handleConversation3() {
switch (player2.words[0]) {
- case 193:
+ case words_key_7:
setDialogNode(6);
break;
- case 194:
+ case words_key_8:
setDialogNode(5);
break;
- case 195:
+ case words_key_9:
setDialogNode(4);
break;
- case 196:
+ case words_keypad:
setDialogNode(0);
break;
@@ -465,16 +465,16 @@ static void handleConversation3() {
static void handleConversation5() {
switch (player2.words[0]) {
- case 204:
+ case words_life_support_section:
setDialogNode(6);
break;
- case 205:
- case 206:
+ case words_light:
+ case words_load:
setDialogNode(4);
break;
- case 207:
+ case words_lock:
setDialogNode(0);
break;
@@ -485,15 +485,15 @@ static void handleConversation5() {
static void handleConversation6() {
switch (player2.words[0]) {
- case 211:
+ case words_look_through:
setDialogNode(7);
break;
- case 212:
+ case words_lounge_area:
setDialogNode(4);
break;
- case 213:
+ case words_love_altar:
setDialogNode(0);
break;
@@ -504,17 +504,17 @@ static void handleConversation6() {
static void handleConversation7() {
switch (player2.words[0]) {
- case 216:
- case 217:
- case 219:
+ case words_magnet:
+ case words_main_airlock:
+ case words_marshy_wetlands:
setDialogNode(4);
break;
- case 218:
+ case words_manta_ray:
setDialogNode(8);
break;
- case 220:
+ case words_match:
setDialogNode(0);
break;
@@ -525,17 +525,17 @@ static void handleConversation7() {
static void handleConversation8() {
switch (player2.words[0]) {
- case 223:
- case 224:
+ case words_men_who_came_before:
+ case words_mine:
setDialogNode(4);
break;
- case 225:
- case 226:
+ case words_mirror:
+ case words_monitor:
setDialogNode(9);
break;
- case 227:
+ case words_monkey:
setDialogNode(0);
break;
diff --git a/engines/mads/nebular/rooms/room307.cpp b/engines/mads/nebular/rooms/room307.cpp
index 2e730c4b193..4acf4a95174 100644
--- a/engines/mads/nebular/rooms/room307.cpp
+++ b/engines/mads/nebular/rooms/room307.cpp
@@ -200,15 +200,15 @@ static void setDialogNode(int node) {
static void handlePrisonerEncounter() {
switch (player2.words[0]) {
- case 275:
+ case words_plunger:
setDialogNode(5);
break;
- case 277:
+ case words_polycement:
setDialogNode(4);
break;
- case 276:
+ case words_poison_darts:
setDialogNode(6);
break;
@@ -219,39 +219,39 @@ static void handlePrisonerEncounter() {
static void handlePrisonerDialog() {
switch (player2.words[0]) {
- case 0x11A:
+ case words_press:
setDialogNode(7);
break;
- case 0x11B:
+ case words_pressure_gauge:
setDialogNode(8);
break;
- case 0x11C:
+ case words_pry:
setDialogNode(12);
break;
- case 0x11D:
+ case words_raging_river:
setDialogNode(9);
break;
- case 0x11E:
+ case words_ramolyan_rugby_rats:
setDialogNode(10);
break;
- case 0x11F:
+ case words_read:
setDialogNode(11);
break;
- case 0x120:
+ case words_rearview_mirror:
setDialogNode(13);
break;
- case 0x121:
+ case words_rebreather:
setDialogNode(14);
break;
- case 0x122:
+ case words_refrigerator:
setDialogNode(15);
break;
diff --git a/engines/mads/nebular/rooms/room318.cpp b/engines/mads/nebular/rooms/room318.cpp
index 4e5dac01142..1c1d8006869 100644
--- a/engines/mads/nebular/rooms/room318.cpp
+++ b/engines/mads/nebular/rooms/room318.cpp
@@ -117,68 +117,68 @@ static void handleDialog() {
kernel_set_interface_mode(INTER_BUILDING_SENTENCES);
player.commands_allowed = true;
} else {
- if (player2.words[0] < 0x19C)
+ if (player2.words[0] < words_grass)
local._dialog1.write(player2.words[0], false);
switch (player2.words[0]) {
- case 0x191:
+ case words_wear:
handleInternDialog(0x19E, 2, INDEFINITE_TIMEOUT);
local._dialog1.write(0x192, true);
break;
- case 0x192:
+ case words_weather_station:
handleInternDialog(0x1A0, 5, INDEFINITE_TIMEOUT);
local._dialog1.write(0x193, true);
break;
- case 0x193:
+ case words_weather_vane:
handleInternDialog(0x1A5, 4, INDEFINITE_TIMEOUT);
local._dialog1.write(0x194, true);
break;
- case 0x194:
+ case words_weight_machine:
handleInternDialog(0x1A9, 6, INDEFINITE_TIMEOUT);
local._dialog1.write(0x195, true);
local._dialog1.write(0x196, true);
local._dialog1.write(0x19D, false);
break;
- case 0x195:
+ case words_western_cliff_face:
handleInternDialog(0x1AF, 7, INDEFINITE_TIMEOUT);
if (!local._dialog1.read(0x196))
local._dialog1.write(0x197, true);
break;
- case 0x196:
+ case words_wheel:
handleInternDialog(0x1B6, 5, INDEFINITE_TIMEOUT);
if (!local._dialog1.read(0x195))
local._dialog1.write(0x197, true);
break;
- case 0x197:
+ case words_window:
handleInternDialog(0x1BB, 5, INDEFINITE_TIMEOUT);
break;
- case 0x198:
+ case words_witchdoctor_hut:
handleInternDialog(0x1C0, 5, INDEFINITE_TIMEOUT);
local._dialog1.write(0x19A, true);
break;
- case 0x199:
+ case words_workbench:
handleInternDialog(0x1C5, 3, INDEFINITE_TIMEOUT);
break;
- case 0x19A:
+ case words_write_on:
handleInternDialog(0x1C8, 5, INDEFINITE_TIMEOUT);
local._dialog1.write(0x19B, true);
break;
- case 0x19B:
+ case words_yellow_birdy:
handleInternDialog(0x1CD, 3, INDEFINITE_TIMEOUT);
break;
- case 0x19C:
- case 0x19D:
+ case words_grass:
+ case words_bouncing_reptile:
kernel_seq_delete(g_sequence_ids[2]);
g_sequence_ids[2] = kernel_seq_backward(g_sprite_ids[2], false, 8, 0, 0, 1);
kernel_seq_depth(g_sequence_ids[2], 1);
@@ -188,7 +188,7 @@ static void handleDialog() {
local._dialogFl = false;
handleInternDialog(0x1D0, 1, 120);
- if (local._dialog1.read(0) || (player2.words[0] == 0x19D)) {
+ if (local._dialog1.read(0) || (player2.words[0] == words_bouncing_reptile)) {
local._explosionFl = true;
local._internCounter = 3420;
}
@@ -198,7 +198,7 @@ static void handleDialog() {
break;
}
- if (player2.words[0] < 0x19C) {
+ if (player2.words[0] < words_grass) {
local._dialog1.start();
player.commands_allowed = true;
}
diff --git a/engines/mads/nebular/rooms/room319.cpp b/engines/mads/nebular/rooms/room319.cpp
index 4cb38750c2d..b9d9642dd3d 100644
--- a/engines/mads/nebular/rooms/room319.cpp
+++ b/engines/mads/nebular/rooms/room319.cpp
@@ -372,7 +372,7 @@ static void room_319_parser() {
player.commands_allowed = false;
handleRexDialogues(player2.words[0]);
} else {
- if ((player2.words[0] == 0x165) || (player2.words[0] == 0x166)) {
+ if ((player2.words[0] == words_tape_player) || (player2.words[0] == words_target_computer)) {
if (kernel.trigger == 1) {
local._nextAction1 = 3;
local._slacheTalkingFl = false;
@@ -389,7 +389,7 @@ static void room_319_parser() {
}
}
- if ((player2.words[0] == 0x171) || (player2.words[0] == 0x172)) {
+ if ((player2.words[0] == words_timebomb) || (player2.words[0] == words_timer)) {
if (kernel.trigger == 1) {
local._nextAction1 = 2;
local._slacheTalkingFl = false;
@@ -406,7 +406,7 @@ static void room_319_parser() {
}
}
- if ((player2.words[0] == 0x17D) || (player2.words[0] == 0x17E)) {
+ if ((player2.words[0] == words_vase) || (player2.words[0] == words_video_game)) {
if (kernel.trigger == 1) {
local._nextAction1 = 3;
local._slacheTalkingFl = false;
@@ -430,18 +430,18 @@ static void room_319_parser() {
}
}
- if ((player2.words[0] == 0x168) || (player2.words[0] == 0x174) ||
- (player2.words[0] == 0x180) || (player2.words[0] == 0x169) ||
- (player2.words[0] == 0x175) || (player2.words[0] == 0x181) ||
- (player2.words[0] == 0x16A) || (player2.words[0] == 0x176) ||
- (player2.words[0] == 0x182) || (player2.words[0] == 0x183) ||
- (player2.words[0] == 0x167) || (player2.words[0] == 0x173) ||
- (player2.words[0] == 0x17F)) {
+ if ((player2.words[0] == words_targetting_computer) || (player2.words[0] == words_tree) ||
+ (player2.words[0] == words_view_screen) || (player2.words[0] == words_tasmanian_devil) ||
+ (player2.words[0] == words_trees) || (player2.words[0] == words_viewport) ||
+ (player2.words[0] == words_tasty_turkey) || (player2.words[0] == words_trodden_path) ||
+ (player2.words[0] == words_village_area) || (player2.words[0] == words_village_to_west) ||
+ (player2.words[0] == words_target_module) || (player2.words[0] == words_timer_module) ||
+ (player2.words[0] == words_view)) {
- bool addDialogLine = !((player2.words[0] == 0x167) || (player2.words[0] == 0x173) ||
- (player2.words[0] == 0x17F) || (player2.words[0] == 0x16A) ||
- (player2.words[0] == 0x176) || (player2.words[0] == 0x182) ||
- (player2.words[0] == 0x183));
+ bool addDialogLine = !((player2.words[0] == words_target_module) || (player2.words[0] == words_timer_module) ||
+ (player2.words[0] == words_view) || (player2.words[0] == words_tasty_turkey) ||
+ (player2.words[0] == words_trodden_path) || (player2.words[0] == words_village_area) ||
+ (player2.words[0] == words_village_to_west));
int addVerbId = player2.words[0] + 1;
if ((addVerbId == 0x182) && (config_file.naughtiness != NAUGHTY))
@@ -458,10 +458,10 @@ static void room_319_parser() {
} else {
Dialog *curDialog;
int nextDocQuote;
- if ((player2.words[0] == 0x168) || (player2.words[0] == 0x167)) {
+ if ((player2.words[0] == words_targetting_computer) || (player2.words[0] == words_target_module)) {
curDialog = &local._dialog1;
nextDocQuote = 0x161;
- } else if ((player2.words[0] == 0x174) || (player2.words[0] == 0x173)) {
+ } else if ((player2.words[0] == words_tree) || (player2.words[0] == words_timer_module)) {
nextDocQuote = 0x16D;
curDialog = &local._dialog2;
} else {
@@ -490,10 +490,10 @@ static void room_319_parser() {
} else {
Dialog *curDialog;
int nextDocQuote;
- if ((player2.words[0] == 0x168) || (player2.words[0] == 0x169) || (player2.words[0] == 0x167)) {
+ if ((player2.words[0] == words_targetting_computer) || (player2.words[0] == words_tasmanian_devil) || (player2.words[0] == words_target_module)) {
curDialog = &local._dialog1;
nextDocQuote = 0x163;
- } else if ((player2.words[0] == 0x174) || (player2.words[0] == 0x175) || (player2.words[0] == 0x173)) {
+ } else if ((player2.words[0] == words_tree) || (player2.words[0] == words_trees) || (player2.words[0] == words_timer_module)) {
nextDocQuote = 0x16F;
curDialog = &local._dialog2;
} else {
diff --git a/engines/mads/nebular/rooms/room320.cpp b/engines/mads/nebular/rooms/room320.cpp
index 1690011feb0..fa14976081b 100644
--- a/engines/mads/nebular/rooms/room320.cpp
+++ b/engines/mads/nebular/rooms/room320.cpp
@@ -95,59 +95,59 @@ static void setLeftView(int view) {
static void handleButtons() {
switch (player2.words[1]) {
- case 0x2DD:
+ case words_red_button:
local._buttonId = 5;
break;
- case 0x2DE:
+ case words_green_button:
local._buttonId = 4;
break;
- case 0x2E0:
+ case words_right_1_key:
local._buttonId = 6;
break;
- case 0x2E1:
+ case words_right_2_key:
local._buttonId = 7;
break;
- case 0x2E2:
+ case words_right_3_key:
local._buttonId = 8;
break;
- case 0x2E3:
+ case words_right_4_key:
local._buttonId = 9;
break;
- case 0x2E4:
+ case words_right_5_key:
local._buttonId = 10;
break;
- case 0x2E5:
+ case words_right_6_key:
local._buttonId = 11;
break;
- case 0x2E6:
+ case words_right_7_key:
local._buttonId = 12;
break;
- case 0x2E7:
+ case words_right_8_key:
local._buttonId = 13;
break;
- case 0x2E8:
+ case words_left_1_key:
local._buttonId = 0;
break;
- case 0x2E9:
+ case words_left_2_key:
local._buttonId = 1;
break;
- case 0x2EA:
+ case words_left_3_key:
local._buttonId = 2;
break;
- case 0x2EB:
+ case words_left_4_key:
local._buttonId = 3;
break;
diff --git a/engines/mads/nebular/rooms/room402.cpp b/engines/mads/nebular/rooms/room402.cpp
index af66ccacc0a..9ea94ae380d 100644
--- a/engines/mads/nebular/rooms/room402.cpp
+++ b/engines/mads/nebular/rooms/room402.cpp
@@ -118,7 +118,7 @@ static void setDialogNode(int node) {
static void handleConversation1() {
switch (player2.words[0]) {
- case 0x214:
+ case words_sack:
{
int quoteId = 0;
int quotePosX = 0;
@@ -153,7 +153,7 @@ static void handleConversation1() {
}
break;
- case 0x215:
+ case words_limb:
kernel_message_purge();
kernel_message_add(quote_string(kernel.quotes, 0x1EC), 260, 41, 0xFDFC, INDEFINITE_TIMEOUT, 0, 0);
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
@@ -163,7 +163,7 @@ static void handleConversation1() {
setDialogNode(3);
break;
- case 0x237:
+ case words_lie_down_on:
kernel_message_purge();
kernel_message_add(quote_string(kernel.quotes, 0x1FD), 208, 41, 0xFDFC, 100, 0, 0);
setDialogNode(0);
@@ -179,63 +179,63 @@ static void handleConversation1() {
static void handleConversation2() {
switch (player2.words[0]) {
- case 0x216:
+ case words_sink:
local._dialog2.write(0x216, false);
local._dialog2.write(0x21D, true);
break;
- case 0x219:
+ case words_bunk:
local._dialog2.write(0x219, false);
local._dialog2.write(0x220, true);
break;
- case 0x21A:
+ case words_next_cell:
local._dialog2.write(0x21A, false);
local._dialog2.write(0x223, true);
break;
- case 0x21B:
+ case words_toilet:
local._dialog2.write(0x21B, false);
local._dialog2.write(0x224, true);
break;
- case 0x21D:
+ case words_sidewall:
local._dialog2.write(0x21D, false);
local._dialog2.write(0x227, true);
break;
- case 0x220:
+ case words_lighting_fixture:
local._dialog2.write(0x220, false);
local._dialog2.write(0x22A, true);
break;
- case 0x223:
+ case words_neuro_analyzer:
local._dialog2.write(0x223, false);
local._dialog2.write(0x22D, true);
break;
- case 0x224:
+ case words_molecular_recorder:
local._dialog2.write(0x224, false);
local._dialog2.write(0x230, true);
break;
- case 0x227:
+ case words_walk_up:
local._dialog2.write(0x227, false);
break;
- case 0x22A:
+ case words_dna_inverter:
local._dialog2.write(0x22A, false);
break;
- case 0x22D:
+ case words_guinea_pig_test_box:
local._dialog2.write(0x22D, false);
break;
- case 0x230:
+ case words_surgical_boxes:
local._dialog2.write(0x230, false);
break;
- case 0x21C:
+ case words_monitor_area:
setDialogNode(0);
break;
@@ -244,7 +244,7 @@ static void handleConversation2() {
}
- if (player2.words[0] != 0x21C) {
+ if (player2.words[0] != words_monitor_area) {
switch (g_engine->getRandomNumber(1, 3)) {
case 1:
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
@@ -290,10 +290,10 @@ static void handleConversation2() {
static void handleConversation3() {
switch (player2.words[0]) {
- case 0x233:
- case 0x234:
- case 0x235:
- case 0x236:
+ case words_sterilization_sink:
+ case words_dripolator:
+ case words_shock_machine:
+ case words_interrogation_table:
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
kernel_timing_trigger(1, 86);
kernel_message_purge();
@@ -303,7 +303,7 @@ static void handleConversation3() {
local._bartenderCurrentQuestion = 2;
break;
- case 0x237:
+ case words_lie_down_on:
kernel_message_purge();
kernel_message_add(quote_string(kernel.quotes, 0x1FD), 208, 41, 0xFDFC, 100, 0, 0);
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
@@ -319,7 +319,7 @@ static void handleConversation3() {
static void handleConversation4() {
switch (player2.words[0]) {
- case 0x238:
+ case words_decipher:
kernel_message_purge();
setDialogNode(0);
player.commands_allowed = false;
@@ -336,7 +336,7 @@ static void handleConversation4() {
local._refuseAlienLiquor = true;
break;
- case 0x239:
+ case words_guard:
player.commands_allowed = false;
local._roxMode = 21;
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
@@ -345,7 +345,7 @@ static void handleConversation4() {
local._conversationFl = false;
break;
- case 0x23A:
+ case words_rip_in_floor:
setDialogNode(0);
player.commands_allowed = false;
kernel_message_add(quote_string(kernel.quotes, 0x1F4), 193, 27, 0xFDFC, 150, 0, 0);
@@ -361,7 +361,7 @@ static void handleConversation4() {
local._refuseAlienLiquor = true;
break;
- case 0x23D:
+ case words_rock_chunk:
setDialogNode(0);
player.commands_allowed = false;
kernel_message_add(quote_string(kernel.quotes, 0x1F6), 153, 27, 0xFDFC, 150, 0, 0);
@@ -377,7 +377,7 @@ static void handleConversation4() {
local._refuseAlienLiquor = true;
break;
- case 0x23E:
+ case words_bloody_cell_wall:
kernel_message_purge();
setDialogNode(0);
player.commands_allowed = false;
diff --git a/engines/mads/nebular/rooms/room411.cpp b/engines/mads/nebular/rooms/room411.cpp
index e6fa6622425..e4cc8329f53 100644
--- a/engines/mads/nebular/rooms/room411.cpp
+++ b/engines/mads/nebular/rooms/room411.cpp
@@ -115,82 +115,82 @@ static int computeQuoteAndQuantity() {
int quantity;
switch (player2.words[0]) {
- case 0x252:
+ case words_hoop:
quoteId = 0x26F;
quantity = 0;
break;
- case 0x253:
+ case words_cannonballs:
quoteId = 0x271;
quantity = 0;
break;
- case 0x254:
+ case words_water_fountain:
quoteId = 0x270;
quantity = 0;
break;
- case 0x255:
+ case words_hallway_to_east:
quoteId = 0x272;
quantity = 0;
break;
- case 0x256:
+ case words_hallway_to_west:
quoteId = 0x267;
quantity = 2;
break;
- case 0x257:
+ case words_support:
quoteId = 0x269;
quantity = 2;
break;
- case 0x258:
+ case words_backboard:
quoteId = 0x268;
quantity = 2;
break;
- case 0x259:
+ case words_wide_door:
quoteId = 0x26A;
quantity = 2;
break;
- case 0x25A:
+ case words_sign_post:
quoteId = 0x26B;
quantity = 3;
break;
- case 0x25B:
+ case words_fire_extinguisher:
quoteId = 0x26D;
quantity = 3;
break;
- case 0x25C:
+ case words_trash:
quoteId = 0x26C;
quantity = 3;
break;
- case 0x25D:
+ case words_missiles:
quoteId = 0x26E;
quantity = 3;
break;
- case 0x25E:
+ case words_tank:
quoteId = 0x263;
quantity = 1;
break;
- case 0x25F:
+ case words_two_ton_weight:
quoteId = 0x265;
quantity = 1;
break;
- case 0x260:
+ case words_one_ton_tomato:
quoteId = 0x264;
quantity = 1;
break;
- case 0x261:
+ case words_anvil:
quoteId = 0x266;
quantity = 1;
break;
@@ -226,7 +226,7 @@ static void handleKettleAction() {
}
static void handleDialog() {
- if ((player2.words[0] != 0x262) && (kernel.trigger == 0)) {
+ if ((player2.words[0] != words_minuteman_iv_icbm) && (kernel.trigger == 0)) {
if (player_has(local._newIngredient)) {
switch (local._newIngredient) {
case OBJ_FORMALDEHYDE:
@@ -263,7 +263,7 @@ static void handleDialog() {
local._killRox = true;
kernel_set_interface_mode(INTER_BUILDING_SENTENCES);
- } else if (player2.words[0] == 0x262)
+ } else if (player2.words[0] == words_minuteman_iv_icbm)
kernel_set_interface_mode(INTER_BUILDING_SENTENCES);
}
diff --git a/engines/mads/nebular/rooms/room611.cpp b/engines/mads/nebular/rooms/room611.cpp
index b41b6a60f8d..ced680b8506 100644
--- a/engines/mads/nebular/rooms/room611.cpp
+++ b/engines/mads/nebular/rooms/room611.cpp
@@ -620,7 +620,7 @@ static void displayHermitQuestions(int question) {
static void handleSubDialog1() {
switch (player2.words[0]) {
- case 0x287:
+ case words_air_purifier:
local._stickFingerFl = true;
local._nextFrame = 34;
local._hermitMovingFl = false;
@@ -636,7 +636,7 @@ static void handleSubDialog1() {
setDialogNode(2);
break;
- case 0x288:
+ case words_dummy:
handleTalking(500);
displayHermitQuestions(6);
local._dialog1.write(0x288, false);
@@ -647,7 +647,7 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x289:
+ case words_picture:
handleTalking(500);
displayHermitQuestions(10);
local._dialog1.write(0x289, false);
@@ -656,14 +656,14 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x28A:
+ case words_baggage_check:
handleTalking(500);
displayHermitQuestions(11);
local._dialog1.write(0x28A, false);
setDialogNode(1);
break;
- case 0x28B:
+ case words_departure_schedule:
handleTalking(500);
displayHermitQuestions(12);
local._dialog1.write(0x28C, true);
@@ -672,14 +672,14 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x28C:
+ case words_shade_of_pale:
handleTalking(500);
displayHermitQuestions(13);
local._dialog1.write(0x28C, false);
setDialogNode(1);
break;
- case 0x28D:
+ case words_itinerary:
handleTalking(500);
displayHermitQuestions(14);
local._dialog1.write(0x290, true);
@@ -688,7 +688,7 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x28E:
+ case words_bargain_vat:
handleTalking(500);
displayHermitQuestions(15);
local._dialog1.write(0x295, true);
@@ -696,7 +696,7 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x290:
+ case words_pad_if_paper:
handleTalking(500);
displayHermitQuestions(17);
local._dialog1.write(0x290, false);
@@ -708,7 +708,7 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x291:
+ case words_deepest_depths:
handleTalking(500);
displayHermitQuestions(18);
local._dialog1.write(0x291, false);
@@ -727,7 +727,7 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x28F:
+ case words_pencils:
handleTalking(500);
displayHermitQuestions(16);
local._dialog1.write(0x28F, false);
@@ -737,14 +737,14 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x295:
+ case words_space_questing_viii:
handleTalking(500);
displayHermitQuestions(20);
local._dialog1.write(0x295, false);
setDialogNode(1);
break;
- case 0x292:
+ case words_rolodex:
handleTalking(500);
displayHermitQuestions(19);
local._dialog1.write(0x292, false);
@@ -752,7 +752,7 @@ static void handleSubDialog1() {
setDialogNode(1);
break;
- case 0x293:
+ case words_mona_tisa:
{
handleTalking(200);
kernel_message_purge();
@@ -772,7 +772,7 @@ static void handleSubDialog1() {
}
break;
- case 0x294:
+ case words_abstract_art:
{
bool hermitPleasedFl = false;
@@ -813,7 +813,7 @@ static void handleSubDialog1() {
}
break;
- case 0x296:
+ case words_theatrical_art:
{
kernel_message_purge();
@@ -834,25 +834,25 @@ static void handleSubDialog1() {
static void handleSubDialog2() {
switch (player2.words[0]) {
- case 0x29C:
+ case words_our_town:
displayHermitQuestions(7);
setDialogNode(1);
handleTalking(500);
break;
- case 0x29D:
+ case words_embroidered_art:
displayHermitQuestions(8);
setDialogNode(1);
handleTalking(500);
break;
- case 0x29E:
+ case words_george_bush_alike:
displayHermitQuestions(9);
setDialogNode(1);
handleTalking(500);
break;
- case 0x29F:
+ case words_counter:
{
kernel_message_purge();
char *curQuote = quote_string(kernel.quotes, 0x2A7);
@@ -882,9 +882,9 @@ static void handleDialog() {
quote_split_string(curQuote, subQuote1, subQuote2);
kernel_message_add(subQuote1, 0, -14, 0x1110, 150, 0, 34);
- if (player2.words[0] == 0x29D)
+ if (player2.words[0] == words_embroidered_art)
kernel_message_add(subQuote2, -18, 0, 0x1110, 150, 1, 34);
- else if (player2.words[0] == 0x28A)
+ else if (player2.words[0] == words_baggage_check)
kernel_message_add(subQuote2, -10, 0, 0x1110, 150, 1, 34);
else
kernel_message_add(subQuote2, 0, 0, 0x1110, 150, 1, 34);
More information about the Scummvm-git-logs
mailing list