[Scummvm-git-logs] scummvm master -> 40e784859a8db62f09f8d445c59982ff1b43fe6e
dreammaster
noreply at scummvm.org
Thu Jun 4 11:42:04 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
7cce546f42 MADS: FOREST: Support functions for room 101 init and daemon
40e784859a MADS: FOREST: Implemented remainder of room 101
Commit: 7cce546f42b3d9bb4e6c55f604c9e17f56eefe4c
https://github.com/scummvm/scummvm/commit/7cce546f42b3d9bb4e6c55f604c9e17f56eefe4c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-06-04T21:41:31+10:00
Commit Message:
MADS: FOREST: Support functions for room 101 init and daemon
Changed paths:
engines/mads/madsv2/core/digi.cpp
engines/mads/madsv2/core/digi.h
engines/mads/madsv2/core/mouse.cpp
engines/mads/madsv2/core/mouse.h
engines/mads/madsv2/forest/global.cpp
engines/mads/madsv2/forest/global.h
engines/mads/madsv2/forest/rooms/room101.cpp
diff --git a/engines/mads/madsv2/core/digi.cpp b/engines/mads/madsv2/core/digi.cpp
index 49cbb8c55c4..bc683eb315b 100644
--- a/engines/mads/madsv2/core/digi.cpp
+++ b/engines/mads/madsv2/core/digi.cpp
@@ -25,7 +25,10 @@
namespace MADS {
namespace MADSV2 {
+bool digi_flag1;
+
void digi_install() {
+ digi_flag1 = false;
}
void digi_uninstall() {
diff --git a/engines/mads/madsv2/core/digi.h b/engines/mads/madsv2/core/digi.h
index 69cb647d13e..e8795ec3db6 100644
--- a/engines/mads/madsv2/core/digi.h
+++ b/engines/mads/madsv2/core/digi.h
@@ -27,6 +27,8 @@
namespace MADS {
namespace MADSV2 {
+extern bool digi_flag1;
+
extern void digi_install();
extern void digi_play(const char *name, int slot);
extern void digi_play_build(int room, char thing, int num, int slot);
diff --git a/engines/mads/madsv2/core/mouse.cpp b/engines/mads/madsv2/core/mouse.cpp
index e8cb0d6bf0f..83d11e75f15 100644
--- a/engines/mads/madsv2/core/mouse.cpp
+++ b/engines/mads/madsv2/core/mouse.cpp
@@ -45,6 +45,7 @@ int mouse_old_x = 0;
int mouse_old_y = 0;
long mouse_clock = 0;
byte mouse_showing = 0;
+byte mouse_hidden = true;
int mouse_video_mode = 0;
@@ -56,10 +57,15 @@ int mouse_init(int driverflag, int videomode) {
void mouse_show() {
if (!CursorMan.isVisible())
CursorMan.showMouse(true);
+
+ mouse_showing = true;
+ mouse_hidden = false;
}
void mouse_hide() {
CursorMan.showMouse(false);
+ mouse_showing = false;
+ mouse_hidden = true;
}
void mouse_force(int x, int y) {
diff --git a/engines/mads/madsv2/core/mouse.h b/engines/mads/madsv2/core/mouse.h
index 59a3a97e298..7faf48725d7 100644
--- a/engines/mads/madsv2/core/mouse.h
+++ b/engines/mads/madsv2/core/mouse.h
@@ -38,6 +38,7 @@ extern word mouse_driver; /* True if mouse driver is currently active */
extern word mouse_known_mode; /* True if mouse in a 320x200 graphics mode */
extern int mouse_video_mode; /* Rom BIOS video mode # of current cursor */
extern byte mouse_showing; /* Mouse cursor showing status (0 = show) */
+extern byte mouse_hidden;
extern int mouse_button; /* Last button pressed (0 = left, 1 = right) */
extern int mouse_status; /* Button status flags */
diff --git a/engines/mads/madsv2/forest/global.cpp b/engines/mads/madsv2/forest/global.cpp
index 449173192f0..eeb31fdb4ee 100644
--- a/engines/mads/madsv2/forest/global.cpp
+++ b/engines/mads/madsv2/forest/global.cpp
@@ -23,6 +23,7 @@
#include "mads/madsv2/core/digi.h"
#include "mads/madsv2/core/error.h"
#include "mads/madsv2/core/game.h"
+#include "mads/madsv2/core/imath.h"
#include "mads/madsv2/core/kernel.h"
#include "mads/madsv2/core/midi.h"
#include "mads/madsv2/forest/global.h"
@@ -167,6 +168,704 @@ void sync_room(Common::Serializer &s) {
}
}
+static void global_anim1_1(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_4 = -1;
+
+ if (arg_2 == 0) {
+ var_4 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g133] == 1)
+ var_4 = 0;
+ break;
+
+ case 2:
+ case 17:
+ if (global[g133] == 0) {
+ var_4 = 1;
+ global[g134]++;
+ if (global[g134] > 17) {
+ var_4 = imath_random(1, 2);
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_4 = 1;
+ global[g136] = -1;
+ }
+ break;
+
+ case 6:
+ case 8:
+ case 13:
+ if (global[g133] == 0) {
+ global[g134]++;
+ if (imath_random(5, 10) >= global[g134]) {
+ if (*arg_4 == 8)
+ var_4 = 6;
+ else
+ var_4 = *arg_4 - 1;
+ } else {
+ int16 pick = imath_random(1, 4) - 1;
+ if (pick == 0) var_4 = 5;
+ else if (pick == 1) var_4 = 7;
+ else if (pick == 2) var_4 = 8;
+ else if (pick == 3) var_4 = 13;
+ if (*arg_4 == 13)
+ var_4 = 7;
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_4 = 13;
+ }
+ break;
+
+ case 10:
+ if (global[g133] == 0) {
+ global[g134]++;
+ if (imath_random(5, 10) >= global[g134]) {
+ var_4 = *arg_4 - 1;
+ } else {
+ var_4 = imath_random(9, 10);
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_4 = 10;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_4 >= 0) {
+ kernel_reset_animation(arg_0, var_4);
+ *arg_4 = var_4;
+ }
+}
+
+static void global_anim1_2(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g133] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 20:
+ if (global[g133] == 0) {
+ var_2 = 1;
+ global[g134]++;
+ if (global[g134] > 17) {
+ var_2 = imath_random(1, 2);
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_2 = 1;
+ global[g136] = -1;
+ }
+ break;
+
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ case 12:
+ if (global[g133] == 0) {
+ global[g134]++;
+ if (global[g134] > 17) {
+ var_2 = imath_random(7, 13);
+ if (var_2 == 13)
+ var_2 = 14;
+ global[g134] = 0;
+ } else {
+ var_2 = *arg_4 - 1;
+ }
+ } else if (global[g133] == 1) {
+ var_2 = 14;
+ }
+ break;
+
+ case 14:
+ var_2 = 7;
+ global[g134] = 0;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
+static void global_anim1_3(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g133] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 10:
+ if (global[g133] == 0) {
+ var_2 = 1;
+ global[g134]++;
+ if (global[g134] > 17) {
+ var_2 = imath_random(1, 2);
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_2 = 1;
+ global[g136] = -1;
+ }
+ break;
+
+ case 5:
+ case 7:
+ if (global[g133] == 0) {
+ global[g134]++;
+ if (imath_random(5, 10) < global[g134]) {
+ var_2 = 7;
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_2 = 7;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
+static void global_anim1_4(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g133] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 3:
+ case 4:
+ if (global[g133] == 0) {
+ global[g134]++;
+ if (imath_random(7, 15) >= global[g134]) {
+ var_2 = *arg_4 - 1;
+ } else {
+ var_2 = imath_random(1, 3);
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_2 = 4;
+ }
+ break;
+
+ case 5:
+ var_2 = 4;
+ global[g136] = -1;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
+static void global_anim1_5(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g133] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 3:
+ if (global[g133] == 0) {
+ global[g134]++;
+ if (imath_random(7, 15) >= global[g134]) {
+ var_2 = *arg_4 - 1;
+ } else {
+ var_2 = imath_random(1, 2);
+ global[g134] = 0;
+ }
+ } else if (global[g133] == 1) {
+ var_2 = 3;
+ }
+ break;
+
+ case 4:
+ var_2 = 3;
+ global[g136] = -1;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
+void global_anim1(int arg_0, int arg_2, int arg_4, int16 *arg_6) {
+ if (global[g150]) {
+ global[g135] = -1;
+ global[g145] = -1;
+ }
+
+ if (global[g135])
+ global[g133] = 1;
+
+ if (global[g150]) {
+ if (global[g146] && global[g136]) {
+ global[g146] = 0;
+ global[g136] = 0;
+ global[g145] = 0;
+ global[g135] = 0;
+ global[g150] = 0;
+ kernel_timing_trigger(1, 26);
+ }
+ } else {
+ if (global[g135] && global[g136]) {
+ global[g136] = 0;
+ global[g135] = 0;
+ kernel_timing_trigger(1, 24);
+ }
+ }
+
+ switch (arg_0) {
+ case 1:
+ case 3:
+ global_anim1_1(arg_2, arg_4, arg_6);
+ break;
+ case 2:
+ global_anim1_2(arg_2, arg_4, arg_6);
+ break;
+ case 4:
+ case 6:
+ global_anim1_3(arg_2, arg_4, arg_6);
+ break;
+ case 7:
+ case 9:
+ global_anim1_4(arg_2, arg_4, arg_6);
+ break;
+ case 8:
+ global_anim1_5(arg_2, arg_4, arg_6);
+
+ break;
+ default:
+ break;
+ }
+}
+
+static void global_anim2_1(int arg_0, int arg_2, int16 *arg_4);
+static void global_anim2_2(int arg_0, int arg_2, int16 *arg_4);
+static void global_anim2_3(int arg_0, int arg_2, int16 *arg_4);
+static void global_anim2_4(int arg_0, int arg_2, int16 *arg_4);
+static void global_anim2_5(int arg_0, int arg_2, int16 *arg_4);
+
+void global_anim2(int arg_0, int arg_2, int arg_4, int16 *arg_6) {
+ if (global[g150]) {
+ global[g135] = -1;
+ global[g145] = -1;
+ }
+
+ if (global[g145])
+ global[g143] = 1;
+
+ if (global[g150]) {
+ if (global[g146] && global[g136]) {
+ global[g146] = 0;
+ global[g136] = 0;
+ global[g145] = 0;
+ global[g135] = 0;
+ global[g150] = 0;
+ kernel_timing_trigger(1, 26);
+ }
+ } else {
+ if (global[g145] && global[g146]) {
+ global[g146] = 0;
+ global[g145] = 0;
+ kernel_timing_trigger(1, 25);
+ }
+ }
+
+ switch (arg_0) {
+ case 1:
+ case 3:
+ global_anim2_1(arg_2, arg_4, arg_6);
+ break;
+ case 2:
+ global_anim2_2(arg_2, arg_4, arg_6);
+ break;
+ case 4:
+ case 6:
+ global_anim2_3(arg_2, arg_4, arg_6);
+ break;
+ case 7:
+ case 9:
+ global_anim2_4(arg_2, arg_4, arg_6);
+ break;
+ case 8:
+ global_anim2_5(arg_2, arg_4, arg_6);
+ break;
+ default:
+ break;
+ }
+}
+
+static void global_anim2_1(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_4 = -1;
+
+ if (arg_2 == 0) {
+ var_4 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g143] == 1)
+ var_4 = 0;
+ break;
+
+ case 2:
+ case 3:
+ case 11:
+ if (global[g143] == 0) {
+ global[g144]++;
+ if (imath_random(10, 17) >= global[g144]) {
+ if (*arg_4 == 11)
+ var_4 = 1;
+ else
+ var_4 = *arg_4 - 1;
+ } else {
+ var_4 = imath_random(1, 3);
+ global[g144] = 0;
+ }
+ } else if (global[g143] == 1) {
+ var_4 = 11;
+ }
+ break;
+
+ case 5:
+ case 6:
+ case 8:
+ if (global[g143] == 0) {
+ global[g144]++;
+ if (imath_random(1, 3) >= global[g144]) {
+ if (*arg_4 == 8)
+ var_4 = 6;
+ else if (*arg_4 == 5)
+ var_4 = 5;
+ else
+ var_4 = *arg_4 - 1;
+ } else {
+ int16 pick = imath_random(1, 3) - 1;
+ if (pick == 0) var_4 = 5;
+ else if (pick == 1) var_4 = 6;
+ else if (pick == 2) var_4 = 8;
+ global[g144] = 0;
+ }
+ } else if (global[g143] == 1) {
+ global[g144] = 0;
+ var_4 = 8;
+ }
+ break;
+
+ case 10:
+ global[g144] = 0;
+ break;
+
+ case 12:
+ var_4 = 11;
+ global[g146] = -1;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_4 >= 0) {
+ kernel_reset_animation(arg_0, var_4);
+ *arg_4 = var_4;
+ }
+}
+
+static void global_anim2_2(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g143] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 15:
+ if (global[g143] == 0) {
+ var_2 = 1;
+ global[g144]++;
+ if (global[g144] > 17) {
+ var_2 = imath_random(1, 2);
+ global[g144] = 0;
+ }
+ } else if (global[g143] == 1) {
+ var_2 = 15;
+ }
+ break;
+
+ case 7:
+ digi_play_build_ii('_', 2, 3);
+ break;
+
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ if (global[g143] == 0) {
+ global[g144]++;
+ if (imath_random(5, 10) >= global[g144]) {
+ var_2 = imath_random(8, 10);
+ } else {
+ var_2 = imath_random(8, 11);
+ global[g144] = 0;
+ }
+ } else if (global[g143] == 1) {
+ var_2 = 11;
+ }
+ break;
+
+ case 16:
+ var_2 = 15;
+ global[g146] = -1;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
+static void global_anim2_3(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g143] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 8:
+ if (global[g143] == 0) {
+ var_2 = 1;
+ global[g144]++;
+ if (imath_random(15, 20) < global[g144]) {
+ var_2 = imath_random(1, 2);
+ global[g144] = 0;
+ }
+ } else if (global[g143] == 1) {
+ var_2 = 8;
+ }
+ break;
+
+ case 9:
+ var_2 = 8;
+ global[g146] = -1;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
+static void global_anim2_4(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g143] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 7:
+ if (global[g143] == 0) {
+ global[g144]++;
+ if (imath_random(7, 15) >= global[g144]) {
+ var_2 = 1;
+ } else {
+ var_2 = imath_random(1, 2);
+ global[g144] = 0;
+ }
+ } else if (global[g143] == 1) {
+ var_2 = 7;
+ }
+ break;
+
+ case 5:
+ if (imath_random(1, 2) == 1)
+ var_2 = 3;
+ break;
+
+ case 8:
+ var_2 = 7;
+ global[g146] = -1;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
+static void global_anim2_5(int arg_0, int arg_2, int16 *arg_4) {
+ if (kernel_anim[arg_0].frame == *arg_4)
+ return;
+
+ *arg_4 = kernel_anim[arg_0].frame;
+ int16 var_2 = -1;
+
+ if (arg_2 == 0) {
+ var_2 = 0;
+ } else {
+ switch (*arg_4) {
+ case 1:
+ if (global[g143] == 1)
+ var_2 = 0;
+ break;
+
+ case 2:
+ case 3:
+ if (global[g143] == 0) {
+ global[g144]++;
+ if (imath_random(7, 15) >= global[g144]) {
+ var_2 = *arg_4 - 1;
+ } else {
+ var_2 = imath_random(1, 2);
+ global[g144] = 0;
+ }
+ } else if (global[g143] == 1) {
+ var_2 = 3;
+ }
+ break;
+
+ case 4:
+ var_2 = 3;
+ global[g146] = -1;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (var_2 >= 0) {
+ kernel_reset_animation(arg_0, var_2);
+ *arg_4 = var_2;
+ }
+}
+
void global_digi_play(int num) {
// TODO
warning("TODO: global_digi_play");
diff --git a/engines/mads/madsv2/forest/global.h b/engines/mads/madsv2/forest/global.h
index 52f035909e7..286505cc4d0 100644
--- a/engines/mads/madsv2/forest/global.h
+++ b/engines/mads/madsv2/forest/global.h
@@ -33,7 +33,7 @@ enum {
walker_timing = 0, /* Stop walker timing (long) */
walker_timing_2 = 1,
inventory_is_displayed = 2, /* T if inventory is being displayed */
- g003 = 3,
+ player_hyperwalked = 3,
player_selected_object = 4,
walker_converse_state = 5,
walker_converse_now = 6,
@@ -248,6 +248,8 @@ extern int16 flags[40];
extern void global_section_constructor();
extern void sync_room(Common::Serializer &s);
+extern void global_anim1(int arg_0, int arg_2, int arg_4, int16 *arg_6);
+extern void global_anim2(int arg_0, int arg_2, int arg_4, int16 *arg_6);
extern void global_digi_play(int num);
extern void global_daemon_code();
diff --git a/engines/mads/madsv2/forest/rooms/room101.cpp b/engines/mads/madsv2/forest/rooms/room101.cpp
index b1c5c7e0b9b..b7a5928c463 100644
--- a/engines/mads/madsv2/forest/rooms/room101.cpp
+++ b/engines/mads/madsv2/forest/rooms/room101.cpp
@@ -30,6 +30,7 @@
#include "mads/madsv2/core/mouse.h"
#include "mads/madsv2/core/object.h"
#include "mads/madsv2/core/player.h"
+#include "mads/madsv2/core/sprite.h"
#include "mads/madsv2/core/text.h"
#include "mads/madsv2/forest/mads/inventory.h"
#include "mads/madsv2/forest/mads/sounds.h"
@@ -81,9 +82,10 @@ struct Scratch {
static Scratch scratch;
-#define ss scratch.sprite
-#define seq scratch.sequence
-#define aa scratch.animation
+#define ss scratch.sprite
+#define seq scratch.sequence
+#define aa scratch.animation
+#define aainfo scratch.array1
static void room_101_init1() {
global[g009] = -1;
@@ -288,8 +290,358 @@ static void room_101_init() {
}
}
+static void room_101_anim1() {
+ int16 frame = kernel_anim[aa[6]].frame;
+ if (frame == aainfo[6]._val2)
+ return;
+ aainfo[6]._val2 = frame;
+
+ switch (scratch._ac) {
+ case 2:
+ if (frame == 1) {
+ aainfo[6]._val3 = 10;
+ digi_play_build(101, 'b', 1, 1);
+ scratch._aa = 1;
+ return;
+ }
+ if (frame == 6) {
+ if (aainfo[6]._val3 != 10) return;
+ aainfo[6]._val2 = 2;
+ kernel_reset_animation(aa[6], 2);
+ return;
+ }
+ if (frame == 10) {
+ if (aainfo[6]._val3 != 9) return;
+ aainfo[6]._val2 = 6;
+ kernel_reset_animation(aa[6], 6);
+ return;
+ }
+ if (frame == 14) {
+ if (aainfo[6]._val3 != 12) return;
+ aainfo[6]._val2 = 13;
+ kernel_reset_animation(aa[6], 13);
+ }
+ return;
+
+ case 4:
+ if (frame == 10) {
+ aainfo[6]._val3 = 9;
+ digi_play_build(101, 'r', 2, 1);
+ scratch._aa = 10;
+ return;
+ }
+ if (frame == 15) {
+ if (aainfo[6]._val3 != 9) return;
+ aainfo[6]._val2 = 11;
+ kernel_reset_animation(aa[6], 11);
+ }
+ return;
+
+ case 6:
+ if (frame == 7) {
+ aainfo[6]._val3 = 11;
+ digi_play_build(101, 'e', 1, 1);
+ scratch._aa = 20;
+ return;
+ }
+ if (frame == 12) {
+ if (aainfo[6]._val3 != 11) return;
+ aainfo[6]._val2 = 8;
+ kernel_reset_animation(aa[6], 8);
+ }
+ return;
+
+ case 9:
+ if (frame == 28) {
+ aainfo[6]._val3 = 10;
+ digi_play_build(101, 'b', 3, 1);
+ scratch._aa = 30;
+ return;
+ }
+ if (frame == 30) {
+ if (aainfo[6]._val3 != 10) return;
+ aainfo[6]._val2 = 29;
+ kernel_reset_animation(aa[6], 29);
+ }
+ return;
+
+ case 10:
+ if (frame == 88) {
+ aainfo[6]._val3 = 10;
+ digi_play_build(101, 'b', 4, 1);
+ scratch._aa = 40;
+ return;
+ }
+ if (frame == 94) {
+ if (aainfo[6]._val3 != 10) return;
+ aainfo[6]._val2 = 90;
+ kernel_reset_animation(aa[6], 90);
+ }
+ return;
+ }
+}
+
+static void room_101_anim2() {
+ int16 frame = kernel_anim[aa[7]].frame;
+ if (frame == aainfo[7]._val2)
+ return;
+ aainfo[7]._val2 = frame;
+ if (frame != 18) return;
+ if (aainfo[7]._val3 != 7) return;
+ aainfo[7]._val2 = 6;
+ kernel_reset_animation(aa[7], 6);
+}
+
+static void room_101_anim3() {
+ int16 frame = kernel_anim[aa[0]].frame;
+ if (frame != aainfo[0]._val2)
+ aainfo[0]._val2 = frame;
+ if (global[player_hyperwalked] != -1) return;
+ int16 resetFrame = scratch._9c - 1;
+ aainfo[0]._val2 = resetFrame;
+ kernel_reset_animation(aa[0], resetFrame);
+}
+
+static void room_101_anim4() {
+ int16 frame = kernel_anim[aa[4]].frame;
+ if (frame == aainfo[4]._val2)
+ return;
+ aainfo[4]._val2 = frame;
+
+ switch (aainfo[4]._val3) {
+ case 13:
+ if (frame == 37)
+ digi_play_build(101, '_', 1, 2);
+ return;
+
+ case 14:
+ if (frame == 26) {
+ digi_play_build(101, '_', 1, 2);
+ return;
+ }
+ if (frame > 26) return;
+ if (frame == 2) {
+ digi_play_build(101, 'e', 2, 1);
+ scratch._aa = 50;
+ return;
+ }
+ if (frame == 7) {
+ if (scratch._aa != 50) return;
+ aainfo[4]._val2 = 3;
+ kernel_reset_animation(aa[4], 3);
+ return;
+ }
+ if (frame == 9) {
+ if (scratch._aa != 50) return;
+ aainfo[4]._val2 = 8;
+ kernel_reset_animation(aa[4], 8);
+ return;
+ }
+ if (frame == 18) {
+ if (scratch._aa != 51) return;
+ aainfo[4]._val2 = 14;
+ kernel_reset_animation(aa[4], 14);
+ }
+ return;
+
+ case 15:
+ if (frame == 24) {
+ digi_play_build(101, 'e', 4, 1);
+ scratch._aa = 0;
+ return;
+ }
+ if (frame == 41)
+ digi_play_build(101, '_', 1, 2);
+ return;
+ }
+}
+
+static void room_101_anim5() {
+ int16 frame = kernel_anim[aa[2]].frame;
+ if (frame != aainfo[2]._val2)
+ aainfo[2]._val2 = frame;
+}
+
+static void room_101_anim6() {
+ int16 frame = kernel_anim[aa[1]].frame;
+ if (frame != aainfo[1]._val2)
+ aainfo[1]._val2 = frame;
+}
+
+static void room_101_anim7() {
+ int16 frame = kernel_anim[aa[5]].frame;
+ if (frame == aainfo[5]._val2)
+ return;
+ aainfo[5]._val2 = frame;
+ if (frame == 2) {
+ if (scratch._ae != 4) return;
+ digi_initial_volume(100);
+ digi_play_build(101, '_', 500, 2);
+ global[g009] = 0;
+ return;
+ }
+ if (frame == 78) {
+ if (scratch._ae != 5) return;
+ kernel_abort_animation(aa[5]);
+ aainfo[5]._val1 = 0;
+ player.x = 96;
+ player.y = 140;
+ player.facing = 3;
+ player.walker_visible = -1;
+ player.commands_allowed = -1;
+ mouse_show();
+ kernel_synch(4, 2, 0, 0);
+ }
+}
+
+static void room_101_anim8() {
+ int16 frame = kernel_anim[aa[8]].frame;
+ if (frame == aainfo[8]._val2)
+ return;
+ aainfo[8]._val2 = frame;
+ if (frame != 9) {
+ if (frame != 81) return;
+ dont_frag_the_palette();
+ kernel_abort_animation(aa[8]);
+ aainfo[8]._val1 = 0;
+ stop_speech_on_run_animation = false;
+ aa[9] = kernel_run_animation(kernel_name('I', 2), 0);
+ aainfo[9]._val1 = -1;
+ kernel_synch(3, 3, aa[9], aa[8]);
+ }
+ kernel_timing_trigger(1, 113);
+}
+
+static void room_101_anim9() {
+ int16 frame = kernel_anim[aa[9]].frame;
+ if (frame != aainfo[9]._val2) {
+ aainfo[9]._val2 = frame;
+ if (frame == 99) {
+ digi_play_build(101, 'r', 3, 1);
+ scratch._b4 = 99;
+ } else if (frame < 99) {
+ if (frame == 1) {
+ digi_play_build(101, 'c', 1, 1);
+ scratch._b4 = 1;
+ } else if (frame == 67) {
+ digi_play_build(101, 'e', 5, 1);
+ scratch._b4 = 67;
+ }
+ } else {
+ if (frame == 135) {
+ digi_play_build(101, 'm', 1, 1);
+ scratch._b4 = 135;
+ } else if (frame == 163) {
+ digi_play_build(101, 'b', 6, 1);
+ scratch._b4 = 163;
+ } else if (frame == 205) {
+ dont_frag_the_palette();
+ kernel_abort_animation(aa[9]);
+ aainfo[9]._val1 = 0;
+ stop_speech_on_run_animation = false;
+ aa[10] = kernel_run_animation(kernel_name('I', 3), 0);
+ aainfo[10]._val1 = -1;
+ kernel_synch(3, 3, aa[10], aa[9]);
+ kernel_timing_trigger(1, 113);
+ }
+ }
+ }
+
+ if (kernel.trigger != 7 && kernel.trigger != 28) return;
+ int16 b4 = scratch._b4;
+ if (b4 == 1 || b4 == 67 || b4 == 99 || b4 == 135 || b4 == 163)
+ scratch._b4 = -1;
+}
+
+static void room_101_anim10() {
+ int16 frame = kernel_anim[aa[10]].frame;
+ if (frame != aainfo[10]._val2) {
+ aainfo[10]._val2 = frame;
+ if (frame == 90) {
+ stop_speech_on_run_animation = true;
+ kernel_abort_animation(aa[10]);
+ aainfo[10]._val1 = 0;
+ new_room = 106;
+ } else if (frame < 90) {
+ if (frame == 35) {
+ scratch._b4 = 35;
+ } else if (frame < 35) {
+ if (frame == 5)
+ global_digi_play(11);
+ else if (frame == 30) {
+ digi_play_build(101, '_', 3, 1);
+ scratch._b4 = 30;
+ }
+ } else {
+ if (frame == 47) {
+ digi_play_build(101, 'b', 7, 1);
+ scratch._b4 = 47;
+ } else if (frame == 70) {
+ digi_play_build(101, 'e', 6, 1);
+ scratch._b4 = 70;
+ } else if (frame == 81) {
+ digi_play_build(101, '_', 4, 1);
+ scratch._b4 = 81;
+ }
+ }
+ }
+ }
+
+ if (kernel.trigger != 7 && kernel.trigger != 28) return;
+ int16 b4 = scratch._b4;
+ if (b4 > 81) return;
+ if (b4 == 30 || b4 == 35 || b4 == 47 || b4 == 70 || b4 == 81)
+ scratch._b4 = -1;
+}
+
static void room_101_daemon() {
- // TODO
+ if (flags[0] < 0 && global[player_hyperwalked]) {
+ flags[0] = 0;
+ flags[1] = 0;
+ flags[2] = 0;
+ flags[3] = 0;
+ new_room = 904;
+ }
+
+ switch (kernel.trigger) {
+ case 113:
+ digi_initial_volume(90);
+ digi_play_build(101, '_', 5, 3);
+ digi_flag1 = true;
+ break;
+ }
+
+ if (kernel.trigger == 9 && flags[0] != -3)
+ scratch._b0 = 0;
+
+ if (scratch._b0 == 0 && flags[0] != -3) {
+ if (imath_random(1, 150) == 1) {
+ digi_initial_volume(25);
+ digi_play_build(104, '_', 1, 3);
+ scratch._b0 = -1;
+ }
+ }
+
+ if (flags[0] != -3) {
+ global_anim1(1, scratch._a4, global[g131], &global[g132]); // TODO: identify global_anim
+ global_anim2(3, scratch._a6, global[g141], &global[g142]); // TODO: identify global_anim_2
+ if (mouse_hidden != 0)
+ mouse_show();
+ }
+
+ if (aainfo[6]._val1) room_101_anim1();
+ if (aainfo[7]._val1) room_101_anim2();
+ if (aainfo[0]._val1) room_101_anim3();
+ if (aainfo[4]._val1) room_101_anim4();
+ if (aainfo[2]._val1) room_101_anim5();
+ if (aainfo[1]._val1) room_101_anim6();
+ if (aainfo[5]._val1) room_101_anim7();
+ if (aainfo[8]._val1) room_101_anim8();
+ if (aainfo[9]._val1) room_101_anim9();
+ if (aainfo[10]._val1) room_101_anim10();
+
+ if (scratch._b2)
+ kernel_random_frame(scratch._a8, &global[g151], global[g154]);
}
static void room_101_pre_parser() {
Commit: 40e784859a8db62f09f8d445c59982ff1b43fe6e
https://github.com/scummvm/scummvm/commit/40e784859a8db62f09f8d445c59982ff1b43fe6e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-06-04T21:41:31+10:00
Commit Message:
MADS: FOREST: Implemented remainder of room 101
Changed paths:
engines/mads/madsv2/forest/journal.cpp
engines/mads/madsv2/forest/journal.h
engines/mads/madsv2/forest/rooms/room101.cpp
diff --git a/engines/mads/madsv2/forest/journal.cpp b/engines/mads/madsv2/forest/journal.cpp
index b86344bbc25..07ee1c45009 100644
--- a/engines/mads/madsv2/forest/journal.cpp
+++ b/engines/mads/madsv2/forest/journal.cpp
@@ -37,7 +37,7 @@ void open_journal() {
// TODO
}
-void close_journal() {
+void close_journal(int mode) {
// TODO
}
diff --git a/engines/mads/madsv2/forest/journal.h b/engines/mads/madsv2/forest/journal.h
index 1e2f97fb3ed..c0bf195f389 100644
--- a/engines/mads/madsv2/forest/journal.h
+++ b/engines/mads/madsv2/forest/journal.h
@@ -31,7 +31,7 @@ namespace Forest {
extern void display_journal();
extern void leave_journal();
extern void open_journal();
-extern void close_journal();
+extern void close_journal(int mode);
} // namespace Forest
} // namespace MADSV2
diff --git a/engines/mads/madsv2/forest/rooms/room101.cpp b/engines/mads/madsv2/forest/rooms/room101.cpp
index b7a5928c463..85d59475940 100644
--- a/engines/mads/madsv2/forest/rooms/room101.cpp
+++ b/engines/mads/madsv2/forest/rooms/room101.cpp
@@ -36,6 +36,7 @@
#include "mads/madsv2/forest/mads/sounds.h"
#include "mads/madsv2/forest/mads/words.h"
#include "mads/madsv2/forest/global.h"
+#include "mads/madsv2/forest/journal.h"
#include "mads/madsv2/forest/rooms/section1.h"
#include "mads/madsv2/forest/rooms/room101.h"
@@ -490,7 +491,7 @@ static void room_101_anim7() {
player.walker_visible = -1;
player.commands_allowed = -1;
mouse_show();
- kernel_synch(4, 2, 0, 0);
+ kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
}
}
@@ -507,7 +508,7 @@ static void room_101_anim8() {
stop_speech_on_run_animation = false;
aa[9] = kernel_run_animation(kernel_name('I', 2), 0);
aainfo[9]._val1 = -1;
- kernel_synch(3, 3, aa[9], aa[8]);
+ kernel_synch(KERNEL_ANIM, aa[9], KERNEL_ANIM, aa[8]);
}
kernel_timing_trigger(1, 113);
}
@@ -541,7 +542,7 @@ static void room_101_anim9() {
stop_speech_on_run_animation = false;
aa[10] = kernel_run_animation(kernel_name('I', 3), 0);
aainfo[10]._val1 = -1;
- kernel_synch(3, 3, aa[10], aa[9]);
+ kernel_synch(KERNEL_ANIM, aa[10], KERNEL_ANIM, aa[9]);
kernel_timing_trigger(1, 113);
}
}
@@ -604,11 +605,398 @@ static void room_101_daemon() {
}
switch (kernel.trigger) {
+ case 7:
+ switch (scratch._aa) {
+ case 1:
+ aainfo[6]._val2 = 13;
+ kernel_reset_animation(aa[6], 13);
+ aainfo[6]._val3 = 12;
+ kernel_timing_trigger(25, 7);
+ scratch._aa++;
+ break;
+ case 2:
+ aainfo[6]._val2 = 6;
+ kernel_reset_animation(aa[6], 6);
+ aainfo[6]._val3 = 9;
+ digi_play_build(101, 'r', 1, 1);
+ scratch._aa++;
+ break;
+ case 3:
+ aainfo[6]._val2 = 13;
+ kernel_reset_animation(aa[6], 13);
+ aainfo[6]._val3 = 12;
+ kernel_timing_trigger(30, 106);
+ break;
+ case 4:
+ aainfo[6]._val2 = 12;
+ kernel_reset_animation(aa[6], 12);
+ aainfo[6]._val3 = 0;
+ scratch._aa++;
+ break;
+ case 10:
+ aainfo[6]._val2 = 15;
+ kernel_reset_animation(aa[6], 15);
+ aainfo[6]._val3 = 0;
+ scratch._aa++;
+ break;
+ case 20:
+ aainfo[6]._val2 = 13;
+ kernel_reset_animation(aa[6], 13);
+ aainfo[6]._val3 = 0;
+ scratch._aa++;
+ break;
+ case 29:
+ global[walker_converse_state] = 0;
+ close_journal(3);
+ player.commands_allowed = true;
+ break;
+ case 30:
+ aainfo[6]._val2 = 31;
+ kernel_reset_animation(aa[6], 31);
+ aainfo[6]._val3 = 0;
+ scratch._aa++;
+ break;
+ case 40:
+ aainfo[6]._val2 = 95;
+ kernel_reset_animation(aa[6], 95);
+ aainfo[6]._val3 = 0;
+ scratch._aa++;
+ break;
+ case 49:
+ kernel_abort_animation(scratch._a8);
+ scratch._b2 = 0;
+ kernel_reset_animation(scratch._a4, 0);
+ kernel_reset_animation(scratch._a6, 0);
+ global[g133] = 1;
+ global[g143] = 1;
+ inter_move_object(0, 2);
+ kernel_seq_delete(seq[2]);
+ kernel_flip_hotspot(105, 0);
+ aa[4] = kernel_run_animation(kernel_name('R', 5), 103);
+ aainfo[4]._val1 = -1;
+ aainfo[4]._val3 = 14;
+ scratch._a2 = 4;
+ kernel_synch(KERNEL_ANIM, scratch._a4, KERNEL_ANIM, aa[4]);
+ break;
+ case 50:
+ aainfo[4]._val2 = 8;
+ kernel_reset_animation(aa[4], 8);
+ kernel_timing_trigger(45, 107);
+ break;
+ case 51:
+ aainfo[4]._val2 = 19;
+ kernel_reset_animation(aa[4], 19);
+ break;
+ case 59:
+ kernel_abort_animation(scratch._a8);
+ scratch._b2 = 0;
+ kernel_reset_animation(scratch._a4, 0);
+ kernel_reset_animation(scratch._a6, 0);
+ global[g133] = 1;
+ global[g143] = 1;
+ inter_move_object(11, 2);
+ kernel_seq_delete(seq[0]);
+ kernel_flip_hotspot(164, 0);
+ aa[4] = kernel_run_animation(kernel_name('R', 6), 103);
+ aainfo[4]._val1 = -1;
+ aainfo[4]._val3 = 15;
+ scratch._a2 = 4;
+ kernel_synch(KERNEL_ANIM, scratch._a4, KERNEL_ANIM, aa[4]);
+ break;
+ case 69:
+ global[g154] = 0;
+ kernel_abort_animation(scratch._a8);
+ player.walker_visible = -1;
+ scratch._b2 = 0;
+ kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
+ kernel_timing_trigger(45, 109);
+ break;
+ default:
+ break;
+ }
+ break;
+
+ case 26:
+ switch (scratch._9a) {
+ case 15:
+ scratch._aa = 59;
+ global[g154] = 2;
+ player.commands_allowed = 0;
+ scratch._a8 = kernel_run_animation_talk('b', 7, 0);
+ kernel_position_anim(scratch._a8, player.x, player.y, player.scale, player.depth);
+ scratch._b2 = -1;
+ kernel_synch(KERNEL_ANIM, scratch._a8, KERNEL_PLAYER, 0);
+ digi_play_build_ii('b', 2, 1);
+ break;
+ case 14:
+ scratch._aa = 49;
+ global[g154] = 2;
+ player.commands_allowed = 0;
+ player.walker_visible = 0;
+ scratch._a8 = kernel_run_animation_talk('b', 6, 0);
+ kernel_position_anim(scratch._a8, player.x, player.y, player.scale, player.depth);
+ scratch._b2 = -1;
+ kernel_synch(KERNEL_ANIM, scratch._a8, KERNEL_PLAYER, 0);
+ digi_play_build_ii('b', 1, 1);
+ break;
+
+ case 13:
+ scratch._aa = 69;
+ player.commands_allowed = 0;
+ player.walker_visible = 0;
+ kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
+ global[g154] = 2;
+ scratch._a8 = kernel_run_animation_talk('b', 4, 0);
+ kernel_position_anim(scratch._a8, player.x, player.y, player.scale, player.depth);
+ scratch._b2 = -1;
+ kernel_synch(KERNEL_ANIM, scratch._a8, KERNEL_PLAYER, 0);
+ digi_play_build_ii('b', 2, 1);
+ break;
+
+ default:
+ break;
+ }
+ break;
+
+ case 24:
+ if (scratch._96 == 3) {
+ aa[1] = kernel_run_animation(kernel_name('E', 1), 102);
+ aainfo[1]._val1 = -1;
+ scratch._a0 = 1;
+ kernel_reset_animation(scratch._a4, 0);
+ kernel_synch(KERNEL_ANIM, aa[1], KERNEL_ANIM, scratch._a4);
+ global[g133] = 1;
+ }
+ break;
+
+ case 25:
+ if (scratch._98 == 2) {
+ aa[2] = kernel_run_animation(kernel_name('R', 1), 101);
+ aainfo[2]._val1 = -1;
+ scratch._9e = 2;
+ kernel_reset_animation(scratch._a6, 0);
+ kernel_synch(KERNEL_ANIM, aa[2], KERNEL_ANIM, scratch._a6);
+ global[g143] = 1;
+ }
+ break;
+
+ case 104:
+ switch (scratch._ac) {
+ case 1:
+ kernel_abort_animation(aa[6]);
+ aa[6] = kernel_run_animation(kernel_name('b', 2), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 2:
+ kernel_abort_animation(aa[6]);
+ aa[6] = kernel_run_animation(kernel_name('b', 3), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 3:
+ kernel_abort_animation(aa[6]);
+ aa[6] = kernel_run_animation(kernel_name('r', 1), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 4:
+ kernel_abort_animation(aa[6]);
+ aa[7] = kernel_run_animation(kernel_name('r', 2), 105);
+ aainfo[7]._val1 = -1;
+ aainfo[7]._val3 = 7;
+ scratch._9c = 1;
+ aa[6] = kernel_run_animation(kernel_name('e', 1), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 5:
+ kernel_seq_delete(seq[3]);
+ kernel_flip_hotspot(110, 0);
+ kernel_abort_animation(aa[6]);
+ aa[6] = kernel_run_animation(kernel_name('e', 2), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 6:
+ kernel_abort_animation(aa[6]);
+ global[g131] = -1;
+ kernel_reset_animation(scratch._a4, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a4, KERNEL_NOW, 0);
+ global[g133] = 0;
+ aa[6] = kernel_run_animation(kernel_name('b', 4), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 7:
+ kernel_abort_animation(aa[6]);
+ aa[6] = kernel_run_animation(kernel_name('b', 5), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 8:
+ kernel_abort_animation(aa[6]);
+ aa[6] = kernel_run_animation(kernel_name('b', 6), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 9:
+ kernel_abort_animation(aa[6]);
+ aa[6] = kernel_run_animation(kernel_name('b', 9), 104);
+ aainfo[6]._val1 = -1;
+ scratch._9c = 1;
+ scratch._ac++;
+ break;
+ case 10:
+ aainfo[7]._val3 = 8;
+ player.walker_visible = -1;
+ kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
+ flags[0] = 2;
+ flags[1] = 0;
+ flags[2] = 0;
+ flags[3] = 0;
+ break;
+ default:
+ break;
+ }
+ break;
+
+ case 103:
+ kernel_abort_animation(aa[4]);
+ aainfo[4]._val1 = 0;
+ global[g131] = -1;
+ global[g141] = -1;
+ kernel_reset_animation(scratch._a4, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a4, KERNEL_NOW, 0);
+ kernel_reset_animation(scratch._a6, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a6, KERNEL_NOW, 0);
+ player.walker_visible = -1;
+ global[g133] = 0;
+ global[g143] = 0;
+ kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
+ player.commands_allowed = -1;
+ break;
+
+ case 107:
+ aainfo[4]._val2 = 13;
+ kernel_reset_animation(aa[4], 13);
+ digi_play_build(101, 'B', 5, 1);
+ scratch._aa++;
+ break;
+
+ case 111:
+ switch (scratch._ae) {
+ case 1:
+ kernel_abort_animation(aa[5]);
+ aa[5] = kernel_run_animation(kernel_name('b', 7), 111);
+ scratch._ae = 2;
+ break;
+ case 2:
+ kernel_abort_animation(aa[5]);
+ aainfo[5]._val1 = 0;
+ new_room = 205;
+ break;
+ case 4:
+ kernel_abort_animation(aa[5]);
+ aa[5] = kernel_run_animation(kernel_name('b', 9), 111);
+ scratch._ae = 5;
+ break;
+ default:
+ break;
+ }
+ break;
+
+ case 109:
+ kernel_reset_animation(scratch._a4, 0);
+ kernel_reset_animation(scratch._a6, 0);
+ global[g133] = 1;
+ global[g143] = 1;
+ inter_move_object(8, 2);
+ kernel_seq_delete(seq[1]);
+ kernel_flip_hotspot(154, 0);
+ aa[4] = kernel_run_animation(kernel_name('R', 4), 103);
+ aainfo[4]._val1 = -1;
+ aainfo[4]._val3 = 13;
+ scratch._a2 = 4;
+ kernel_synch(KERNEL_ANIM, scratch._a4, KERNEL_ANIM, aa[4]);
+ digi_play_build(101, 'e', 3, 1);
+ scratch._aa = 0;
+ break;
+
+ case 106:
+ aainfo[6]._val2 = 3;
+ kernel_reset_animation(aa[6], 3);
+ aainfo[6]._val3 = 10;
+ digi_play_build(101, 'b', 2, 1);
+ scratch._aa++;
+ break;
+
+ case 105:
+ if (aainfo[7]._val3 == 0) {
+ aainfo[7]._val1 = 0;
+ global[g141] = -1;
+ kernel_reset_animation(scratch._a6, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a6, KERNEL_NOW, 0);
+ global[g143] = 0;
+ global[g009] = 0;
+ player.commands_allowed = -1;
+ } else if (aainfo[7]._val3 == 8) {
+ kernel_abort_animation(aa[7]);
+ aa[7] = kernel_run_animation(kernel_name('r', 3), 105);
+ aainfo[7]._val1 = -1;
+ scratch._9c = 1;
+ aainfo[7]._val3 = 0;
+ }
+ break;
+
+ case 100:
+ kernel_abort_animation(aa[0]);
+ aainfo[0]._val1 = 0;
+ global[g131] = -1;
+ global[g141] = -1;
+ kernel_reset_animation(scratch._a4, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a4, KERNEL_NOW, 0);
+ kernel_reset_animation(scratch._a6, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a6, KERNEL_NOW, 0);
+ player.walker_visible = -1;
+ global[g133] = 0;
+ global[g143] = 0;
+ kernel_synch(KERNEL_PLAYER, 0, KERNEL_NOW, 0);
+ player.commands_allowed = -1;
+ break;
+
+ case 101:
+ kernel_abort_animation(aa[scratch._9e]);
+ aainfo[scratch._9e]._val1 = 0;
+ kernel_reset_animation(scratch._a6, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a6, KERNEL_NOW, 0);
+ global[g143] = 0;
+ player.commands_allowed = -1;
+ break;
+
+ case 102:
+ kernel_abort_animation(aa[scratch._a0]);
+ aainfo[scratch._a0]._val1 = 0;
+ kernel_reset_animation(scratch._a4, 1);
+ kernel_synch(KERNEL_ANIM, scratch._a4, KERNEL_NOW, 0);
+ global[g133] = 0;
+ player.commands_allowed = -1;
+ break;
+
case 113:
digi_initial_volume(90);
digi_play_build(101, '_', 5, 3);
digi_flag1 = true;
break;
+
}
if (kernel.trigger == 9 && flags[0] != -3)
@@ -623,8 +1011,8 @@ static void room_101_daemon() {
}
if (flags[0] != -3) {
- global_anim1(1, scratch._a4, global[g131], &global[g132]); // TODO: identify global_anim
- global_anim2(3, scratch._a6, global[g141], &global[g142]); // TODO: identify global_anim_2
+ global_anim1(1, scratch._a4, global[g131], &global[g132]);
+ global_anim2(3, scratch._a6, global[g141], &global[g142]);
if (mouse_hidden != 0)
mouse_show();
}
@@ -710,9 +1098,27 @@ done:
}
void room_101_synchronize(Common::Serializer &s) {
- for (int16 &v : scratch.sprite) s.syncAsSint16LE(v);
- for (int16 &v : scratch.sequence) s.syncAsSint16LE(v);
- for (auto &v : scratch.array1) v.synchronize(s);
+ for (int16 &v : scratch.sprite) s.syncAsSint16LE(v);
+ for (int16 &v : scratch.sequence) s.syncAsSint16LE(v);
+ for (int16 &v : scratch.animation) s.syncAsSint16LE(v);
+ for (auto &v : scratch.array1) v.synchronize(s);
+ s.syncAsSint16LE(scratch._96);
+ s.syncAsSint16LE(scratch._98);
+ s.syncAsSint16LE(scratch._9a);
+ s.syncAsSint16LE(scratch._9c);
+ s.syncAsSint16LE(scratch._9e);
+ s.syncAsSint16LE(scratch._a0);
+ s.syncAsSint16LE(scratch._a2);
+ s.syncAsSint16LE(scratch._a4);
+ s.syncAsSint16LE(scratch._a6);
+ s.syncAsSint16LE(scratch._a8);
+ s.syncAsSint16LE(scratch._aa);
+ s.syncAsSint16LE(scratch._ac);
+ s.syncAsSint16LE(scratch._ae);
+ s.syncAsSint16LE(scratch._b0);
+ s.syncAsSint16LE(scratch._b2);
+ s.syncAsSint16LE(scratch._b4);
+ s.syncAsSint16LE(scratch._b6);
}
void room_101_preload() {
More information about the Scummvm-git-logs
mailing list