[Scummvm-git-logs] scummvm master -> 2fb35478a58314eb51d17011241707c723bd0028
dreammaster
noreply at scummvm.org
Wed Jul 29 06:00:18 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:
01e0fc7a9f MADS: DRAGONSPHERE: Remove unreachable code in original
ba9c89a5e0 MADS: DRAGONSPHERE: activate_timer in room 201 can be -1 or 1
2fb35478a5 MADS: DRAGONSPHERE: Further dead code removal
Commit: 01e0fc7a9f5706b7fd101eb0f0b7a64881585e8b
https://github.com/scummvm/scummvm/commit/01e0fc7a9f5706b7fd101eb0f0b7a64881585e8b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T12:38:46+10:00
Commit Message:
MADS: DRAGONSPHERE: Remove unreachable code in original
Changed paths:
engines/mads/dragonsphere/rooms/room102.cpp
engines/mads/dragonsphere/rooms/room104.cpp
engines/mads/dragonsphere/rooms/room114.cpp
engines/mads/dragonsphere/rooms/room116.cpp
engines/mads/dragonsphere/rooms/room201.cpp
engines/mads/dragonsphere/rooms/room206.cpp
engines/mads/dragonsphere/rooms/room303.cpp
engines/mads/dragonsphere/rooms/room406.cpp
engines/mads/dragonsphere/rooms/room411.cpp
engines/mads/dragonsphere/rooms/room504.cpp
engines/mads/dragonsphere/rooms/room506.cpp
diff --git a/engines/mads/dragonsphere/rooms/room102.cpp b/engines/mads/dragonsphere/rooms/room102.cpp
index 5328cb876d7..3870b80f9f5 100644
--- a/engines/mads/dragonsphere/rooms/room102.cpp
+++ b/engines/mads/dragonsphere/rooms/room102.cpp
@@ -144,13 +144,10 @@ static void room_102_pre_parser() {
}
static void room_102_daemon() {
- int16 reset_frame;
-
// --- Diary 1 reading sequence ---
if (local->animation_running == DIARY1 && kernel_anim[aa[0]].anim != 0) {
if (kernel_anim[aa[0]].frame != local->diary_frame) {
local->diary_frame = kernel_anim[aa[0]].frame;
- reset_frame = -1;
switch (local->diary_frame) {
case 6:
@@ -166,11 +163,6 @@ static void room_102_daemon() {
text_show(10212);
break;
}
-
- if (reset_frame >= 0 && kernel_anim[aa[0]].frame != reset_frame) {
- kernel_reset_animation(aa[0], reset_frame);
- local->diary_frame = reset_frame;
- }
}
}
@@ -178,7 +170,6 @@ static void room_102_daemon() {
if (local->animation_running == DIARY2 && kernel_anim[aa[0]].anim != 0) {
if (kernel_anim[aa[0]].frame != local->diary_frame) {
local->diary_frame = kernel_anim[aa[0]].frame;
- reset_frame = -1;
switch (local->diary_frame) {
case 6:
@@ -190,11 +181,6 @@ static void room_102_daemon() {
text_show(10214);
break;
}
-
- if (reset_frame >= 0 && kernel_anim[aa[0]].frame != reset_frame) {
- kernel_reset_animation(aa[0], reset_frame);
- local->diary_frame = reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room104.cpp b/engines/mads/dragonsphere/rooms/room104.cpp
index a2009f35c40..3e72fca25dd 100644
--- a/engines/mads/dragonsphere/rooms/room104.cpp
+++ b/engines/mads/dragonsphere/rooms/room104.cpp
@@ -1102,26 +1102,18 @@ static void handle_animation_twinkles() {
}
static void handle_animation_death() {
- int death_reset_frame;
-
if (kernel_anim[aa[4]].frame != local->death_frame) {
local->death_frame = kernel_anim[aa[4]].frame;
- death_reset_frame = -1;
switch (local->death_frame) {
case 11:
- global_speech_go(7); /* hurl */
+ global_speech_go(7); // Hurl
break;
case 17:
- global_speech_go(6); /* stab */
+ global_speech_go(6); // Stab
break;
}
-
- if (death_reset_frame >= 0) {
- kernel_reset_animation(aa[4], death_reset_frame);
- local->death_frame = death_reset_frame;
- }
}
}
@@ -1286,7 +1278,6 @@ static void handle_animation_pid() {
}
static void room_104_daemon() {
- int reset_frame;
int temp; /* for synching purposes */
long dif; /* for timer stuff */
@@ -1321,7 +1312,6 @@ static void room_104_daemon() {
if ((local->animation_running == OPEN_TAPESTRY) && (kernel_anim[aa[0]].anim != NULL)) {
if (kernel_anim[aa[0]].frame != local->tapestry_frame) {
local->tapestry_frame = kernel_anim[aa[0]].frame;
- reset_frame = -1;
switch (local->tapestry_frame) {
/* make player appear */
@@ -1330,13 +1320,6 @@ static void room_104_daemon() {
kernel_synch(KERNEL_PLAYER, 0, KERNEL_ANIM, aa[0]);
break;
}
-
- if (reset_frame >= 0) {
- if (reset_frame != kernel_anim[aa[0]].frame) {
- kernel_reset_animation(aa[0], reset_frame);
- local->tapestry_frame = reset_frame;
- }
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room114.cpp b/engines/mads/dragonsphere/rooms/room114.cpp
index 55cac7b283c..a8bd36cd62b 100644
--- a/engines/mads/dragonsphere/rooms/room114.cpp
+++ b/engines/mads/dragonsphere/rooms/room114.cpp
@@ -155,11 +155,8 @@ static void room_114_init() {
}
static void handle_animation_stairway_1() {
- int stairway_reset_frame;
-
if (kernel_anim[aa[1]].frame != local->stairway_frame) {
local->stairway_frame = kernel_anim[aa[1]].frame;
- stairway_reset_frame = -1;
switch (local->stairway_frame) {
case 103:
@@ -171,11 +168,6 @@ static void handle_animation_stairway_1() {
new_room = 113;
break;
}
-
- if (stairway_reset_frame >= 0) {
- kernel_reset_animation(aa[1], stairway_reset_frame);
- local->stairway_frame = stairway_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room116.cpp b/engines/mads/dragonsphere/rooms/room116.cpp
index 011d5f323d7..62a6899c081 100644
--- a/engines/mads/dragonsphere/rooms/room116.cpp
+++ b/engines/mads/dragonsphere/rooms/room116.cpp
@@ -225,11 +225,8 @@ static void room_116_init() {
}
static void handle_animation_lift() {
- int lift_reset_frame;
-
if (kernel_anim[aa[2]].frame != local->lift_frame) {
local->lift_frame = kernel_anim[aa[2]].frame;
- lift_reset_frame = -1;
switch (local->lift_frame) {
case 9:
@@ -256,18 +253,11 @@ static void handle_animation_lift() {
local->just_melted = true;
local->animation_running = KING_OFF_ICE;
local->anim_2_running = false;
- lift_reset_frame = -1;
break;
}
-
- if (lift_reset_frame >= 0) {
- kernel_reset_animation(aa[2], lift_reset_frame);
- local->lift_frame = lift_reset_frame;
- }
}
}
-
static void handle_animation_king() {
int king_reset_frame;
@@ -303,8 +293,6 @@ static void handle_animation_king() {
}
static void room_116_daemon() {
- int reset_frame;
-
if (local->anim_1_running) {
handle_animation_king();
}
@@ -316,7 +304,6 @@ static void room_116_daemon() {
if (local->animation_running == KING_OFF_ICE) {
if (kernel_anim[aa[0]].frame != local->current_frame) {
local->current_frame = kernel_anim[aa[0]].frame;
- reset_frame = -1;
switch (local->current_frame) {
case 34:
@@ -344,7 +331,6 @@ static void room_116_daemon() {
player.commands_allowed = true;
kernel_abort_animation(aa[0]);
- reset_frame = -1;
local->animation_running = 0;
aa[1] = kernel_run_animation(kernel_name('c', -1), 0);
local->king_action = KING_SHUT_UP;
@@ -355,13 +341,6 @@ static void room_116_daemon() {
}
break;
}
-
- if (reset_frame >= 0) {
- if (reset_frame != kernel_anim[aa[0]].frame) {
- kernel_reset_animation(aa[0], reset_frame);
- local->current_frame = reset_frame;
- }
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room201.cpp b/engines/mads/dragonsphere/rooms/room201.cpp
index e75fef3510f..c0b893bee35 100644
--- a/engines/mads/dragonsphere/rooms/room201.cpp
+++ b/engines/mads/dragonsphere/rooms/room201.cpp
@@ -1410,48 +1410,30 @@ static void handle_anim_pid() {
}
static void handle_anim_throw() {
- int throw_reset_frame;
-
if (kernel_anim[aa[4]].frame != local->throw_frame) {
local->throw_frame = kernel_anim[aa[4]].frame;
- throw_reset_frame = -1;
switch (local->throw_frame) {
-
- case 11: /* just threw shieldstone */
+ case 11:
+ // Just threw Shieldstone
inter_move_object(shieldstone, NOWHERE);
break;
}
-
- if (throw_reset_frame >= 0) {
- kernel_reset_animation(aa[4], throw_reset_frame);
- local->throw_frame = throw_reset_frame;
- }
}
}
static void handle_anim_take() {
- int take_reset_frame;
-
if (kernel_anim[aa[5]].frame != local->take_frame) {
local->take_frame = kernel_anim[aa[5]].frame;
- take_reset_frame = -1;
- switch (local->take_frame) {
-
- case 6: /* just took tentacle parts */
+ if (local->take_frame == 6) {
+ // Just took tentacle parts
kernel_seq_delete(seq[fx_pair_testes]);
kernel_flip_hotspot(words_tentacles, false);
++global[player_score];
sound_play(N_TakeObjectSnd);
inter_give_to_player(tentacle_parts);
object_examine(tentacle_parts, 20146, 0);
- break;
- }
-
- if (take_reset_frame >= 0) {
- kernel_reset_animation(aa[5], take_reset_frame);
- local->take_frame = take_reset_frame;
}
}
}
diff --git a/engines/mads/dragonsphere/rooms/room206.cpp b/engines/mads/dragonsphere/rooms/room206.cpp
index 071760015d1..38f54a55902 100644
--- a/engines/mads/dragonsphere/rooms/room206.cpp
+++ b/engines/mads/dragonsphere/rooms/room206.cpp
@@ -550,10 +550,8 @@ static void room_206_daemon() {
text_index[2] = 6;
} else if (score <= 249) {
text_index[2] = 7;
- } else if (score <= 250) {
- text_index[2] = 8;
} else {
- text_index[2] = 9;
+ text_index[2] = 8;
}
text_show(99);
diff --git a/engines/mads/dragonsphere/rooms/room303.cpp b/engines/mads/dragonsphere/rooms/room303.cpp
index a1b9057fb8f..d645f97d3f3 100644
--- a/engines/mads/dragonsphere/rooms/room303.cpp
+++ b/engines/mads/dragonsphere/rooms/room303.cpp
@@ -1048,11 +1048,8 @@ static void handle_anim_frog_6() {
}
static void handle_anim_fli() {
- int fli_reset_frame;
-
if (kernel_anim[aa[8]].frame != local->fli_frame) {
local->fli_frame = kernel_anim[aa[8]].frame;
- fli_reset_frame = -1;
switch (local->fli_frame) {
case 15:
@@ -1093,20 +1090,12 @@ static void handle_anim_fli() {
++global[player_score];
break;
}
-
- if (fli_reset_frame >= 0) {
- kernel_reset_animation(aa[8], fli_reset_frame);
- local->fli_frame = fli_reset_frame;
- }
}
}
static void handle_anim_death() {
- int death_reset_frame;
-
if (kernel_anim[aa[3]].frame != local->death_frame) {
local->death_frame = kernel_anim[aa[3]].frame;
- death_reset_frame = -1;
switch (local->death_frame) {
case 11:
@@ -1125,11 +1114,6 @@ static void handle_anim_death() {
}
break;
}
-
- if (death_reset_frame >= 0) {
- kernel_reset_animation(aa[3], death_reset_frame);
- local->death_frame = death_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room406.cpp b/engines/mads/dragonsphere/rooms/room406.cpp
index e0b770f4548..511f1ad4f3a 100644
--- a/engines/mads/dragonsphere/rooms/room406.cpp
+++ b/engines/mads/dragonsphere/rooms/room406.cpp
@@ -806,11 +806,8 @@ static void handle_animation_cal() {
}
static void handle_animation_king_walk() {
- int king_walk_reset_frame;
-
if (kernel_anim[aa[3]].frame != local->king_walk_frame) {
local->king_walk_frame = kernel_anim[aa[3]].frame;
- king_walk_reset_frame = -1;
switch (local->king_walk_frame) {
case 60:
@@ -831,20 +828,12 @@ static void handle_animation_king_walk() {
new_room = 405;
break;
}
-
- if (king_walk_reset_frame >= 0) {
- kernel_reset_animation(aa[3], king_walk_reset_frame);
- local->king_walk_frame = king_walk_reset_frame;
- }
}
}
static void handle_animation_pid_walk() {
- int pid_walk_reset_frame;
-
if (kernel_anim[aa[4]].frame != local->pid_walk_frame) {
local->pid_walk_frame = kernel_anim[aa[4]].frame;
- pid_walk_reset_frame = -1;
switch (local->pid_walk_frame) {
case 60:
@@ -865,11 +854,6 @@ static void handle_animation_pid_walk() {
new_room = 405;
break;
}
-
- if (pid_walk_reset_frame >= 0) {
- kernel_reset_animation(aa[4], pid_walk_reset_frame);
- local->pid_walk_frame = pid_walk_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room411.cpp b/engines/mads/dragonsphere/rooms/room411.cpp
index a17f95cc6a5..704ae66df82 100644
--- a/engines/mads/dragonsphere/rooms/room411.cpp
+++ b/engines/mads/dragonsphere/rooms/room411.cpp
@@ -170,11 +170,8 @@ static void handle_animation_bird_1() {
}
static void handle_animation_bird_2() {
- int bird_2_reset_frame;
-
if (kernel_anim[aa[1]].frame != local->bird_2_frame) {
local->bird_2_frame = kernel_anim[aa[1]].frame;
- bird_2_reset_frame = -1;
switch (local->bird_2_frame) {
case 5:
@@ -198,11 +195,6 @@ static void handle_animation_bird_2() {
kernel_synch(KERNEL_ANIM, aa[0], KERNEL_NOW, 0);
break;
}
-
- if (bird_2_reset_frame >= 0) {
- kernel_reset_animation(aa[1], bird_2_reset_frame);
- local->bird_2_frame = bird_2_reset_frame;
- }
}
}
@@ -263,11 +255,8 @@ static void handle_animation_bird_3() {
}
static void handle_animation_bird_death() {
- int bird_death_reset_frame;
-
if (kernel_anim[aa[3]].frame != local->bird_death_frame) {
local->bird_death_frame = kernel_anim[aa[3]].frame;
- bird_death_reset_frame = -1;
switch (local->bird_death_frame) {
case 27:
@@ -298,20 +287,12 @@ static void handle_animation_bird_death() {
kernel.force_restart = true;
break;
}
-
- if (bird_death_reset_frame >= 0) {
- kernel_reset_animation(aa[3], bird_death_reset_frame);
- local->bird_death_frame = bird_death_reset_frame;
- }
}
}
static void handle_animation_zap() {
- int zap_reset_frame;
-
if (kernel_anim[aa[4]].frame != local->zap_frame) {
local->zap_frame = kernel_anim[aa[4]].frame;
- zap_reset_frame = -1;
switch (local->zap_frame) {
case 30:
@@ -331,11 +312,6 @@ static void handle_animation_zap() {
}
break;
}
-
- if (zap_reset_frame >= 0) {
- kernel_reset_animation(aa[4], zap_reset_frame);
- local->zap_frame = zap_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room504.cpp b/engines/mads/dragonsphere/rooms/room504.cpp
index 921cc77cec6..2be8fcb65f9 100644
--- a/engines/mads/dragonsphere/rooms/room504.cpp
+++ b/engines/mads/dragonsphere/rooms/room504.cpp
@@ -684,12 +684,10 @@ static void handle_animation_tom_poking() {
}
static void handle_animation_reveal() {
- int reveal_reset_frame;
int id;
if (kernel_anim[aa[3]].frame != local->reveal_frame) {
local->reveal_frame = kernel_anim[aa[3]].frame;
- reveal_reset_frame = -1;
switch (local->reveal_frame) {
case 7:
@@ -705,7 +703,6 @@ static void handle_animation_reveal() {
local->poking_action = TOM_SHUT_UP;
local->anim_4_running = true;
local->anim_3_running = false;
- reveal_reset_frame = -1;
conv_run(CONV_27_PID_HEAL);
conv_export_value(player_has(amulet));
@@ -720,7 +717,6 @@ static void handle_animation_reveal() {
local->poking_action = TOM_SHUT_UP;
local->anim_1_running = true;
local->anim_3_running = false;
- reveal_reset_frame = -1;
player.commands_allowed = true;
id = kernel_add_dynamic(words_Ner_Tom, words_walk_to, SYNTAX_SINGULAR_MASC, KERNEL_NONE,
@@ -738,11 +734,6 @@ static void handle_animation_reveal() {
}
break;
}
-
- if (reveal_reset_frame >= 0) {
- kernel_reset_animation(aa[3], reveal_reset_frame);
- local->reveal_frame = reveal_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room506.cpp b/engines/mads/dragonsphere/rooms/room506.cpp
index 2944c571288..7ba81ff2212 100644
--- a/engines/mads/dragonsphere/rooms/room506.cpp
+++ b/engines/mads/dragonsphere/rooms/room506.cpp
@@ -243,20 +243,15 @@ static void handle_animation_pid() {
static void handle_animation_climbing_lower() {
- int king_reset_frame;
-
if (kernel_anim[aa[1]].frame != local->king_frame) {
local->king_frame = kernel_anim[aa[1]].frame;
- king_reset_frame = -1;
switch (local->king_frame) {
-
case 105:
kernel_abort_animation(aa[1]);
aa[3] = kernel_run_animation(kernel_name('k', 3), 0);
kernel_synch(KERNEL_ANIM, aa[3], KERNEL_NOW, 0);
player.commands_allowed = true;
- king_reset_frame = -1;
local->anim_1_running = false;
local->anim_3_running = true;
local->king_action = KING_FREEZE;
@@ -267,30 +262,20 @@ static void handle_animation_climbing_lower() {
new_room = 502;
break;
}
-
- if (king_reset_frame >= 0) {
- kernel_reset_animation(aa[1], king_reset_frame);
- local->king_frame = king_reset_frame;
- }
}
}
static void handle_animation_climbing_upper() {
- int king_reset_frame;
-
if (kernel_anim[aa[2]].frame != local->king_frame) {
local->king_frame = kernel_anim[aa[2]].frame;
- king_reset_frame = -1;
switch (local->king_frame) {
-
case 200:
kernel_abort_animation(aa[2]);
aa[3] = kernel_run_animation(kernel_name('k', 3), 0);
kernel_synch(KERNEL_ANIM, aa[3], KERNEL_NOW, 0);
player.commands_allowed = true;
- king_reset_frame = -1;
local->anim_2_running = false;
local->anim_3_running = true;
local->king_action = KING_FREEZE;
@@ -305,11 +290,6 @@ static void handle_animation_climbing_upper() {
}
break;
}
-
- if (king_reset_frame >= 0) {
- kernel_reset_animation(aa[2], king_reset_frame);
- local->king_frame = king_reset_frame;
- }
}
}
Commit: ba9c89a5e0be6d5c724252aad6f6146f0ae32e13
https://github.com/scummvm/scummvm/commit/ba9c89a5e0be6d5c724252aad6f6146f0ae32e13
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T12:39:18+10:00
Commit Message:
MADS: DRAGONSPHERE: activate_timer in room 201 can be -1 or 1
Changed paths:
engines/mads/dragonsphere/rooms/room201.cpp
diff --git a/engines/mads/dragonsphere/rooms/room201.cpp b/engines/mads/dragonsphere/rooms/room201.cpp
index c0b893bee35..29fe94ec487 100644
--- a/engines/mads/dragonsphere/rooms/room201.cpp
+++ b/engines/mads/dragonsphere/rooms/room201.cpp
@@ -543,7 +543,7 @@ static void room_201_init() {
local->anim_4_running = false;
local->anim_5_running = false;
local->anim_6_running = false;
- local->activate_timer = false;
+ local->activate_timer = 0;
local->left_ready_to_fall = false;
local->right_ready_to_fall = false;
local->crossed_line = false;
@@ -1567,13 +1567,13 @@ static void room_201_daemon() {
} else {
if (local->activate_timer == 1) {
text_show(20157);
- local->activate_timer = false;
+ local->activate_timer = 0;
local->pid_action = FALL;
player.commands_allowed = false;
kernel_set_interface_mode(INTER_LIMITED_SENTENCES);
} else {
- local->activate_timer = false;
+ local->activate_timer = 0;
conv_run(CONV_54_PID);
conv_export_value(0);
conv_export_value(0);
@@ -1813,7 +1813,7 @@ static void process_conv_king_guards() {
if (player_verb == conv047_give_b_b) { /* first time around */
*conv_my_next_start = conv047_postbribe;
you_trig_flag = true;
- local->activate_timer = true;
+ local->activate_timer = -1;
conv_abort();
}
@@ -2441,7 +2441,7 @@ static void room_201_parser() {
player_said_1(walk_down) ||
player_said_1(put) ||
player_said_1(throw)) {
- if (local->activate_timer) {
+ if (local->activate_timer == -1) {
text_show(20113);
goto handled;
Commit: 2fb35478a58314eb51d17011241707c723bd0028
https://github.com/scummvm/scummvm/commit/2fb35478a58314eb51d17011241707c723bd0028
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T15:53:28+10:00
Commit Message:
MADS: DRAGONSPHERE: Further dead code removal
Changed paths:
engines/mads/dragonsphere/rooms/room508.cpp
engines/mads/dragonsphere/rooms/room557.cpp
engines/mads/dragonsphere/rooms/room601.cpp
engines/mads/dragonsphere/rooms/room605.cpp
engines/mads/dragonsphere/rooms/room606.cpp
engines/mads/dragonsphere/rooms/room607.cpp
engines/mads/dragonsphere/rooms/room609.cpp
engines/mads/dragonsphere/rooms/room614.cpp
engines/mads/dragonsphere/rooms/room909.cpp
engines/mads/dragonsphere/rooms/section3.cpp
engines/mads/dragonsphere/rooms/section4.cpp
engines/mads/dragonsphere/rooms/section5.cpp
diff --git a/engines/mads/dragonsphere/rooms/room508.cpp b/engines/mads/dragonsphere/rooms/room508.cpp
index 58ffc119ab0..ec87299e06e 100644
--- a/engines/mads/dragonsphere/rooms/room508.cpp
+++ b/engines/mads/dragonsphere/rooms/room508.cpp
@@ -338,14 +338,10 @@ static void handle_animation_king_choice() {
}
static void handle_animation_king_aside() {
- int king_reset_frame;
-
if (kernel_anim[aa[3]].frame != local->king_frame_aside) {
local->king_frame_aside = kernel_anim[aa[3]].frame;
- king_reset_frame = -1;
switch (local->king_frame_aside) {
-
case 20:
kernel_reset_animation(aa[0], 24);
kernel_synch(KERNEL_ANIM, aa[0], KERNEL_ANIM, aa[3]);
@@ -357,23 +353,14 @@ static void handle_animation_king_aside() {
kernel_synch(KERNEL_ANIM, aa[2], KERNEL_ANIM, aa[3]);
break;
}
-
- if (king_reset_frame >= 0) {
- kernel_reset_animation(aa[3], king_reset_frame);
- local->king_frame_aside = king_reset_frame;
- }
}
}
static void handle_animation_king_cliff() {
- int king_reset_frame;
-
if (kernel_anim[aa[4]].frame != local->king_frame_cliff) {
local->king_frame_cliff = kernel_anim[aa[4]].frame;
- king_reset_frame = -1;
switch (local->king_frame_cliff) {
-
case 35:
global_speech_go(3);
break;
@@ -400,11 +387,6 @@ static void handle_animation_king_cliff() {
kernel_synch(KERNEL_ANIM, aa[2], KERNEL_ANIM, aa[4]);
break;
}
-
- if (king_reset_frame >= 0) {
- kernel_reset_animation(aa[4], king_reset_frame);
- local->king_frame_cliff = king_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room557.cpp b/engines/mads/dragonsphere/rooms/room557.cpp
index b701138b22c..8c260bf2c20 100644
--- a/engines/mads/dragonsphere/rooms/room557.cpp
+++ b/engines/mads/dragonsphere/rooms/room557.cpp
@@ -75,15 +75,12 @@ static void room_557_init() {
}
static void room_557_daemon() {
- int king_reset_frame;
-
if (kernel.trigger == ROOM_557_ROCK_SOUND) {
sound_play(N_RockClatter);
}
if (kernel_anim[aa[0]].frame != local->king_frame) {
local->king_frame = kernel_anim[aa[0]].frame;
- king_reset_frame = -1;
switch (local->king_frame) {
case 153:
@@ -104,11 +101,6 @@ static void room_557_daemon() {
new_room = 508;
break;
}
-
- if (king_reset_frame >= 0) {
- kernel_reset_animation(aa[0], king_reset_frame);
- local->king_frame = king_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room601.cpp b/engines/mads/dragonsphere/rooms/room601.cpp
index 85e281bf9aa..0d0ae61c70f 100644
--- a/engines/mads/dragonsphere/rooms/room601.cpp
+++ b/engines/mads/dragonsphere/rooms/room601.cpp
@@ -207,11 +207,8 @@ static void clear_all() {
}
static void handle_animation_king_0() {
- int16 king_0_reset_frame;
-
if (kernel_anim[aa[0]].frame != local->king_0_frame) {
local->king_0_frame = kernel_anim[aa[0]].frame;
- king_0_reset_frame = -1;
switch (local->king_0_frame) {
case 71:
@@ -237,17 +234,12 @@ static void handle_animation_king_0() {
aa[1] = kernel_run_animation(kernel_name('v', 2), 0);
local->anim_1_running = true;
local->king_1_action = STRUGGLE;
- king_0_reset_frame = -1;
+
kernel_synch(KERNEL_ANIM, aa[1], KERNEL_NOW, 0);
kernel_reset_animation(aa[1], 71);
kernel_timing_trigger(ONE_SECOND, 1);
break;
}
-
- if (king_0_reset_frame >= 0) {
- kernel_reset_animation(aa[0], king_0_reset_frame);
- local->king_0_frame = king_0_reset_frame;
- }
}
}
@@ -324,11 +316,8 @@ static void handle_animation_king_1() {
}
static void handle_animation_king_2() {
- int16 king_2_reset_frame;
-
if (kernel_anim[aa[6]].frame != local->king_2_frame) {
local->king_2_frame = kernel_anim[aa[6]].frame;
- king_2_reset_frame = -1;
switch (local->king_2_frame) {
case 10:
@@ -362,11 +351,6 @@ static void handle_animation_king_2() {
kernel_seq_trigger(seq[fx_door], KERNEL_TRIGGER_EXPIRE, 0, ROOM_601_DOOR_OPENS);
break;
}
-
- if (king_2_reset_frame >= 0) {
- kernel_reset_animation(aa[6], king_2_reset_frame);
- local->king_2_frame = king_2_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room605.cpp b/engines/mads/dragonsphere/rooms/room605.cpp
index 62a592b4660..f7257b711fa 100644
--- a/engines/mads/dragonsphere/rooms/room605.cpp
+++ b/engines/mads/dragonsphere/rooms/room605.cpp
@@ -191,14 +191,10 @@ static void handle_animation_rope() {
}
static void handle_animation_rat() {
- int rat_reset_frame;
-
if (kernel_anim[aa[1]].frame != local->rat_frame) {
local->rat_frame = kernel_anim[aa[1]].frame;
- rat_reset_frame = -1;
switch (local->rat_frame) {
-
case 1:
kernel_seq_delete(seq[fx_lid_closed]);
break;
@@ -211,18 +207,12 @@ static void handle_animation_rat() {
case 50:
local->anim_1_running = false;
- rat_reset_frame = -1;
seq[fx_lid_open] = kernel_seq_stamp(ss[fx_lid_open], false, KERNEL_FIRST);
kernel_seq_depth(seq[fx_lid_open], 2);
text_show(60569);
kernel_flip_hotspot(words_dead_rat, true);
break;
}
-
- if (rat_reset_frame >= 0) {
- kernel_reset_animation(aa[1], rat_reset_frame);
- local->rat_frame = rat_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room606.cpp b/engines/mads/dragonsphere/rooms/room606.cpp
index f7f9e6aba4f..a8422c9c33c 100644
--- a/engines/mads/dragonsphere/rooms/room606.cpp
+++ b/engines/mads/dragonsphere/rooms/room606.cpp
@@ -239,14 +239,10 @@ static void set_stone_position() {
}
static void handle_anim_up() {
- int up_reset_frame;
-
if (kernel_anim[aa[0]].frame != local->up_frame) {
local->up_frame = kernel_anim[aa[0]].frame;
- up_reset_frame = -1;
switch (local->up_frame) {
-
case 290:
camera_pan_to(&camera_y, picture_view_y - 155);
break;
@@ -274,8 +270,8 @@ static void handle_anim_up() {
kernel_abort_animation(aa[0]);
local->on_floor = 3;
local->anim_0_running = false;
+
player.walker_visible = true;
- up_reset_frame = -1;
player_demand_location(KING_TOP_ELEV_X, KING_TOP_ELEV_Y);
player_demand_facing(FACING_SOUTH);
kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
@@ -302,7 +298,7 @@ static void handle_anim_up() {
local->anim_0_running = false;
player.walker_visible = true;
player.commands_allowed = true;
- up_reset_frame = -1;
+
player_demand_location(KING_MIDDLE_ELEV_X, KING_MIDDLE_ELEV_Y);
player_demand_facing(FACING_SOUTH);
kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
@@ -316,23 +312,14 @@ static void handle_anim_up() {
kernel_timing_trigger(TENTH_SECOND, ROOM_606_LOAD_VARIANT);
break;
}
-
- if (up_reset_frame >= 0) {
- kernel_reset_animation(aa[0], up_reset_frame);
- local->up_frame = up_reset_frame;
- }
}
}
static void handle_anim_down() {
- int down_reset_frame;
-
if (kernel_anim[aa[1]].frame != local->down_frame) {
local->down_frame = kernel_anim[aa[1]].frame;
- down_reset_frame = -1;
switch (local->down_frame) {
-
case 21:
camera_pan_to(&camera_y, picture_view_y + 100);
break;
@@ -362,7 +349,7 @@ static void handle_anim_down() {
local->anim_1_running = false;
player.walker_visible = true;
player.commands_allowed = true;
- down_reset_frame = -1;
+
player_demand_location(KING_MIDDLE_ELEV_X, KING_MIDDLE_ELEV_Y);
player_demand_facing(FACING_SOUTH);
kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
@@ -383,7 +370,7 @@ static void handle_anim_down() {
local->anim_1_running = false;
player.walker_visible = true;
player.commands_allowed = true;
- down_reset_frame = -1;
+
player_demand_location(KING_BOTTOM_ELEV_X, KING_BOTTOM_ELEV_Y);
player_demand_facing(FACING_SOUTH);
kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
@@ -397,20 +384,12 @@ static void handle_anim_down() {
kernel_timing_trigger(TENTH_SECOND, ROOM_606_LOAD_VARIANT);
break;
}
-
- if (down_reset_frame >= 0) {
- kernel_reset_animation(aa[1], down_reset_frame);
- local->down_frame = down_reset_frame;
- }
}
}
static void handle_anim_suction() {
- int suction_reset_frame;
-
if (kernel_anim[aa[3]].frame != local->suction_frame) {
local->suction_frame = kernel_anim[aa[3]].frame;
- suction_reset_frame = -1;
switch (local->suction_frame) {
case 11:
@@ -425,18 +404,13 @@ static void handle_anim_suction() {
object_examine(teleport_door, 60629, 0);
kernel_abort_animation(aa[3]);
global[player_score] += 1;
- suction_reset_frame = -1;
+
player.commands_allowed = true;
player.walker_visible = true;
local->anim_3_running = false;
kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
break;
}
-
- if (suction_reset_frame >= 0) {
- kernel_reset_animation(aa[3], suction_reset_frame);
- local->suction_frame = suction_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room607.cpp b/engines/mads/dragonsphere/rooms/room607.cpp
index 812fab56783..f989ce39847 100644
--- a/engines/mads/dragonsphere/rooms/room607.cpp
+++ b/engines/mads/dragonsphere/rooms/room607.cpp
@@ -179,11 +179,8 @@ static void room_607_init() {
}
static void handle_animation_pour() {
- int pour_reset_frame;
-
if (kernel_anim[aa[0]].frame != local->pour_frame) {
local->pour_frame = kernel_anim[aa[0]].frame;
- pour_reset_frame = -1;
switch (local->pour_frame) {
case 10:
@@ -204,11 +201,6 @@ static void handle_animation_pour() {
kernel_synch(KERNEL_PLAYER, 0, KERNEL_ANIM, aa[0]);
break;
}
-
- if (pour_reset_frame >= 0) {
- kernel_reset_animation(aa[0], pour_reset_frame);
- local->pour_frame = pour_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room609.cpp b/engines/mads/dragonsphere/rooms/room609.cpp
index 4395eac9064..91886c59a4a 100644
--- a/engines/mads/dragonsphere/rooms/room609.cpp
+++ b/engines/mads/dragonsphere/rooms/room609.cpp
@@ -167,49 +167,29 @@ static void room_609_init() {
}
static void handle_animation_king() {
- int king_reset_frame;
-
if (kernel_anim[aa[0]].frame != local->king_frame) {
local->king_frame = kernel_anim[aa[0]].frame;
- king_reset_frame = -1;
- switch (local->king_frame) {
- case 21:
+ if (local->king_frame == 21) {
seq[fx_torch] = kernel_seq_forward(ss[fx_torch], false, 6, 0, 0, 0);
kernel_seq_depth(seq[fx_torch], 2);
kernel_seq_range(seq[fx_torch], KERNEL_FIRST, KERNEL_LAST);
inter_move_object(torch, 509);
- break;
- }
-
- if (king_reset_frame >= 0) {
- kernel_reset_animation(aa[0], king_reset_frame);
- local->king_frame = king_reset_frame;
}
}
}
static void handle_animation_down() {
- int down_reset_frame;
-
if (kernel_anim[aa[1]].frame != local->down_frame) {
local->down_frame = kernel_anim[aa[1]].frame;
- down_reset_frame = -1;
- switch (local->down_frame) {
- case 45:
+ if (local->down_frame == 45) {
kernel_seq_delete(seq[fx_stone_gone]);
kernel_flip_hotspot(words_powerstone, false);
global[player_score] += 5;
sound_play(N_TakeObjectSnd);
inter_give_to_player(blue_powerstone);
object_examine(blue_powerstone, 60922, 0);
- break;
- }
-
- if (down_reset_frame >= 0) {
- kernel_reset_animation(aa[1], down_reset_frame);
- local->down_frame = down_reset_frame;
}
}
}
diff --git a/engines/mads/dragonsphere/rooms/room614.cpp b/engines/mads/dragonsphere/rooms/room614.cpp
index 5578deb006e..c4fbfd0e0e9 100644
--- a/engines/mads/dragonsphere/rooms/room614.cpp
+++ b/engines/mads/dragonsphere/rooms/room614.cpp
@@ -907,11 +907,8 @@ static void handle_animation_wiz_ice() {
}
static void handle_animation_wiz_end() {
- int wiz_end_reset_frame;
-
if (kernel_anim[aa[7]].frame != local->wiz_end_frame) {
local->wiz_end_frame = kernel_anim[aa[7]].frame;
- wiz_end_reset_frame = -1;
switch (local->wiz_end_frame) {
case 10: /* just threw stone */
@@ -966,11 +963,6 @@ static void handle_animation_wiz_end() {
/* go to cut scene */
break;
}
-
- if (wiz_end_reset_frame >= 0) {
- kernel_reset_animation(aa[7], wiz_end_reset_frame);
- local->wiz_end_frame = wiz_end_reset_frame;
- }
}
}
diff --git a/engines/mads/dragonsphere/rooms/room909.cpp b/engines/mads/dragonsphere/rooms/room909.cpp
index 84e314a5916..f55bd9af823 100644
--- a/engines/mads/dragonsphere/rooms/room909.cpp
+++ b/engines/mads/dragonsphere/rooms/room909.cpp
@@ -176,7 +176,7 @@ static void room_909_daemon() {
// text can substitute the values via [INDEX N] commands.
// text_index[0] = current score
// text_index[1] = maximum score
- // text_index[2] = rank tier 1-9
+ // text_index[2] = rank tier 1-8
text_index[1] = 250;
text_index[0] = score;
@@ -189,8 +189,7 @@ static void room_909_daemon() {
else if (score <= 150) tier = 5;
else if (score <= 200) tier = 6;
else if (score <= 249) tier = 7;
- else if (score <= 250) tier = 8; // exactly 250
- else tier = 9; // unreachable in normal play
+ else tier = 8; // exactly 250
text_index[2] = tier;
diff --git a/engines/mads/dragonsphere/rooms/section3.cpp b/engines/mads/dragonsphere/rooms/section3.cpp
index 9c35eb7e2f5..b928083297a 100644
--- a/engines/mads/dragonsphere/rooms/section3.cpp
+++ b/engines/mads/dragonsphere/rooms/section3.cpp
@@ -45,7 +45,6 @@ void section_3_init() {
void section_3_walker() {
char temp_buf[80];
- int dark_background = false;
int no_walker = false;
sound_queue(N_NoiseFade);
@@ -54,10 +53,6 @@ void section_3_walker() {
global[perform_displacements] = false;
- if (new_room == 603) {
- dark_background = false;
- }
-
if (no_walker || global[no_load_walker]) {
player.series_name[0] = 0;
} else if (!player.force_series) {
@@ -66,11 +61,10 @@ void section_3_walker() {
} else {
Common::strcpy_s(player.series_name, "PD");
}
- if (dark_background)
- Common::strcat_s(player.series_name, "D");
}
- if (strcmp(temp_buf, player.series_name) != 0) player.walker_must_reload = true;
+ if (strcmp(temp_buf, player.series_name) != 0)
+ player.walker_must_reload = true;
player.scaling_velocity = true;
}
diff --git a/engines/mads/dragonsphere/rooms/section4.cpp b/engines/mads/dragonsphere/rooms/section4.cpp
index 48e95891eb0..f1f003843b6 100644
--- a/engines/mads/dragonsphere/rooms/section4.cpp
+++ b/engines/mads/dragonsphere/rooms/section4.cpp
@@ -55,7 +55,6 @@ void section_4_init() {
void section_4_walker() {
char temp_buf[80];
- int dark_background = false;
int no_walker = false;
sound_queue(N_NoiseFade);
@@ -68,10 +67,6 @@ void section_4_walker() {
global[perform_displacements] = true;
}
- if (new_room == 603) {
- dark_background = false;
- }
-
if (no_walker || global[no_load_walker]) {
player.series_name[0] = 0;
} else if (!player.force_series) {
@@ -80,11 +75,10 @@ void section_4_walker() {
} else {
Common::strcpy_s(player.series_name, "PD");
}
- if (dark_background)
- Common::strcat_s(player.series_name, "D");
}
- if (strcmp(temp_buf, player.series_name) != 0) player.walker_must_reload = true;
+ if (strcmp(temp_buf, player.series_name) != 0)
+ player.walker_must_reload = true;
player.scaling_velocity = true;
}
diff --git a/engines/mads/dragonsphere/rooms/section5.cpp b/engines/mads/dragonsphere/rooms/section5.cpp
index 45e6908c35d..aa8ad45204d 100644
--- a/engines/mads/dragonsphere/rooms/section5.cpp
+++ b/engines/mads/dragonsphere/rooms/section5.cpp
@@ -55,7 +55,6 @@ void section_5_init() {
void section_5_walker() {
char temp_buf[80];
- int dark_background;
int no_walker = false;
sound_queue(N_NoiseFade);
@@ -65,9 +64,6 @@ void section_5_walker() {
no_walker = ((new_room == 506) || (new_room == 507) || (new_room == 510) ||
(new_room == 511));
- /* dark_background = ((new_room >= 113) && (new_room != 118)); */
- dark_background = false;
-
if (no_walker) {
player.series_name[0] = 0;
} else if (!player.force_series) {
@@ -76,11 +72,10 @@ void section_5_walker() {
} else {
Common::strcpy_s(player.series_name, "PD");
}
- if (dark_background)
- Common::strcat_s(player.series_name, "D");
}
- if (strcmp(temp_buf, player.series_name) != 0) player.walker_must_reload = true;
+ if (strcmp(temp_buf, player.series_name) != 0)
+ player.walker_must_reload = true;
player.scaling_velocity = true;
}
More information about the Scummvm-git-logs
mailing list