[Scummvm-git-logs] scummvm master -> 6f66a61db66b831fe08402fd299868b40f19d4ea

[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:
39d9b4c6ef MADS: PHANTOM: popup.cpp error fixes
6f66a61db6 MADS: PHANTOM: Fix unused variable in popup_savelist_mouse


Commit: 39d9b4c6ef785c4e74837148fdb17c0b4354d72e
    https://github.com/scummvm/scummvm/commit/39d9b4c6ef785c4e74837148fdb17c0b4354d72e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-21T19:07:13+10:00

Commit Message:
MADS: PHANTOM: popup.cpp error fixes

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


diff --git a/engines/mads/madsv2/core/popup.cpp b/engines/mads/madsv2/core/popup.cpp
index 81b66291841..75f855b8c33 100644
--- a/engines/mads/madsv2/core/popup.cpp
+++ b/engines/mads/madsv2/core/popup.cpp
@@ -2214,8 +2214,7 @@ static int popup_message_x_size(PopupItem *item) {
 }
 
 
-static int popup_message_y_size(PopupItem *item) {
-	item = NULL;  // delete if this routine is to be used
+static int popup_message_y_size(PopupItem *) {
 	return box_param.font->max_y_size;
 }
 
diff --git a/engines/mads/madsv2/core/popup.h b/engines/mads/madsv2/core/popup.h
index ab9af5b3d3b..1f39e8c7073 100644
--- a/engines/mads/madsv2/core/popup.h
+++ b/engines/mads/madsv2/core/popup.h
@@ -369,7 +369,7 @@ typedef struct {
 	int16 button_right_fill;      /* Button row right fill    */
 	int16 button_bar_color;       /* Button bar color         */
 
-	int16 key;                    /* Last keyboard input      */
+	uint32 key;                   /* Last keyboard input      */
 	int16 key_handled;            /* Flag if key handled      */
 
 	int16 mouse_status;           /* Mouse status word        */


Commit: 6f66a61db66b831fe08402fd299868b40f19d4ea
    https://github.com/scummvm/scummvm/commit/6f66a61db66b831fe08402fd299868b40f19d4ea
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-21T19:07:13+10:00

Commit Message:
MADS: PHANTOM: Fix unused variable in popup_savelist_mouse

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


diff --git a/engines/mads/madsv2/core/popup.cpp b/engines/mads/madsv2/core/popup.cpp
index 75f855b8c33..16c08cbc561 100644
--- a/engines/mads/madsv2/core/popup.cpp
+++ b/engines/mads/madsv2/core/popup.cpp
@@ -2686,8 +2686,8 @@ static int popup_savelist_mouse(PopupItem *item) {
 	in_up_arrow = in_scroll_bar && (mouse_y <= (list->scroll.arrow_1_base + list->scroll.arrow_size));
 	in_down_arrow = in_scroll_bar && (mouse_y >= (list->scroll.arrow_2_base - 1));
 
-	in_main_box = popup_in_item(item) && !in_scroll_bar;
-	in_main_range = ((mouse_y > item->y) && (mouse_y < (item->y + item->ys - 1)));
+	in_main_box = popup_in_item(item) && ((mouse_y > item->y) &&
+		(mouse_y < (item->y + item->ys - 1)));
 
 	force_update = mouse_start_stroke || (item->status & ITEM_STATUS_FORCED) != 0;