[Scummvm-git-logs] scummvm master -> 76329436640166e0c4729fef57e9c29ea5ff5e58
dreammaster
noreply at scummvm.org
Wed Jul 29 06:36:01 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:
00f77a75aa MADS: Janitorial
ac49933a2e MADS: FOREST: Cleanup of redundant assignments
7632943664 MADS: FOREST: Dead code removal
Commit: 00f77a75aae2b28740ddf2dceec538011f9401c7
https://github.com/scummvm/scummvm/commit/00f77a75aae2b28740ddf2dceec538011f9401c7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T16:35:51+10:00
Commit Message:
MADS: Janitorial
Changed paths:
engines/mads/core/conv.cpp
engines/mads/core/dialog.cpp
engines/mads/core/inter.cpp
engines/mads/core/popup.cpp
engines/mads/core/vocab.cpp
engines/mads/dragonsphere/rooms/room106.cpp
engines/mads/dragonsphere/rooms/room109.cpp
engines/mads/dragonsphere/rooms/room110.cpp
engines/mads/dragonsphere/rooms/room119.cpp
engines/mads/dragonsphere/rooms/room201.cpp
engines/mads/dragonsphere/rooms/room203.cpp
engines/mads/dragonsphere/rooms/room204.cpp
engines/mads/dragonsphere/rooms/room205.cpp
engines/mads/dragonsphere/rooms/room303.cpp
engines/mads/dragonsphere/rooms/room404.cpp
engines/mads/dragonsphere/rooms/room405.cpp
engines/mads/dragonsphere/rooms/room407.cpp
engines/mads/dragonsphere/rooms/room408.cpp
engines/mads/dragonsphere/rooms/room409.cpp
engines/mads/dragonsphere/rooms/room411.cpp
engines/mads/dragonsphere/rooms/room454.cpp
engines/mads/dragonsphere/rooms/room504.cpp
engines/mads/dragonsphere/rooms/room506.cpp
engines/mads/dragonsphere/rooms/room508.cpp
engines/mads/dragonsphere/rooms/room511.cpp
engines/mads/dragonsphere/rooms/room512.cpp
engines/mads/dragonsphere/rooms/room613.cpp
engines/mads/dragonsphere/rooms/room614.cpp
engines/mads/dragonsphere/sound/asound.cpp
engines/mads/phantom/rooms/room101.cpp
engines/mads/phantom/rooms/room111.cpp
engines/mads/phantom/rooms/room112.cpp
engines/mads/phantom/rooms/room113.cpp
engines/mads/phantom/rooms/room304.cpp
engines/mads/phantom/rooms/room401.cpp
engines/mads/phantom/rooms/room403.cpp
engines/mads/phantom/rooms/room404.cpp
engines/mads/phantom/rooms/room406.cpp
engines/mads/phantom/rooms/room407.cpp
engines/mads/phantom/rooms/room408.cpp
engines/mads/phantom/rooms/room409.cpp
engines/mads/phantom/rooms/room453.cpp
engines/mads/phantom/rooms/room504.cpp
engines/mads/phantom/rooms/room506.cpp
engines/mads/phantom/sound/asound.cpp
diff --git a/engines/mads/core/conv.cpp b/engines/mads/core/conv.cpp
index 4629b0e0725..91364edb700 100644
--- a/engines/mads/core/conv.cpp
+++ b/engines/mads/core/conv.cpp
@@ -1431,7 +1431,6 @@ void conv_update(bool flag) {
ConvData *my_conv_data = conv_data[slot];
switch (conv_control.status) {
-
// ------------------------------------------------------------------
// Mode 0 — NEXT_NODE
// ------------------------------------------------------------------
diff --git a/engines/mads/core/dialog.cpp b/engines/mads/core/dialog.cpp
index d6e820efaa2..02a658fb183 100644
--- a/engines/mads/core/dialog.cpp
+++ b/engines/mads/core/dialog.cpp
@@ -867,7 +867,6 @@ static void dialog_compute_window(DialogPtr dialog) {
}
switch (item->type) {
-
case DD_I_LIST:
case DD_I_FILELIST:
case DD_I_DIRSLIST:
@@ -2837,7 +2836,6 @@ ItemPtr dialog_execute(DialogPtr dialog, ItemPtr active_item, ItemPtr default_bu
dialog_update_active(dialog, count - dialog->active_item, false, false);
item = &dialog->item[dialog->active_item];
switch (item->type) {
-
case DD_I_BUTTON:
dialog->status |= DD_EXITFLAG;
break;
@@ -2955,7 +2953,6 @@ ItemPtr dialog_execute(DialogPtr dialog, ItemPtr active_item, ItemPtr default_bu
dialog_update_active(dialog, count - dialog->active_item, false, false);
item = &dialog->item[dialog->active_item];
switch (item->type) {
-
case DD_I_BUTTON:
dialog->status |= DD_EXITFLAG;
break;
diff --git a/engines/mads/core/inter.cpp b/engines/mads/core/inter.cpp
index 86a6fbd3b28..4a2c2ec9151 100644
--- a/engines/mads/core/inter.cpp
+++ b/engines/mads/core/inter.cpp
@@ -320,7 +320,6 @@ static int inter_get_spot(int class_, int id, int *x1, int *y1, int *xs, int *ys
valid_flag = false;
switch (class_) {
-
case STROKE_COMMAND:
row = id % inter_columns;
col = id / inter_columns;
@@ -1583,11 +1582,9 @@ static void inter_analyze_stroke() {
}
switch (inter_awaiting) {
-
case AWAITING_COMMAND:
inter_prep = PREP_NONE;
switch (stroke_type) {
-
case STROKE_COMMAND:
inter_command_source = STROKE_COMMAND;
inter_command = picked_word;
@@ -1698,10 +1695,8 @@ static void inter_complete_stroke() {
}
switch (inter_awaiting) {
-
case AWAITING_COMMAND:
switch (stroke_type) {
-
case STROKE_COMMAND:
if (inter_command >= 0) {
if (inter_verb_type == VERB_ONLY) {
@@ -1762,7 +1757,6 @@ static void inter_complete_stroke() {
case AWAITING_THIS:
switch (stroke_type) {
-
case STROKE_INVEN:
case STROKE_INTERFACE:
case STROKE_SPECIAL_INVEN:
diff --git a/engines/mads/core/popup.cpp b/engines/mads/core/popup.cpp
index d178d253b72..327e6d8f6d4 100644
--- a/engines/mads/core/popup.cpp
+++ b/engines/mads/core/popup.cpp
@@ -3282,7 +3282,6 @@ PopupItem *popup_execute() {
if (!popup->key_handled) {
switch (popup->key) {
-
case alt_x_key:
case alt_q_key:
case ctrl_q_key:
diff --git a/engines/mads/core/vocab.cpp b/engines/mads/core/vocab.cpp
index 20a296b8fcf..40f928e5de2 100644
--- a/engines/mads/core/vocab.cpp
+++ b/engines/mads/core/vocab.cpp
@@ -273,7 +273,6 @@ void vocab_report_error(int number) {
dos_flag = false;
switch (number) {
-
case VC_ERR_OPENMAINFILE:
Common::strcpy_s(temp_buf_1, "Failed to open main vocabulary file:");
env_get_path(temp_buf_2, VC_MAINFILENAME);
diff --git a/engines/mads/dragonsphere/rooms/room106.cpp b/engines/mads/dragonsphere/rooms/room106.cpp
index 8b0de28eea9..143a1ca65cc 100644
--- a/engines/mads/dragonsphere/rooms/room106.cpp
+++ b/engines/mads/dragonsphere/rooms/room106.cpp
@@ -590,7 +590,6 @@ static void handle_animation_a_macmorn() {
a_mac_reset_frame = -1;
switch (local->a_mac_frame) {
-
case 114:
/* just when MacMorn and queen leave bottom of screen */
new_room = 614;
diff --git a/engines/mads/dragonsphere/rooms/room109.cpp b/engines/mads/dragonsphere/rooms/room109.cpp
index c541f199d6d..3e83bcd8c52 100644
--- a/engines/mads/dragonsphere/rooms/room109.cpp
+++ b/engines/mads/dragonsphere/rooms/room109.cpp
@@ -267,7 +267,6 @@ static void handle_animation_queen() {
case 45: /* end of talk frame */
switch (local->queen_action) {
-
case QUEEN_TALK:
queen_reset_frame = imath_random(42, 44); /* random talk frames */
++local->queen_talk_count;
diff --git a/engines/mads/dragonsphere/rooms/room110.cpp b/engines/mads/dragonsphere/rooms/room110.cpp
index 9aef46f2510..61e9109cefa 100644
--- a/engines/mads/dragonsphere/rooms/room110.cpp
+++ b/engines/mads/dragonsphere/rooms/room110.cpp
@@ -864,7 +864,6 @@ static void room_110_random_times(int index) {
random = imath_random(RANDOM_LOWEST_NUMBER, RANDOM_HIGHEST_NUMBER);
switch (random) {
-
case RANDOM_LOWEST_NUMBER:
local->switch_direction[index] = TIME_TO_MOVE_1;
break;
@@ -1840,7 +1839,6 @@ static void handle_conv_guard_heal() {
static void room_110_check_score() {
switch (global[talked_to_status]) {
-
case TALKED_TO_NONE:
if (local->talking_to == FAERIE) {
global[talked_to_status] = TALKED_FAERIE;
diff --git a/engines/mads/dragonsphere/rooms/room119.cpp b/engines/mads/dragonsphere/rooms/room119.cpp
index a0afa10de05..d7d19520a0a 100644
--- a/engines/mads/dragonsphere/rooms/room119.cpp
+++ b/engines/mads/dragonsphere/rooms/room119.cpp
@@ -246,7 +246,6 @@ static void handle_animation_pid() {
}
switch (local->pid_action) {
-
case PID_NOTHING:
pid_reset_frame = 46; /* freeze */
break;
@@ -291,7 +290,6 @@ static void handle_animation_king() {
king_reset_frame = -1;
switch (local->king_frame) {
-
case 8:
/* king looking up staircase at Pid */
if (local->king_action == KING_FACE_UP_STAIRS) {
@@ -327,7 +325,6 @@ static void room_119_daemon() {
(global[books_status] == BOOKS_PULLED2)) {
switch (kernel.trigger) {
-
case ROOM_119_WOOD_DOOR:
player.commands_allowed = false;
seq[fx_door_room] = kernel_seq_forward(ss[fx_door_room], false, 6, 0, 0, 1);
@@ -495,7 +492,6 @@ static void room_119_parser() {
text_show(11913);
} else switch (kernel.trigger) {
-
case 0:
sound_play(N_InvokeCrystalBall);
player.commands_allowed = false;
diff --git a/engines/mads/dragonsphere/rooms/room201.cpp b/engines/mads/dragonsphere/rooms/room201.cpp
index 29fe94ec487..286f164a019 100644
--- a/engines/mads/dragonsphere/rooms/room201.cpp
+++ b/engines/mads/dragonsphere/rooms/room201.cpp
@@ -837,7 +837,6 @@ static void handle_anim_guard_left() {
guard_left_reset_frame = -1;
switch (local->guard_left_frame) {
-
case 18: /* end of talk frame */
case 19: /* end of talk frame */
case 20: /* end of talk frame */
@@ -911,7 +910,6 @@ static void handle_anim_guard_left() {
case 109: /* end of take bottle */
switch (local->guard_left_action) {
-
case FREEZE:
guard_left_reset_frame = 0;
break;
@@ -1043,7 +1041,6 @@ static void handle_anim_guard_right() {
case 80: /* end of stand up */
switch (local->guard_right_action) {
-
case HALT:
guard_right_reset_frame = 1;
local->guard_right_action = HALT_FREEZE;
@@ -1160,7 +1157,6 @@ static void handle_anim_guard_right_pid() {
case 82: /* end of stand up */
switch (local->guard_right_action) {
-
case HALT:
guard_right_reset_frame = 1;
local->guard_right_action = HALT_FREEZE;
@@ -1216,7 +1212,6 @@ static void handle_anim_death() {
death_reset_frame = -1;
switch (local->death_frame) {
-
case 38:
case 43:
if (speech_system_active && speech_on) {
@@ -1250,7 +1245,6 @@ static void handle_anim_pid() {
pid_reset_frame = -1;
switch (local->pid_frame) {
-
case 43: /* almost end of take a swig (pid) */
conv_release();
break;
@@ -1284,7 +1278,6 @@ static void handle_anim_pid() {
case 64: /* end of give to right */
switch (local->pid_action) {
-
case FREEZE:
pid_reset_frame = 0;
break;
@@ -1368,7 +1361,6 @@ static void handle_anim_pid() {
case 79: /* end of take from right */
switch (local->pid_action) {
-
case FREEZE:
pid_reset_frame = 32;
break;
diff --git a/engines/mads/dragonsphere/rooms/room203.cpp b/engines/mads/dragonsphere/rooms/room203.cpp
index 62dd49e952d..7663e4c9491 100644
--- a/engines/mads/dragonsphere/rooms/room203.cpp
+++ b/engines/mads/dragonsphere/rooms/room203.cpp
@@ -246,7 +246,6 @@ static void handle_anim_wise() {
wise_reset_frame = -1;
switch (local->wise_frame) {
-
case 57:
player.commands_allowed = false;
player.walker_visible = false;
diff --git a/engines/mads/dragonsphere/rooms/room204.cpp b/engines/mads/dragonsphere/rooms/room204.cpp
index 25fa9daf494..1951dfb2f7d 100644
--- a/engines/mads/dragonsphere/rooms/room204.cpp
+++ b/engines/mads/dragonsphere/rooms/room204.cpp
@@ -94,7 +94,6 @@ static void handle_anim_king_dream() {
king_reset_frame = -1;
switch (local->king_frame) {
-
case 64: /* just before doll sequence */
if (global[doll_given]) {
king_reset_frame = 86;
diff --git a/engines/mads/dragonsphere/rooms/room205.cpp b/engines/mads/dragonsphere/rooms/room205.cpp
index c9da219f3b4..e776174721e 100644
--- a/engines/mads/dragonsphere/rooms/room205.cpp
+++ b/engines/mads/dragonsphere/rooms/room205.cpp
@@ -131,12 +131,10 @@ static void handle_anim_top_slime() {
top_slime_reset_frame = -1;
switch (local->top_slime_frame) {
-
case 15:
case 26:
switch (local->top_slime_action) {
-
case SHIFT:
if (imath_random(1, 4) == 1) {
top_slime_reset_frame = 17;
@@ -175,7 +173,6 @@ static void handle_anim_face() {
face_reset_frame = -1;
switch (local->face_frame) {
-
case 10: /* almost end of hide face */
player.commands_allowed = true;
break;
@@ -184,7 +181,6 @@ static void handle_anim_face() {
case 11: /* end of hide face */
switch (local->face_action) {
-
case INVIS:
face_reset_frame = 0;
break;
@@ -206,7 +202,6 @@ static void handle_anim_face() {
}
switch (local->face_action) {
-
case FREEZE:
face_reset_frame = 4;
break;
@@ -244,12 +239,10 @@ static void handle_anim_eye() {
eye_reset_frame = -1;
switch (local->eye_frame) {
-
case 1: /* end of invis */
case 3: /* end of blink */
switch (local->eye_action) {
-
case BLINK:
if (imath_random(1, 30) == 1) {
eye_reset_frame = 1;
diff --git a/engines/mads/dragonsphere/rooms/room303.cpp b/engines/mads/dragonsphere/rooms/room303.cpp
index d645f97d3f3..fc2016259a6 100644
--- a/engines/mads/dragonsphere/rooms/room303.cpp
+++ b/engines/mads/dragonsphere/rooms/room303.cpp
@@ -780,7 +780,6 @@ static void handle_anim_frog_2() {
case 9:
switch (local->frog_2_action) {
-
case FREEZE:
it = imath_random(1, 3);
switch (it) {
diff --git a/engines/mads/dragonsphere/rooms/room404.cpp b/engines/mads/dragonsphere/rooms/room404.cpp
index 2adbfa8cf7c..eeae55644a5 100644
--- a/engines/mads/dragonsphere/rooms/room404.cpp
+++ b/engines/mads/dragonsphere/rooms/room404.cpp
@@ -222,7 +222,6 @@ static void handle_animation_king() {
king_reset_frame = -1;
switch (local->king_frame) {
-
case 132:
king_reset_frame = 463;
break;
diff --git a/engines/mads/dragonsphere/rooms/room405.cpp b/engines/mads/dragonsphere/rooms/room405.cpp
index e428c3cdd74..f4a1fbe0e22 100644
--- a/engines/mads/dragonsphere/rooms/room405.cpp
+++ b/engines/mads/dragonsphere/rooms/room405.cpp
@@ -127,7 +127,6 @@ static void handle_animation_guard() {
guard_reset_frame = -1;
switch (local->guard_frame) {
-
case 31:
local->king_tent_action = ENTER_TENT;
local->pid_tent_action = ENTER_TENT;
@@ -259,7 +258,6 @@ static void handle_animation_pid_tent() {
pid_tent_reset_frame = -1;
switch (local->pid_tent_frame) {
-
case 14:
local->guard_action = SHUT_UP;
break;
@@ -551,7 +549,6 @@ static void handle_animation_king_sit() {
case 33:
case 27:
switch (local->king_sit_action) {
-
case SHUT_UP:
king_sit_reset_frame = 14;
break;
@@ -649,7 +646,6 @@ static void handle_animation_pid_sit() {
case 27:
case 42:
switch (local->pid_sit_action) {
-
case SHUT_UP:
pid_sit_reset_frame = 16;
break;
diff --git a/engines/mads/dragonsphere/rooms/room407.cpp b/engines/mads/dragonsphere/rooms/room407.cpp
index 0a27cd04dd4..6b871d3cdd9 100644
--- a/engines/mads/dragonsphere/rooms/room407.cpp
+++ b/engines/mads/dragonsphere/rooms/room407.cpp
@@ -401,7 +401,6 @@ static void do_a_round() {
static void after_round_me() {
switch (local->final_choice) {
-
case words_red_stone:
switch (local->last_spin) {
case 4:
@@ -465,7 +464,6 @@ static void after_round_me() {
static void after_round_him() {
switch (local->final_choice) {
-
case words_red_stone:
switch (local->last_spin) {
case 4:
diff --git a/engines/mads/dragonsphere/rooms/room408.cpp b/engines/mads/dragonsphere/rooms/room408.cpp
index b30c59f5339..72df4191252 100644
--- a/engines/mads/dragonsphere/rooms/room408.cpp
+++ b/engines/mads/dragonsphere/rooms/room408.cpp
@@ -189,7 +189,6 @@ static void handle_animation_shaman_1() {
shaman_1_reset_frame = -1;
switch (local->shaman_1_frame) {
-
case 40: /* end of invisible */
shaman_1_reset_frame = 39;
break;
diff --git a/engines/mads/dragonsphere/rooms/room409.cpp b/engines/mads/dragonsphere/rooms/room409.cpp
index d7b12f60d55..5062dfca195 100644
--- a/engines/mads/dragonsphere/rooms/room409.cpp
+++ b/engines/mads/dragonsphere/rooms/room409.cpp
@@ -708,7 +708,6 @@ static void room_409_parser() {
if (seq[fx_death_n] == -1 && seq[fx_death_s] == -1 && seq[fx_death_ew] == -1) {
switch (local->facing) {
-
case FACING_NORTH:
temp = seq[fx_n];
seq[fx_n] = kernel_seq_stamp(ss[fx_n], false, 13);
@@ -793,7 +792,6 @@ static void room_409_parser() {
case ROOM_409_TURN:
switch (local->old_facing) {
-
case FACING_NORTH:
kernel_seq_delete(seq[fx_n]);
switch (local->facing) {
diff --git a/engines/mads/dragonsphere/rooms/room411.cpp b/engines/mads/dragonsphere/rooms/room411.cpp
index 704ae66df82..b9ba7e983a8 100644
--- a/engines/mads/dragonsphere/rooms/room411.cpp
+++ b/engines/mads/dragonsphere/rooms/room411.cpp
@@ -106,7 +106,6 @@ static void handle_animation_bird_1() {
bird_1_reset_frame = -1;
switch (local->bird_1_frame) {
-
case 6:
kernel_seq_delete(seq[fx_grapes]);
kernel_flip_hotspot(words_magic_grapes, false);
diff --git a/engines/mads/dragonsphere/rooms/room454.cpp b/engines/mads/dragonsphere/rooms/room454.cpp
index 544a679eeb1..7bb119dd866 100644
--- a/engines/mads/dragonsphere/rooms/room454.cpp
+++ b/engines/mads/dragonsphere/rooms/room454.cpp
@@ -212,7 +212,6 @@ static void handle_animation_king() {
king_reset_frame = -1;
switch (local->king_frame) {
-
case 210:
camera_pan_to(&camera_x, 0);
break;
diff --git a/engines/mads/dragonsphere/rooms/room504.cpp b/engines/mads/dragonsphere/rooms/room504.cpp
index 2be8fcb65f9..19d11cf9347 100644
--- a/engines/mads/dragonsphere/rooms/room504.cpp
+++ b/engines/mads/dragonsphere/rooms/room504.cpp
@@ -746,7 +746,6 @@ static void handle_animation_tom_talk() {
tom_talk_reset_frame = -1;
switch (local->tom_talk_frame) {
-
case 25:
case 38:
case 39:
diff --git a/engines/mads/dragonsphere/rooms/room506.cpp b/engines/mads/dragonsphere/rooms/room506.cpp
index 7ba81ff2212..ec27182d32d 100644
--- a/engines/mads/dragonsphere/rooms/room506.cpp
+++ b/engines/mads/dragonsphere/rooms/room506.cpp
@@ -110,7 +110,6 @@ static void handle_animation_pid() {
pid_reset_frame = -1;
switch (local->pid_frame) {
-
case 206:
kernel_seq_delete(seq[fx_feather_1]);
kernel_flip_hotspot_loc(words_feathers, false, FEATHER_X, FEATHER_Y);
@@ -140,7 +139,6 @@ static void handle_animation_pid() {
case 224:
switch (local->pid_action) {
-
case PID_FREEZE:
++local->pid_freeze_count;
if (local->pid_freeze_count > imath_random(30, 45)) {
@@ -174,7 +172,6 @@ static void handle_animation_pid() {
case 239:
switch (local->pid_action) {
-
case PID_FREEZE:
++local->pid_freeze_count;
if (local->pid_freeze_count > imath_random(30, 45)) {
@@ -206,7 +203,6 @@ static void handle_animation_pid() {
case 232:
switch (local->pid_action) {
-
case PID_FREEZE:
++local->pid_freeze_count;
if (local->pid_freeze_count > imath_random(30, 45)) {
diff --git a/engines/mads/dragonsphere/rooms/room508.cpp b/engines/mads/dragonsphere/rooms/room508.cpp
index ec87299e06e..44e79611be3 100644
--- a/engines/mads/dragonsphere/rooms/room508.cpp
+++ b/engines/mads/dragonsphere/rooms/room508.cpp
@@ -132,7 +132,6 @@ static void handle_animation_lani() {
lani_reset_frame = -1;
switch (local->lani_frame) {
-
case 25:
lani_reset_frame = 24;
break;
@@ -146,7 +145,6 @@ static void handle_animation_lani() {
lani_reset_frame = 0;
} else switch (local->lani_action) {
-
case LANI_TALK:
random = imath_random(1, 2);
if (random == 1) {
@@ -180,7 +178,6 @@ static void handle_animation_lani() {
lani_reset_frame = 19;
} else switch (local->lani_action) {
-
case LANI_TALK:
lani_reset_frame = 19;
break;
@@ -218,7 +215,6 @@ static void handle_animation_beast() {
beast_reset_frame = -1;
switch (local->beast_frame) {
-
case 40:
if (local->beast_action == BEAST_INVISIBLE) {
beast_reset_frame = 39;
@@ -289,7 +285,6 @@ static void handle_animation_king_choice() {
king_reset_frame = -1;
switch (local->king_frame) {
-
case 21:
if (local->king_action == KING_INVISIBLE) {
king_reset_frame = 20;
diff --git a/engines/mads/dragonsphere/rooms/room511.cpp b/engines/mads/dragonsphere/rooms/room511.cpp
index 46ce91a1026..5af2288bf6e 100644
--- a/engines/mads/dragonsphere/rooms/room511.cpp
+++ b/engines/mads/dragonsphere/rooms/room511.cpp
@@ -78,7 +78,6 @@ static void room_511_daemon() {
death_reset_frame = -1;
switch (local->death_frame) {
-
case 19:
if (speech_system_active && speech_on) {
global_speech_go(5);
diff --git a/engines/mads/dragonsphere/rooms/room512.cpp b/engines/mads/dragonsphere/rooms/room512.cpp
index b18a1aff010..eefd326fc66 100644
--- a/engines/mads/dragonsphere/rooms/room512.cpp
+++ b/engines/mads/dragonsphere/rooms/room512.cpp
@@ -89,7 +89,6 @@ static void handle_animation_pid() {
pid_reset_frame = -1;
switch (local->pid_frame) {
-
case 15:
sound_play(N_TakeObjectSnd);
inter_give_to_player(magic_belt);
@@ -111,7 +110,6 @@ static void handle_animation_pid() {
case 38:
switch (local->pid_action) {
-
case PID_TALK:
pid_reset_frame = 38;
local->pid_action = PID_SHUT_UP;
@@ -149,7 +147,6 @@ static void handle_animation_shak() {
shak_reset_frame = -1;
switch (local->shak_frame) {
-
case 21:
conv_run(CONV_33_SHAK);
break;
@@ -193,7 +190,6 @@ static void handle_animation_shak() {
case 30:
switch (local->shak_action) {
-
case SHAK_TALK:
shak_reset_frame = imath_random(27, 29);
++local->shak_talk_count;
diff --git a/engines/mads/dragonsphere/rooms/room613.cpp b/engines/mads/dragonsphere/rooms/room613.cpp
index 4809e23b1a7..8870d7e8f49 100644
--- a/engines/mads/dragonsphere/rooms/room613.cpp
+++ b/engines/mads/dragonsphere/rooms/room613.cpp
@@ -221,7 +221,6 @@ static void handle_animation_water() {
water_reset_frame = -1;
switch (local->water_frame) {
-
case 39: /* end of steam at left screen */
camera_pan_to(&camera_x, 320);
break;
diff --git a/engines/mads/dragonsphere/rooms/room614.cpp b/engines/mads/dragonsphere/rooms/room614.cpp
index c4fbfd0e0e9..3da05977f7e 100644
--- a/engines/mads/dragonsphere/rooms/room614.cpp
+++ b/engines/mads/dragonsphere/rooms/room614.cpp
@@ -353,7 +353,6 @@ static void handle_animation_king_enter() {
king_enter_reset_frame = -1;
switch (local->king_enter_frame) {
-
case 25: /* almost end of king coming into room */
local->wiz_float_action = TALK;
break;
diff --git a/engines/mads/dragonsphere/sound/asound.cpp b/engines/mads/dragonsphere/sound/asound.cpp
index cf9631892e8..84b59a9444e 100644
--- a/engines/mads/dragonsphere/sound/asound.cpp
+++ b/engines/mads/dragonsphere/sound/asound.cpp
@@ -1045,7 +1045,6 @@ dispatch:
pSrc++; /* skip command byte */
switch (di) {
-
case 0x0: /* set sampleIndex, call loadSample */
ch->_sampleIndex = *pSrc;
loadSample();
@@ -1182,7 +1181,6 @@ op2_set_vol:
* themselves are responsible for updating _pSrc).
* ============================================================ */
switch (di) {
-
case 0x0: /* inner loop */
{
ch = _activeChannelPtr;
@@ -1323,7 +1321,6 @@ op2_set_vol:
* incremented pSrc; each case increments pSrc itself as needed.
* ============================================================ */
switch (di) {
-
case 0x0: /* random pick from packed table -> write to stream */
{
/* Format: [cmd] [tblSize] [entry0..N-1] [targetSlot]
@@ -1458,7 +1455,6 @@ op2_set_vol:
* Switch on di (0-4); di >= 5 falls through to return.
* ============================================================ */
switch (di) {
-
case 0x0: /* var[dst] = imm */
{
pSrc++;
diff --git a/engines/mads/phantom/rooms/room101.cpp b/engines/mads/phantom/rooms/room101.cpp
index bd5c80b5871..361bf34a769 100644
--- a/engines/mads/phantom/rooms/room101.cpp
+++ b/engines/mads/phantom/rooms/room101.cpp
@@ -160,7 +160,6 @@ static void handle_animation_000() {
local->brie_calling_frame = kernel_anim[aa[0]].frame;
reset_frame = -1;
switch (local->brie_calling_frame) {
-
/* Choices while Brie has his hand up */
case 1: /* end of arms at side */
@@ -250,7 +249,6 @@ static void handle_animation_001() {
local->brie_chandelier_frame = kernel_anim[aa[1]].frame;
reset_frame = -1;
switch (local->brie_chandelier_frame) {
-
/* Choices while Brie is sitting on armrest */
case 1: /* end of freezing in standing position */
@@ -290,7 +288,6 @@ static void handle_animation_001() {
}
switch (local->brie_chandelier_position) {
-
case CONV1_BRIE_SHOULD_TALK:
random = imath_random(1, 3); /* between 4 talking movements */
++local->talk_count; /* run through so many talk cycles */
diff --git a/engines/mads/phantom/rooms/room111.cpp b/engines/mads/phantom/rooms/room111.cpp
index 98e8124fda6..a865671467c 100644
--- a/engines/mads/phantom/rooms/room111.cpp
+++ b/engines/mads/phantom/rooms/room111.cpp
@@ -217,7 +217,6 @@ void room_111_daemon() {
switch (kernel.trigger) {
-
case ROOM_111_MADE_IT_OUT_DOOR:
kernel_seq_delete(seq[fx_door]);
seq[fx_door] = kernel_seq_backward(ss[fx_door], false, 7, 0, 0, 1);
diff --git a/engines/mads/phantom/rooms/room112.cpp b/engines/mads/phantom/rooms/room112.cpp
index f0744f60eb0..14bc71f2418 100644
--- a/engines/mads/phantom/rooms/room112.cpp
+++ b/engines/mads/phantom/rooms/room112.cpp
@@ -91,7 +91,6 @@ static void handle_animation_julie_practice() {
case 107: /* end of turning left (facing camera) */
switch (local->julie_action) {
-
case CONV3_JULIE_PRACTICE:
random = imath_random(1, 3);
while (local->just_did_option == random) {
diff --git a/engines/mads/phantom/rooms/room113.cpp b/engines/mads/phantom/rooms/room113.cpp
index 3d700f6f331..264d2a37a6e 100644
--- a/engines/mads/phantom/rooms/room113.cpp
+++ b/engines/mads/phantom/rooms/room113.cpp
@@ -321,7 +321,6 @@ static void handle_animation_4_raoul() {
raoul_reset_frame = -1;
switch (local->raoul_frame) {
-
case 9: /* end of first open mouth and freeze */
case 10: /* end of second open mouth */
case 11: /* end of third open mouth */
@@ -333,7 +332,6 @@ static void handle_animation_4_raoul() {
}
switch (local->raoul_action) {
-
case CONV4_RAOUL_TAKE_NOTE:
raoul_reset_frame = 20;
local->raoul_action = CONV4_RAOUL_SHUT_UP;
@@ -372,7 +370,6 @@ static void handle_animation_4_raoul() {
case 42: /* end of getting up */
switch (local->raoul_action) {
-
case CONV4_RAOUL_GET_UP:
if (!local->prevent_2) {
conv_release();
@@ -474,7 +471,6 @@ static void handle_animation_6_julie() {
julie_reset_frame = -1;
switch (local->julie_frame) {
-
case 1: /* end of talk 1 */
case 2: /* end of talk 2 */
case 3: /* end of talk 3 */
@@ -955,7 +951,6 @@ void room_113_daemon() {
static void process_conversation_dead() {
switch (kernel.trigger) {
-
/* =================== Process talking triggers ================ */
case ROOM_113_JULIE_START_TALKING:
diff --git a/engines/mads/phantom/rooms/room304.cpp b/engines/mads/phantom/rooms/room304.cpp
index bca2d4b5538..bcb2d3d8c63 100644
--- a/engines/mads/phantom/rooms/room304.cpp
+++ b/engines/mads/phantom/rooms/room304.cpp
@@ -285,7 +285,6 @@ static void handle_animation_phantom() {
phantom_reset_frame = -1;
switch (local->phantom_frame) {
-
case 25:
conv_release();
break;
diff --git a/engines/mads/phantom/rooms/room401.cpp b/engines/mads/phantom/rooms/room401.cpp
index 7bc8beb8c15..48c2200dcb0 100644
--- a/engines/mads/phantom/rooms/room401.cpp
+++ b/engines/mads/phantom/rooms/room401.cpp
@@ -115,7 +115,6 @@ void room_401_init() {
if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case NORTH:
player.x = NORTH_X;
player.y = NORTH_Y;
diff --git a/engines/mads/phantom/rooms/room403.cpp b/engines/mads/phantom/rooms/room403.cpp
index ff0d51ec9b2..12a49fdd79f 100644
--- a/engines/mads/phantom/rooms/room403.cpp
+++ b/engines/mads/phantom/rooms/room403.cpp
@@ -118,7 +118,6 @@ void room_403_init() {
if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case NORTH:
player.x = NORTH_X;
player.y = NORTH_Y;
diff --git a/engines/mads/phantom/rooms/room404.cpp b/engines/mads/phantom/rooms/room404.cpp
index 2f6436c6223..0253f00bafe 100644
--- a/engines/mads/phantom/rooms/room404.cpp
+++ b/engines/mads/phantom/rooms/room404.cpp
@@ -121,7 +121,6 @@ void room_404_init() {
if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case NORTH:
player.x = NORTH_X;
player.y = NORTH_Y;
diff --git a/engines/mads/phantom/rooms/room406.cpp b/engines/mads/phantom/rooms/room406.cpp
index cfac9858936..2ba2fb3967e 100644
--- a/engines/mads/phantom/rooms/room406.cpp
+++ b/engines/mads/phantom/rooms/room406.cpp
@@ -54,7 +54,6 @@ void room_406_init() {
if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case EAST:
player.x = EAST_X;
player.y = EAST_Y;
diff --git a/engines/mads/phantom/rooms/room407.cpp b/engines/mads/phantom/rooms/room407.cpp
index 306a6ff8222..1b61b760f91 100644
--- a/engines/mads/phantom/rooms/room407.cpp
+++ b/engines/mads/phantom/rooms/room407.cpp
@@ -68,7 +68,6 @@ void room_407_init() {
if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case NORTH:
player.x = NORTH_X;
player.y = NORTH_Y;
diff --git a/engines/mads/phantom/rooms/room408.cpp b/engines/mads/phantom/rooms/room408.cpp
index f52f46f604d..cbd808d3e99 100644
--- a/engines/mads/phantom/rooms/room408.cpp
+++ b/engines/mads/phantom/rooms/room408.cpp
@@ -82,7 +82,6 @@ void room_408_init() {
if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case NORTH:
player.x = NORTH_X;
player.y = NORTH_Y;
diff --git a/engines/mads/phantom/rooms/room409.cpp b/engines/mads/phantom/rooms/room409.cpp
index 0c596973839..94e6f29dbf8 100644
--- a/engines/mads/phantom/rooms/room409.cpp
+++ b/engines/mads/phantom/rooms/room409.cpp
@@ -127,7 +127,6 @@ void room_409_init() {
} else if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case NORTH:
player.x = NORTH_X;
player.y = NORTH_Y;
diff --git a/engines/mads/phantom/rooms/room453.cpp b/engines/mads/phantom/rooms/room453.cpp
index 21c3ef793e7..cd46f0a3770 100644
--- a/engines/mads/phantom/rooms/room453.cpp
+++ b/engines/mads/phantom/rooms/room453.cpp
@@ -117,7 +117,6 @@ void room_453_init() {
if (previous_room != KERNEL_RESTORING_GAME) {
switch (global[catacombs_from]) {
-
case NORTH:
player.x = NORTH_X;
player.y = NORTH_Y;
diff --git a/engines/mads/phantom/rooms/room504.cpp b/engines/mads/phantom/rooms/room504.cpp
index dacc0b51c9d..d0c54d8f451 100644
--- a/engines/mads/phantom/rooms/room504.cpp
+++ b/engines/mads/phantom/rooms/room504.cpp
@@ -1056,7 +1056,6 @@ static void handle_animation_phantom_1() {
phan_reset_frame = -1;
switch (local->phan_frame) {
-
case 52: /* end of just as phantom comes into room (same for next 3) */
case 53: /* Here, we'll wait for a few lines to be exchanged */
case 54:
@@ -1181,7 +1180,6 @@ static void handle_animation_phantom_2() {
phan_reset_frame = -1;
switch (local->phan_frame) {
-
case 78:
global_speech(speech_phantom_cackle);
break;
@@ -1248,7 +1246,6 @@ static void handle_animation_phantom_3() {
phan_reset_frame = -1;
switch (local->phan_frame) {
-
case 58:
player.commands_allowed = true;
break;
@@ -1300,7 +1297,6 @@ static void handle_animation_chair() {
chair_reset_frame = -1;
switch (local->chair_frame) {
-
case 24:
player.commands_allowed = true;
break;
diff --git a/engines/mads/phantom/rooms/room506.cpp b/engines/mads/phantom/rooms/room506.cpp
index a2532b6c776..f0f2a8b81f9 100644
--- a/engines/mads/phantom/rooms/room506.cpp
+++ b/engines/mads/phantom/rooms/room506.cpp
@@ -395,7 +395,6 @@ done:
void room_506_daemon() {
switch (kernel.trigger) {
-
case ROOM_506_DONE_GOING_DOWN:
player.walker_visible = true;
player.commands_allowed = true;
diff --git a/engines/mads/phantom/sound/asound.cpp b/engines/mads/phantom/sound/asound.cpp
index 4b4d0c5c755..0135db37c40 100644
--- a/engines/mads/phantom/sound/asound.cpp
+++ b/engines/mads/phantom/sound/asound.cpp
@@ -999,7 +999,6 @@ dispatch:
if ((uint16)ax > 65) goto dispatch; /* unknown - skip */
switch (ax) {
-
/* ---- opcode -1 (0xFF): inner loop ---- */
case 65:
{
Commit: ac49933a2edf68defeb41a5c288e671c89efdde5
https://github.com/scummvm/scummvm/commit/ac49933a2edf68defeb41a5c288e671c89efdde5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T16:35:51+10:00
Commit Message:
MADS: FOREST: Cleanup of redundant assignments
Changed paths:
engines/mads/forest/inventory.cpp
diff --git a/engines/mads/forest/inventory.cpp b/engines/mads/forest/inventory.cpp
index a97bf7dabda..4e0719ca142 100644
--- a/engines/mads/forest/inventory.cpp
+++ b/engines/mads/forest/inventory.cpp
@@ -145,7 +145,7 @@ void display_inventory() {
int var_6 = 0;
int var_E = 0;
int var_20 = 0;
- int var_4 = 0;
+ int itemNum = 0;
int var_1E = 0;
long var_1C_1A = 0;
int var_8 = 0;
@@ -224,11 +224,11 @@ void display_inventory() {
if (!player.commands_allowed)
continue;
- var_4 = inventory_get_item(var_20);
- if (var_4 == 0)
+ itemNum = inventory_get_item(var_20);
+ if (itemNum == 0)
continue;
- if (var_4 == -1) {
+ if (itemNum == -1) {
kernel_force_refresh();
goto cancel_inventory;
}
@@ -239,7 +239,7 @@ void display_inventory() {
while (object_num < 16) {
if (object[object_num].location == 2) {
var_E++;
- if (var_E == var_4) {
+ if (var_E == itemNum) {
object_id = object_num;
break;
}
@@ -248,7 +248,6 @@ void display_inventory() {
}
if (object_num >= 16) {
var_E = 0;
- var_4 = 0;
continue;
}
@@ -319,9 +318,8 @@ void display_inventory() {
}
}
- if (object_id == -1 || var_4 == -1 || var_22 != 0) {
+ if (object_id == -1 || itemNum == -1 || var_22 != 0) {
var_E = 0;
- var_4 = 0;
continue;
}
@@ -369,7 +367,6 @@ void display_inventory() {
if (var_22 != 0) {
var_E = 0;
- var_4 = 0;
continue;
}
Commit: 76329436640166e0c4729fef57e9c29ea5ff5e58
https://github.com/scummvm/scummvm/commit/76329436640166e0c4729fef57e9c29ea5ff5e58
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T16:35:51+10:00
Commit Message:
MADS: FOREST: Dead code removal
Changed paths:
engines/mads/forest/menus.cpp
engines/mads/forest/rooms/room201.cpp
engines/mads/forest/rooms/room220.cpp
engines/mads/forest/rooms/room302.cpp
engines/mads/forest/rooms/room306.cpp
engines/mads/forest/rooms/room307.cpp
engines/mads/forest/rooms/room322.cpp
engines/mads/forest/sound/midi.cpp
diff --git a/engines/mads/forest/menus.cpp b/engines/mads/forest/menus.cpp
index 6c4481c5d07..aded4adcedf 100644
--- a/engines/mads/forest/menus.cpp
+++ b/engines/mads/forest/menus.cpp
@@ -348,8 +348,10 @@ void global_game_menu() {
}
break;
case GAME_OPTIONS_MENU:
- if (section_id != 9)
+ if (section_id != 9) {
global_menu_options();
+ music = config_file.music_flag != 0;
+ }
break;
default:
kernel.activate_menu = GAME_NO_MENU;
diff --git a/engines/mads/forest/rooms/room201.cpp b/engines/mads/forest/rooms/room201.cpp
index 74f1ddfebd4..3afe15c291b 100644
--- a/engines/mads/forest/rooms/room201.cpp
+++ b/engines/mads/forest/rooms/room201.cpp
@@ -337,32 +337,20 @@ static void room_201_anim5() {
if (kernel_anim[aa[3]].frame == scratch._aa)
return;
- int16 var_2 = -1;
scratch._aa = kernel_anim[aa[3]].frame;
if (scratch._aa == 23)
digi_play_build(101, '_', 1, 2);
-
- if (var_2 >= 0) {
- kernel_reset_animation(aa[3], var_2);
- scratch._aa = var_2;
- }
}
static void room_201_anim6() {
if (kernel_anim[aa[3]].frame == scratch._ae)
return;
- int16 var_2 = -1;
scratch._ae = kernel_anim[aa[3]].frame;
if (scratch._ae == 40)
digi_play_build(101, '_', 1, 2);
-
- if (var_2 >= 0) {
- kernel_reset_animation(aa[3], var_2);
- scratch._ae = var_2;
- }
}
static void room_201_daemon() {
diff --git a/engines/mads/forest/rooms/room220.cpp b/engines/mads/forest/rooms/room220.cpp
index 2266ab1c60c..54961b20a8b 100644
--- a/engines/mads/forest/rooms/room220.cpp
+++ b/engines/mads/forest/rooms/room220.cpp
@@ -138,8 +138,6 @@ static void room_220_anim1() {
}
static void room_220_anim2() {
- int16 result = -1;
-
if (kernel_anim[aa[1]].frame == aainfo[1]._frame)
return;
aainfo[1]._frame = kernel_anim[aa[1]].frame;
@@ -172,11 +170,6 @@ static void room_220_anim2() {
default:
break;
}
-
- if (result >= 0) {
- aainfo[1]._frame = result;
- kernel_reset_animation(aa[1], result);
- }
}
static void room_220_daemon() {
diff --git a/engines/mads/forest/rooms/room302.cpp b/engines/mads/forest/rooms/room302.cpp
index f644ee949d6..4f73fb492b8 100644
--- a/engines/mads/forest/rooms/room302.cpp
+++ b/engines/mads/forest/rooms/room302.cpp
@@ -447,7 +447,6 @@ static void room_302_anim6() {
}
static void room_302_anim7() {
- int16 result = -1;
int16 frame = (int16)kernel_anim[aa[6]].frame;
if (frame != aainfo[6]._frame) {
@@ -493,11 +492,6 @@ static void room_302_anim7() {
}
}
- if (result >= 0) {
- aainfo[6]._frame = result;
- kernel_reset_animation(aa[6], result);
- }
-
if (kernel.trigger != 7 && kernel.trigger != 28)
return;
diff --git a/engines/mads/forest/rooms/room306.cpp b/engines/mads/forest/rooms/room306.cpp
index c0ac6a46d03..665faf9135f 100644
--- a/engines/mads/forest/rooms/room306.cpp
+++ b/engines/mads/forest/rooms/room306.cpp
@@ -654,11 +654,12 @@ static void room_306_anim6() {
}
static void room_306_anim10() {
- int16 result = -1;
int16 cur = kernel_anim[aa[9]].frame;
if (cur == aainfo[9]._frame)
return;
+
aainfo[9]._frame = cur;
+
if (cur == 28) {
kernel_abort_animation(aa[9]);
aainfo[9]._active = 0;
@@ -672,10 +673,6 @@ static void room_306_anim10() {
} else if (cur == 20) {
digi_play_build(203, '_', 1, 2);
}
- if (result >= 0) {
- kernel_reset_animation(aa[9], result);
- aainfo[9]._frame = result;
- }
}
static void room_306_daemon() {
diff --git a/engines/mads/forest/rooms/room307.cpp b/engines/mads/forest/rooms/room307.cpp
index fa5df9ee9ef..15eb1269360 100644
--- a/engines/mads/forest/rooms/room307.cpp
+++ b/engines/mads/forest/rooms/room307.cpp
@@ -177,11 +177,12 @@ static void room_307_anim2() {
}
static void room_307_anim3() {
- int16 var_4 = -1;
int16 cur = kernel_anim[aa[2]].frame;
if (cur == aainfo[2]._frame)
return;
+
aainfo[2]._frame = cur;
+
if (scratch._ac != 0) {
if (cur == 31) {
digi_play_build(307, '_', 2, 2);
@@ -229,10 +230,6 @@ static void room_307_anim3() {
break;
}
}
- if (var_4 >= 0) {
- kernel_reset_animation(aa[2], var_4);
- aainfo[2]._frame = var_4;
- }
}
static void room_307_anim4() {
@@ -386,7 +383,7 @@ static void room_307_anim5() {
}
static void room_307_anim7() {
- int16 result = -1;
+ int16 newFrame = -1;
int16 var_2;
int16 cur = kernel_anim[aa[6]].frame;
if (cur == aainfo[6]._frame)
@@ -394,82 +391,77 @@ static void room_307_anim7() {
aainfo[6]._frame = cur;
bool dispatch = (cur == 1) || (cur >= 3 && cur <= 12) || (cur == 15);
- if (!dispatch) {
- if (result >= 0) {
- kernel_reset_animation(aa[6], result);
- aainfo[6]._frame = result;
- }
- return;
- }
- switch (aainfo[6]._val3) {
- case 0:
- case 3:
- case 4:
- if (cur >= 8 && cur <= 12) {
- aainfo[6]._val4++;
- if (imath_random(1, 6) < aainfo[6]._val4) {
- digi_play_build(307, '_', 4, 2);
- result = 0;
- aainfo[6]._val4 = 0;
- if (scratch._b0 != 0) {
- player.commands_allowed = true;
- scratch._b0 = 0;
+ if (dispatch) {
+ switch (aainfo[6]._val3) {
+ case 0:
+ case 3:
+ case 4:
+ if (cur >= 8 && cur <= 12) {
+ aainfo[6]._val4++;
+ if (imath_random(1, 6) < aainfo[6]._val4) {
+ digi_play_build(307, '_', 4, 2);
+ newFrame = 0;
+ aainfo[6]._val4 = 0;
+ if (scratch._b0 != 0) {
+ player.commands_allowed = true;
+ scratch._b0 = 0;
+ }
+ if (aainfo[6]._val3 == 4) {
+ aainfo[6]._val3 = 0;
+ scratch._aa++;
+ kernel_timing_trigger(1, 28);
+ }
+ } else {
+ do {
+ newFrame = imath_random(7, 11);
+ } while (aainfo[6]._frame == newFrame + 1);
}
- if (aainfo[6]._val3 == 4) {
+ } else {
+ aainfo[6]._val4++;
+ if (imath_random(10, 20) < aainfo[6]._val4) {
+ aainfo[6]._val4 = 0;
+ var_2 = imath_random(2, 4);
+ } else {
+ var_2 = 3;
+ }
+ if (aainfo[6]._val3 == 3) {
+ var_2 = 1;
aainfo[6]._val3 = 0;
- scratch._aa++;
- kernel_timing_trigger(1, 28);
+ aainfo[6]._val4 = 0;
+ }
+ if (aainfo[6]._val3 == 4) {
+ var_2 = 1;
+ aainfo[6]._val4 = 0;
+ }
+ switch (var_2) {
+ case 1:
+ newFrame = imath_random(7, 11);
+ digi_play_build(307, '_', 1, 2);
+ break;
+ case 2:
+ newFrame = 1;
+ break;
+ default:
+ newFrame = 0;
+ break;
}
- } else {
- do {
- result = imath_random(7, 11);
- } while (aainfo[6]._frame == result + 1);
- }
- } else {
- aainfo[6]._val4++;
- if (imath_random(10, 20) < aainfo[6]._val4) {
- aainfo[6]._val4 = 0;
- var_2 = imath_random(2, 4);
- } else {
- var_2 = 3;
- }
- if (aainfo[6]._val3 == 3) {
- var_2 = 1;
- aainfo[6]._val3 = 0;
- aainfo[6]._val4 = 0;
- }
- if (aainfo[6]._val3 == 4) {
- var_2 = 1;
- aainfo[6]._val4 = 0;
- }
- switch (var_2) {
- case 1:
- result = imath_random(7, 11);
- digi_play_build(307, '_', 1, 2);
- break;
- case 2:
- result = 1;
- break;
- default:
- result = 0;
- break;
}
+ break;
+ case 1:
+ newFrame = imath_random(3, 6);
+ break;
+ case 2:
+ newFrame = 14;
+ break;
+ default:
+ break;
}
- break;
- case 1:
- result = imath_random(3, 6);
- break;
- case 2:
- result = 14;
- break;
- default:
- break;
}
- if (result >= 0) {
- kernel_reset_animation(aa[6], result);
- aainfo[6]._frame = result;
+ if (newFrame >= 0) {
+ kernel_reset_animation(aa[6], newFrame);
+ aainfo[6]._frame = newFrame;
}
}
@@ -487,10 +479,10 @@ static void room_307_anim9() {
}
static void room_307_anim10() {
- int16 result = -1;
int16 cur = kernel_anim[aa[9]].frame;
if (cur == aainfo[9]._frame)
return;
+
aainfo[9]._frame = cur;
switch (cur) {
case 3:
@@ -510,10 +502,6 @@ static void room_307_anim10() {
default:
break;
}
- if (result >= 0) {
- kernel_reset_animation(aa[9], result);
- aainfo[9]._frame = result;
- }
}
static void room_307_init() {
diff --git a/engines/mads/forest/rooms/room322.cpp b/engines/mads/forest/rooms/room322.cpp
index 9dcb038d95c..81e6bd703fa 100644
--- a/engines/mads/forest/rooms/room322.cpp
+++ b/engines/mads/forest/rooms/room322.cpp
@@ -153,7 +153,6 @@ static void room_322_init1() {
}
static void room_322_anim2() {
- int16 result = -1;
int16 seq_handle;
int16 cur = kernel_anim[aa[2]].frame;
@@ -209,11 +208,6 @@ static void room_322_anim2() {
scratch._b4 = -1;
}
}
-
- if (result >= 0) {
- kernel_reset_animation(aa[2], result);
- aainfo[2]._val3 = result;
- }
}
static void room_322_anim3() {
@@ -232,7 +226,6 @@ static void room_322_anim3() {
}
static void room_322_anim4() {
- int16 result = -1;
int16 var_2;
int16 cur = kernel_anim[aa[9]].frame;
@@ -254,11 +247,6 @@ static void room_322_anim4() {
scratch._b4 = -1;
}
}
-
- if (result >= 0) {
- kernel_reset_animation(aa[9], result);
- aainfo[9]._val3 = result;
- }
}
static void room_322_anim5() {
@@ -305,8 +293,6 @@ static void room_322_anim6() {
}
static void room_322_anim7() {
- int16 result = -1;
-
int16 cur = kernel_anim[aa[4]].frame;
if (cur == aainfo[4]._val3)
return;
@@ -317,16 +303,9 @@ static void room_322_anim7() {
digi_play_build(322, 'b', 1, 1);
scratch._b4 = -1;
}
-
- if (result >= 0) {
- kernel_reset_animation(aa[4], result);
- aainfo[4]._val3 = result;
- }
}
static void room_322_anim8() {
- int16 result = -1;
-
int16 cur = kernel_anim[aainfo[0]._active].frame;
if (cur == aainfo[10]._val3)
return;
@@ -339,11 +318,6 @@ static void room_322_anim8() {
global[g009] = 0;
global_midi_play(4);
}
-
- if (result >= 0) {
- kernel_reset_animation(aainfo[0]._active, result);
- aainfo[10]._val3 = result;
- }
}
static void room_322_anim1() {
diff --git a/engines/mads/forest/sound/midi.cpp b/engines/mads/forest/sound/midi.cpp
index 89ecbd0da52..e05e824fb3f 100644
--- a/engines/mads/forest/sound/midi.cpp
+++ b/engines/mads/forest/sound/midi.cpp
@@ -51,18 +51,12 @@ MidiPlayer::~MidiPlayer() {
Common::StackLock lock(_mutex);
- if (_parser) {
- delete _parser;
- _parser = nullptr;
- }
- if (_data) {
- delete[] _data;
- _data = nullptr;
- }
- if (_driver) {
- delete _driver;
- _driver = nullptr;
- }
+ delete _parser;
+ _parser = nullptr;
+ delete[] _data;
+ _data = nullptr;
+ delete _driver;
+ _driver = nullptr;
}
int MidiPlayer::open() {
More information about the Scummvm-git-logs
mailing list