[Scummvm-git-logs] scummvm master -> 80316f7d0dbe54afea3ecbae17364bc538fc7ed0

dreammaster noreply at scummvm.org
Sat Apr 25 10:14:40 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:
80316f7d0d MADS: PHANTOM: Compiler warning fixes


Commit: 80316f7d0dbe54afea3ecbae17364bc538fc7ed0
    https://github.com/scummvm/scummvm/commit/80316f7d0dbe54afea3ecbae17364bc538fc7ed0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-25T20:14:29+10:00

Commit Message:
MADS: PHANTOM: Compiler warning fixes

Changed paths:
    engines/mads/madsv2/core/inter.cpp
    engines/mads/madsv2/core/kernel.cpp
    engines/mads/madsv2/core/popup.cpp


diff --git a/engines/mads/madsv2/core/inter.cpp b/engines/mads/madsv2/core/inter.cpp
index dd564823288..1f074b53120 100644
--- a/engines/mads/madsv2/core/inter.cpp
+++ b/engines/mads/madsv2/core/inter.cpp
@@ -1918,7 +1918,6 @@ static void inter_exec_function(void (*(target))()) {
 }
 
 void inter_spin_object(int object_id) {
-	int error_flag = true;
 	char temp_buf[80];
 
 	inter_turn_off_object();
@@ -1969,8 +1968,6 @@ void inter_spin_object(int object_id) {
 
 	inter_object_sprite = 1;
 
-	error_flag = false;
-
 done:
 	sprite_force_memory = NULL;
 	sprite_force_size = 0;
diff --git a/engines/mads/madsv2/core/kernel.cpp b/engines/mads/madsv2/core/kernel.cpp
index e9bb7537d08..a36222b36ad 100644
--- a/engines/mads/madsv2/core/kernel.cpp
+++ b/engines/mads/madsv2/core/kernel.cpp
@@ -912,15 +912,13 @@ int kernel_seq_backward_scroll(int series_id, int mirror,
 	word start_ticks,
 	int expire) {
 	int depth = 0;
-	SpritePtr sprite;
-
-	sprite = &series_list[series_id]->index[0];
 
 	return (kernel_seq_add(series_id, mirror,
 		series_list[series_id]->num_sprites,
 		0, 0, AA_LINEAR, -1, depth, 100, true, 0, 0,
 		ticks, interval_ticks, start_ticks, expire));
 }
+
 void kernel_synch(int slave_type, int slave_id, int master_type, int master_id) {
 	long master_time;
 
diff --git a/engines/mads/madsv2/core/popup.cpp b/engines/mads/madsv2/core/popup.cpp
index aa01fa3816f..4879106cb87 100644
--- a/engines/mads/madsv2/core/popup.cpp
+++ b/engines/mads/madsv2/core/popup.cpp
@@ -64,12 +64,13 @@ int popup_asking_number = false;
 
 int popup_available = false;
 
-BoxParam box_param = { NULL };
+BoxParam box_param;
 Popup *popup = NULL;
 word popup_default_status = POPUP_STATUS_BAR;
 
 static char *popup_savelist_string(PopupItem *item, int element);
 
+
 void init_popup() {
 	memset(&box_param, 0, sizeof(BoxParam));
 	memset(&text_box, 0, sizeof(Box));
@@ -88,7 +89,7 @@ void init_popup() {
 		0,   0,  0,  0,  3,  0,  0,  0
 	};
 	Common::copy(POPUP_COLORS, POPUP_COLORS + 24, popup_colors);
-	memset(popup_preserve_initiator, BUFFER_PRESERVE, 3);
+	memset(&popup_preserve_initiator[0], BUFFER_PRESERVE, 3);
 }
 
 int popup_create(int horiz_pieces, int x, int y) {




More information about the Scummvm-git-logs mailing list