[Scummvm-git-logs] scummvm master -> ca73746e75310b5a83bfdbccc84b0c69af656000

[dreammaster]

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:
4840a9e59d MADS: PHANTOM: Fix animview text display
ca73746e75 MADS: PHANTOM: Fix syncing the Player available array


Commit: 4840a9e59d16c9857d39098e502cf387c961bb2a
    https://github.com/scummvm/scummvm/commit/4840a9e59d16c9857d39098e502cf387c961bb2a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-17T22:40:56+10:00

Commit Message:
MADS: PHANTOM: Fix animview text display

Changed paths:
    engines/mads/madsv2/animview/anim_timer.cpp
    engines/mads/madsv2/animview/animview.cpp
    engines/mads/madsv2/animview/animview.h


diff --git a/engines/mads/madsv2/animview/anim_timer.cpp b/engines/mads/madsv2/animview/anim_timer.cpp
index 9bdd74c3e23..2d2925ee84b 100644
--- a/engines/mads/madsv2/animview/anim_timer.cpp
+++ b/engines/mads/madsv2/animview/anim_timer.cpp
@@ -136,10 +136,8 @@ block1:
 	runVal7 = -1;
 
 	speech = &current_anim->speech[speechIndex];
-	if (!loadFontFlag &&
-			speech->display_condition != 0x8000 &&
-			speech->display_condition != 0x800 &&
-			speech->display_condition != 0x2000) {
+	if (loadFontFlag && speech->display_condition != 0x8000 &&
+			speech->display_condition != 0x800) {
 		paletteHandle = pal_alloc_color(-1, 0, &palIndex1, &speech->color[0]);
 		paletteHandle = pal_alloc_color(paletteHandle, -1, &palIndex2, &speech->color[1]);
 
diff --git a/engines/mads/madsv2/animview/animview.cpp b/engines/mads/madsv2/animview/animview.cpp
index 0dee9579f78..23709d6e4ef 100644
--- a/engines/mads/madsv2/animview/animview.cpp
+++ b/engines/mads/madsv2/animview/animview.cpp
@@ -62,7 +62,7 @@ AnimInterPtr current_anim_inter;
 int speechIndex;
 int speechLoops;
 int runVal6, runVal7, runVal8;
-int loadFontFlag;
+bool loadFontFlag;
 int imageFrame;
 CycleList anim_cycle_list;
 bool has_cycles;
@@ -202,7 +202,7 @@ static void run_animation(int animIndex) {
 		timer1 = timer_read();
 
 	speechIndex = -1;
-	loadFontFlag = current_anim->load_flags & AA_LOAD_FONT;
+	loadFontFlag = (current_anim->load_flags & AA_LOAD_FONT) != 0;
 
 	speechLoops = runVal6 = runVal7 = runVal8 = 0;
 	speechStream = 0;
diff --git a/engines/mads/madsv2/animview/animview.h b/engines/mads/madsv2/animview/animview.h
index a7aeed408fd..44f9f918207 100644
--- a/engines/mads/madsv2/animview/animview.h
+++ b/engines/mads/madsv2/animview/animview.h
@@ -47,7 +47,7 @@ extern AnimInterPtr current_anim_inter;
 extern int speechIndex;
 extern int speechLoops;
 extern int runVal6, runVal7, runVal8;
-extern int loadFontFlag;
+extern bool loadFontFlag;
 extern int imageFrame;
 extern CycleList anim_cycle_list;
 extern bool has_cycles;


Commit: ca73746e75310b5a83bfdbccc84b0c69af656000
    https://github.com/scummvm/scummvm/commit/ca73746e75310b5a83bfdbccc84b0c69af656000
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-17T22:40:56+10:00

Commit Message:
MADS: PHANTOM: Fix syncing the Player available array

Changed paths:
    engines/mads/madsv2/core/player.cpp
    engines/mads/madsv2/core/player.h


diff --git a/engines/mads/madsv2/core/player.cpp b/engines/mads/madsv2/core/player.cpp
index debbb1449e6..ea595e1702e 100644
--- a/engines/mads/madsv2/core/player.cpp
+++ b/engines/mads/madsv2/core/player.cpp
@@ -81,7 +81,7 @@ void Player::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(walker_visible);
 	s.syncAsSint16LE(walker_previously_visible);
 	s.syncAsSint16LE(series_base);
-	s.syncAsSint16LE(available[8]);
+	s.syncMultipleLE(available);
 	s.syncAsSint16LE(facing);
 	s.syncAsSint16LE(turn_to_facing);
 	s.syncAsSint16LE(series);
diff --git a/engines/mads/madsv2/core/player.h b/engines/mads/madsv2/core/player.h
index e4c39382081..740a2126bb7 100644
--- a/engines/mads/madsv2/core/player.h
+++ b/engines/mads/madsv2/core/player.h
@@ -73,7 +73,7 @@ struct Player {
 	int walker_visible;           /* Flag if player's sprite is visible      */
 	int walker_previously_visible;/* Flag if player's sprite was visible     */
 	int series_base;              /* Lowest series list handle for walker    */
-	int available[8];             /* Flag if series are available or mirrored*/
+	int16 available[8];           /* Flag if series are available or mirrored*/
 	int facing;                   /* Player's current directional facing     */
 	int turn_to_facing;           /* Player is turning to this facing        */
 	int series;                   /* Player's current active series #        */