[Scummvm-git-logs] scummvm master -> 5f470fbfd1ab6f0dd6220cc56c6db7ac8c5731b3

[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:
5cf2f767e7 MADS: PHANTOM: More warning fixes
5f470fbfd1 MADS: PHANTOM: Fixing sprite_0.cpp warnings of unused labels


Commit: 5cf2f767e798b7fe9bc7f0b9d2973047d7ed2a7a
    https://github.com/scummvm/scummvm/commit/5cf2f767e798b7fe9bc7f0b9d2973047d7ed2a7a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-26T12:52:18+10:00

Commit Message:
MADS: PHANTOM: More warning fixes

Changed paths:
    engines/mads/madsv2/core/dialog.cpp
    engines/mads/madsv2/core/sprite.cpp
    engines/mads/madsv2/core/sprite_0.cpp


diff --git a/engines/mads/madsv2/core/dialog.cpp b/engines/mads/madsv2/core/dialog.cpp
index 14a5459b686..10f7111ec7a 100644
--- a/engines/mads/madsv2/core/dialog.cpp
+++ b/engines/mads/madsv2/core/dialog.cpp
@@ -47,7 +47,6 @@ static int mouse_orig_stroke_type;      /* First radio button pressed     */
 static int mouse_override;              /* Override repeat damper         */
 static int stroke_going;                /* Currently processing a stroke  */
 static int resolved_mouse;              /* Have resolved stroke this pass */
-static long mouse_timing_clock;         /* Stroke timer for logitech      */
 static ItemPtr mouse_scroll_item;       /* Recent mouse item              */
 static ListPtr mouse_scroll_list;       /* Recent mouse list              */
 static char temp_buf[80];               /* A convenient buffer            */
diff --git a/engines/mads/madsv2/core/sprite.cpp b/engines/mads/madsv2/core/sprite.cpp
index cb4a9bd9f7a..ea5fd004ae3 100644
--- a/engines/mads/madsv2/core/sprite.cpp
+++ b/engines/mads/madsv2/core/sprite.cpp
@@ -803,9 +803,15 @@ word sprite_pack_line_irle(byte *target, Buffer *source, byte *palette_map, byte
 			/* if run exists, write it */
 			if (run_len > 0) {
 				switch (run_len) {
-				case 3: *(unto++) = run_byte;
-				case 2: *(unto++) = run_byte;
-				case 1: *(unto++) = run_byte;    break;
+				case 3:
+					*(unto++) = run_byte;
+					// Fall through
+				case 2:
+					*(unto++) = run_byte;
+					// Fall through
+				case 1:
+					*(unto++) = run_byte;
+					break;
 				default:
 					*(unto++) = SS_RUN;      /* mark as a run */
 					*(unto++) = run_len;
diff --git a/engines/mads/madsv2/core/sprite_0.cpp b/engines/mads/madsv2/core/sprite_0.cpp
index 0d90e887cf3..40a6611c7a4 100644
--- a/engines/mads/madsv2/core/sprite_0.cpp
+++ b/engines/mads/madsv2/core/sprite_0.cpp
@@ -86,16 +86,18 @@ byte *sprite_ptr;
 byte *target_ptr;
 int target_wrap;
 int xs, ys;
-int skip_y, draw_y, max_y, stop_y;
+int skip_y, max_y, stop_y;
 int skip_x, draw_x, max_x, stop_x;
 int line_finished;
 int mirror;
-int draw_count;
 SpritePtr sprite;
+#ifdef dump_mode
+int draw_count;
+#endif
 
 /*
-/*    Local variables for "three_d" depth coding
-*/
+ *    Local variables for "three_d" depth coding
+ */
 
 #if three_d
 byte *attr_ptr;
@@ -291,7 +293,7 @@ ys = sprite->ys;
 	}
 
 	skip_y = cx;
-	draw_y = bx;
+	//draw_y = bx;
 	stop_y = cx + bx;
 
 	if (bx <= 0)
@@ -822,6 +824,8 @@ pixel_IRLE:
 						/* pixel_IRLE_run_yesdraw */
 						if (run_value != SS_SKIP) {
 							byte out_byte = run_value;
+							// Hopefully stop warnings about it being unused for some functions
+							(void)out_byte;
 
 #if three_d
 							{
@@ -1021,7 +1025,6 @@ pixel_IRLE_image_no_attr:;
 
 #if translate
 						{
-							byte full_color = out_byte;
 							if (out_byte >= 16) {
 								if (thatch_flag != 0) {
 									out_byte >>= 4;


Commit: 5f470fbfd1ab6f0dd6220cc56c6db7ac8c5731b3
    https://github.com/scummvm/scummvm/commit/5f470fbfd1ab6f0dd6220cc56c6db7ac8c5731b3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-26T12:52:18+10:00

Commit Message:
MADS: PHANTOM: Fixing sprite_0.cpp warnings of unused labels

Changed paths:
    engines/mads/madsv2/core/sprite_0.cpp


diff --git a/engines/mads/madsv2/core/sprite_0.cpp b/engines/mads/madsv2/core/sprite_0.cpp
index 40a6611c7a4..fca49d5ec02 100644
--- a/engines/mads/madsv2/core/sprite_0.cpp
+++ b/engines/mads/madsv2/core/sprite_0.cpp
@@ -758,11 +758,17 @@ pixel_RLE_no_output:;
 #endif
 							*pixel_ptr = out_byte;
 #endif
+#ifdef on_black
 pixel_RLE_no_output2:;
+#endif
 						}
-
+#if interface || three_d || translate
 pixel_RLE_run_skip_n_pop:;
+#endif
+#if three_d
 pixel_RLE_run_skip:
+#endif
+
 #if translate
 						thatch_flag ^= 1;
 #endif
@@ -770,9 +776,8 @@ pixel_RLE_run_skip:
 
 pixel_RLE_run_nodraw:
 						draw_x_pos++;
-
-pixel_RLE_run_next:
 #if bresenham
+pixel_RLE_run_next :
 						scan_x++;
 #endif
 
@@ -923,11 +928,16 @@ pixel_IRLE_run_no_output:;
 #endif
 							*pixel_ptr = out_byte;
 #endif
+#ifdef on_black
 pixel_IRLE_run_no_output2:;
+#endif
 						}
-
+#if three_d || interface || translate
 pixel_IRLE_run_skip_n_pop:;
+#endif
+#if three_d
 pixel_IRLE_run_skip:
+#endif
 #if translate
 						thatch_flag ^= 1;
 #endif
@@ -935,8 +945,9 @@ pixel_IRLE_run_skip:
 
 pixel_IRLE_run_nodraw:
 						draw_x_pos++;
-
+#if bresenham
 pixel_IRLE_run_next:
+#endif
 #if bresenham
 						scan_x++;
 #endif
@@ -1059,11 +1070,17 @@ pixel_IRLE_image_no_output:;
 #endif
 						*pixel_ptr = out_byte;
 #endif
+#ifdef on_black
 pixel_IRLE_image_no_output2:;
+#endif
 					}
-
+#if three_d || interface || translate
 pixel_IRLE_image_skip_n_pop:;
+#endif
+#if three_d
 pixel_IRLE_image_skip:
+#endif
+
 #if translate
 					thatch_flag ^= 1;
 #endif
@@ -1071,8 +1088,10 @@ pixel_IRLE_image_skip:
 
 pixel_IRLE_image_nodraw:
 					draw_x_pos++;
-
+#if bresenham
 pixel_IRLE_image_next:
+#endif
+
 #if bresenham
 					scan_x++;
 #endif