[Scummvm-git-logs] scummvm master -> 3e6cc4570002f38c14e48379f2494333e15a44da
dreammaster
noreply at scummvm.org
Sat Apr 25 10:46:01 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
3e6cc45700 MADS: PHANTOM: Correct room scratch fields to be int16
Commit: 3e6cc4570002f38c14e48379f2494333e15a44da
https://github.com/scummvm/scummvm/commit/3e6cc4570002f38c14e48379f2494333e15a44da
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-25T20:21:24+10:00
Commit Message:
MADS: PHANTOM: Correct room scratch fields to be int16
Changed paths:
engines/mads/madsv2/phantom/rooms/room102.h
engines/mads/madsv2/phantom/rooms/room103.h
engines/mads/madsv2/phantom/rooms/room104.h
engines/mads/madsv2/phantom/rooms/room106.h
engines/mads/madsv2/phantom/rooms/room107.h
engines/mads/madsv2/phantom/rooms/room109.h
engines/mads/madsv2/phantom/rooms/room114.h
engines/mads/madsv2/phantom/rooms/room307.h
engines/mads/madsv2/phantom/rooms/room309.h
engines/mads/madsv2/phantom/rooms/room310.h
engines/mads/madsv2/phantom/rooms/room404.h
diff --git a/engines/mads/madsv2/phantom/rooms/room102.h b/engines/mads/madsv2/phantom/rooms/room102.h
index 607e9bd7902..fe263bf4689 100644
--- a/engines/mads/madsv2/phantom/rooms/room102.h
+++ b/engines/mads/madsv2/phantom/rooms/room102.h
@@ -35,10 +35,10 @@ namespace Rooms {
#define aa local->animation
typedef struct { /* Room local variables */
- int sprite[15]; /* Sprite series handles */
- int sequence[15]; /* Sequence handles */
- int animation[4]; /* Animation handles */
- int anim_0_running;
+ int16 sprite[15]; /* Sprite series handles */
+ int16 sequence[15]; /* Sequence handles */
+ int16 animation[4]; /* Animation handles */
+ int16 anim_0_running;
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room103.h b/engines/mads/madsv2/phantom/rooms/room103.h
index 0f53a1dbaaa..255d277c2a9 100644
--- a/engines/mads/madsv2/phantom/rooms/room103.h
+++ b/engines/mads/madsv2/phantom/rooms/room103.h
@@ -34,42 +34,42 @@ namespace Rooms {
#define seq local->sequence
#define aa local->animation
-typedef struct { /* Room local variables */
- int sprite[20]; /* Sprite series handles */
- int sequence[20]; /* Sequence handles */
- int animation[7]; /* Animation handles */
- int prompt_1; /* Dynamic var for prompter's stand */
- int prompt_2; /* Dynamic var for prompter's stand */
- int prompt_3; /* Dynamic var for prompter's stand */
- int prompt_4; /* Dynamic var for prompter's stand */
- int prompt_5; /* Dynamic var for prompter's stand */
- int floor_r_1; /* Dynamic var for floor */
- int floor_r_2; /* Dynamic var for floor */
- int floor_l_1; /* Dynamic var for floor */
- int floor_l_2; /* Dynamic var for floor */
- int man; /* Dynamic var for man / Jacques */
-
- int jacques_frame;
- int jacques_action;
- int jacques_talk_count;
-
- int just_did_option;
- int anim_0_running;
- int anim_1_running;
- int anim_2_running;
- int anim_3_running;
- int anim_4_running;
- int anim_5_running;
- int anim_6_running;
-
- int top_of_stand; /* Either NO, YES_LEFT, or YES_RIGHT */
-
- int converse_counter; /* counter for talking displacements */
- int frame_guard; /* guards against running certain daemon code more than once */
-
- int stairs_frame;
- int climb_thru;
- int sit_on_it;
+typedef struct { /* Room local variables */
+ int16 sprite[20]; /* Sprite series handles */
+ int16 sequence[20]; /* Sequence handles */
+ int16 animation[7]; /* Animation handles */
+ int16 prompt_1; /* Dynamic var for prompter's stand */
+ int16 prompt_2; /* Dynamic var for prompter's stand */
+ int16 prompt_3; /* Dynamic var for prompter's stand */
+ int16 prompt_4; /* Dynamic var for prompter's stand */
+ int16 prompt_5; /* Dynamic var for prompter's stand */
+ int16 floor_r_1; /* Dynamic var for floor */
+ int16 floor_r_2; /* Dynamic var for floor */
+ int16 floor_l_1; /* Dynamic var for floor */
+ int16 floor_l_2; /* Dynamic var for floor */
+ int16 man; /* Dynamic var for man / Jacques */
+
+ int16 jacques_frame;
+ int16 jacques_action;
+ int16 jacques_talk_count;
+
+ int16 just_did_option;
+ int16 anim_0_running;
+ int16 anim_1_running;
+ int16 anim_2_running;
+ int16 anim_3_running;
+ int16 anim_4_running;
+ int16 anim_5_running;
+ int16 anim_6_running;
+
+ int16 top_of_stand; /* Either NO, YES_LEFT, or YES_RIGHT */
+
+ int16 converse_counter; /* counter for talking displacements */
+ int16 frame_guard; /* guards against running certain daemon code more than once */
+
+ int16 stairs_frame;
+ int16 climb_thru;
+ int16 sit_on_it;
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room104.h b/engines/mads/madsv2/phantom/rooms/room104.h
index 6fcfeefbce4..0729c3e27c5 100644
--- a/engines/mads/madsv2/phantom/rooms/room104.h
+++ b/engines/mads/madsv2/phantom/rooms/room104.h
@@ -37,41 +37,41 @@ namespace Rooms {
typedef struct { /* Room local variables */
- int sprite[15]; /* Sprite series handles */
- int sequence[15]; /* Sequence handles */
- int animation[6]; /* Animation handles */
- int anim_0_running;
- int anim_1_running;
- int anim_2_running;
+ int16 sprite[15]; /* Sprite series handles */
+ int16 sequence[15]; /* Sequence handles */
+ int16 animation[6]; /* Animation handles */
+ int16 anim_0_running;
+ int16 anim_1_running;
+ int16 anim_2_running;
- int get_ready_she_leave; /* if T, Daae will, after talking, leave scene */
- int get_ready_he_leave; /* if T, Daae will, after talking, leave scene */
+ int16 get_ready_she_leave; /* if T, Daae will, after talking, leave scene */
+ int16 get_ready_he_leave; /* if T, Daae will, after talking, leave scene */
- int wants_to_talk; /* if T, Raoul will talk */
- int wants_to_get_up; /* if T, Raoul will sit up */
+ int16 wants_to_talk; /* if T, Raoul will talk */
+ int16 wants_to_get_up; /* if T, Raoul will sit up */
- int sitting_up; /* T if Raoul is sitting up from fall */
+ int16 sitting_up; /* T if Raoul is sitting up from fall */
- int rich_action; /* action Richard is going to perform */
- int rich_frame;
+ int16 rich_action; /* action Richard is going to perform */
+ int16 rich_frame;
- int raoul_action; /* action Raoul is going to perform */
- int raoul_frame;
+ int16 raoul_action; /* action Raoul is going to perform */
+ int16 raoul_frame;
- int daae_walk_action; /* action Daae is going to perform */
- int daae_walk_frame;
+ int16 daae_walk_action; /* action Daae is going to perform */
+ int16 daae_walk_frame;
- int couple_action; /* action couple is going to perform */
- int couple_frame;
+ int16 couple_action; /* action couple is going to perform */
+ int16 couple_frame;
- int rich_talk_count; /* counters for talking */
- int couple_he_talk_count; /* counters for he talking */
- int couple_she_talk_count; /* counters for she talking */
- int couple_look_rich_count; /* counter for couple looking at Richard */
+ int16 rich_talk_count; /* counters for talking */
+ int16 couple_he_talk_count; /* counters for he talking */
+ int16 couple_she_talk_count; /* counters for she talking */
+ int16 couple_look_rich_count; /* counter for couple looking at Richard */
- int wants_to_stand_up; /* if T, will not talk, etc. */
+ int16 wants_to_stand_up; /* if T, will not talk, etc. */
- int last_player_step; /* Frame marker for player walk */
+ int16 last_player_step; /* Frame marker for player walk */
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room106.h b/engines/mads/madsv2/phantom/rooms/room106.h
index db39cbeed0f..fe40e2ebbe9 100644
--- a/engines/mads/madsv2/phantom/rooms/room106.h
+++ b/engines/mads/madsv2/phantom/rooms/room106.h
@@ -37,10 +37,10 @@ namespace Rooms {
typedef struct { /* Room local variables */
- int sprite[15]; /* Sprite series handles */
- int sequence[15]; /* Sequence handles */
- int animation[4]; /* Animation handles */
- int dynamic_sandbag; /* Dynamic HS for fallen sandbag */
+ int16 sprite[15]; /* Sprite series handles */
+ int16 sequence[15]; /* Sequence handles */
+ int16 animation[4]; /* Animation handles */
+ int16 dynamic_sandbag; /* Dynamic HS for fallen sandbag */
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room107.h b/engines/mads/madsv2/phantom/rooms/room107.h
index ef569970fba..3e9c1a58361 100644
--- a/engines/mads/madsv2/phantom/rooms/room107.h
+++ b/engines/mads/madsv2/phantom/rooms/room107.h
@@ -37,9 +37,9 @@ namespace Rooms {
typedef struct { /* Room local variables */
- int sprite[15]; /* Sprite series handles */
- int sequence[15]; /* Sequence handles */
- int animation[4]; /* Animation handles */
+ int16 sprite[15]; /* Sprite series handles */
+ int16 sequence[15]; /* Sequence handles */
+ int16 animation[4]; /* Animation handles */
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room109.h b/engines/mads/madsv2/phantom/rooms/room109.h
index 9b9e160141d..46e446ab43f 100644
--- a/engines/mads/madsv2/phantom/rooms/room109.h
+++ b/engines/mads/madsv2/phantom/rooms/room109.h
@@ -37,14 +37,14 @@ namespace Rooms {
typedef struct { /* Room local variables */
- int sprite[15]; /* Sprite series handles */
- int sequence[15]; /* Sequence handles */
- int animation[4]; /* Animation handles */
- int on_floor; /* Which floor are we on? 3=top, 1=bottom */
- int anim_0_running;
- int anim_1_running;
- int anim_2_running;
- int anim_3_running;
+ int16 sprite[15]; /* Sprite series handles */
+ int16 sequence[15]; /* Sequence handles */
+ int16 animation[4]; /* Animation handles */
+ int16 on_floor; /* Which floor are we on? 3=top, 1=bottom */
+ int16 anim_0_running;
+ int16 anim_1_running;
+ int16 anim_2_running;
+ int16 anim_3_running;
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room114.h b/engines/mads/madsv2/phantom/rooms/room114.h
index b8d916ed8b3..2289bd8f23a 100644
--- a/engines/mads/madsv2/phantom/rooms/room114.h
+++ b/engines/mads/madsv2/phantom/rooms/room114.h
@@ -36,9 +36,9 @@ namespace Rooms {
#define aa local->animation
typedef struct { /* Room local variables */
- int sprite[15]; /* Sprite series handles */
- int sequence[15]; /* Sequence handles */
- int animation[4]; /* Animation handles */
+ int16 sprite[15]; /* Sprite series handles */
+ int16 sequence[15]; /* Sequence handles */
+ int16 animation[4]; /* Animation handles */
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room307.h b/engines/mads/madsv2/phantom/rooms/room307.h
index 853cb3dd222..448eaf79f5d 100644
--- a/engines/mads/madsv2/phantom/rooms/room307.h
+++ b/engines/mads/madsv2/phantom/rooms/room307.h
@@ -36,9 +36,9 @@ namespace Rooms {
typedef struct { /* Room local variables */
- int sprite[15]; /* Sprite series handles */
- int sequence[15]; /* Sequence handles */
- int animation[4]; /* Animation handles */
+ int16 sprite[15]; /* Sprite series handles */
+ int16 sequence[15]; /* Sequence handles */
+ int16 animation[4]; /* Animation handles */
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room309.h b/engines/mads/madsv2/phantom/rooms/room309.h
index 08f46b5ff8b..ddca5351849 100644
--- a/engines/mads/madsv2/phantom/rooms/room309.h
+++ b/engines/mads/madsv2/phantom/rooms/room309.h
@@ -44,7 +44,7 @@ typedef struct { /* Room local variables */
int16 boat_frame;
int16 anim_0_running;
- int chris_talk_count;
+ int16 chris_talk_count;
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room310.h b/engines/mads/madsv2/phantom/rooms/room310.h
index d177a1ff694..d52db4947f0 100644
--- a/engines/mads/madsv2/phantom/rooms/room310.h
+++ b/engines/mads/madsv2/phantom/rooms/room310.h
@@ -43,9 +43,9 @@ typedef struct { /* Room local variables */
word message_1; /* Raoul's message color */
word message_2; /* Christine's color */
- int multiplane_base[4]; /* Multiplanar scrolling bases */
+ int16 multiplane_base[4]; /* Multiplanar scrolling bases */
- int lake_frame;
+ int16 lake_frame;
} Scratch;
diff --git a/engines/mads/madsv2/phantom/rooms/room404.h b/engines/mads/madsv2/phantom/rooms/room404.h
index 7007752f31a..ccff9300902 100644
--- a/engines/mads/madsv2/phantom/rooms/room404.h
+++ b/engines/mads/madsv2/phantom/rooms/room404.h
@@ -47,7 +47,6 @@ typedef struct { /* Room local variables */
int16 frame_here_for_taking; /* T if a specific frame is here */
int16 anim_0_running;
-
} Scratch;
More information about the Scummvm-git-logs
mailing list