[Scummvm-git-logs] scummvm master -> 4282719871b28b2f353cb4d331c7802b49be9ad0

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4282719871 M4: Fix global constructor warnings


Commit: 4282719871b28b2f353cb4d331c7802b49be9ad0
    https://github.com/scummvm/scummvm/commit/4282719871b28b2f353cb4d331c7802b49be9ad0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-12-23T18:51:33-10:00

Commit Message:
M4: Fix global constructor warnings

Changed paths:
    engines/m4/burger/rooms/section1/room142.cpp
    engines/m4/graphics/gr_font.cpp
    engines/m4/gui/gui_item.cpp


diff --git a/engines/m4/burger/rooms/section1/room142.cpp b/engines/m4/burger/rooms/section1/room142.cpp
index c533c4ec8a9..24c14446840 100644
--- a/engines/m4/burger/rooms/section1/room142.cpp
+++ b/engines/m4/burger/rooms/section1/room142.cpp
@@ -50,11 +50,11 @@ static const char *SAID[][4] = {
 };
 
 const WilburMatch Room142::MATCH[] = {
-	{ "GEAR", "PARKING LOT", 9, &_G(flags)[V000], 1003, &_val1, 18 },
-	{ "LOOK AT", "PARKING LOT", 9, &_G(flags)[V000], 1003, &_val1, 18 },
-	{ "GEAR", "PARKING LOT", 5, &_G(flags)[kTourBusAtDiner], 0, &_val2, 13 },
-	{ "LOOK AT", "PARKING LOT", 5, &_G(flags)[kTourBusAtDiner], 0, &_val2, 13 },
-	{ "GEAR", "ICE BOX", kCHANGE_WILBUR_ANIMATION, &_G(flags)[kIceBoxOpened], 0, &Vars::_wilbur_should, 1 },
+	{ "GEAR", "PARKING LOT", 9, &Flags::_flags[V000], 1003, &_val1, 18 },
+	{ "LOOK AT", "PARKING LOT", 9, &Flags::_flags[V000], 1003, &_val1, 18 },
+	{ "GEAR", "PARKING LOT", 5, &Flags::_flags[kTourBusAtDiner], 0, &_val2, 13 },
+	{ "LOOK AT", "PARKING LOT", 5, &Flags::_flags[kTourBusAtDiner], 0, &_val2, 13 },
+	{ "GEAR", "ICE BOX", kCHANGE_WILBUR_ANIMATION, &Flags::_flags[kIceBoxOpened], 0, &Vars::_wilbur_should, 1 },
 	{ "TAKE", "FANBELT", kCHANGE_WILBUR_ANIMATION, nullptr, 0, &Vars::_wilbur_should, 9 },
 	{ "GEAR", "BACK DOOR", 6, nullptr, 0, nullptr, 0 },
 	WILBUR_MATCH_END
diff --git a/engines/m4/graphics/gr_font.cpp b/engines/m4/graphics/gr_font.cpp
index 23a6f95ce80..af3a59e592f 100644
--- a/engines/m4/graphics/gr_font.cpp
+++ b/engines/m4/graphics/gr_font.cpp
@@ -37,7 +37,7 @@ namespace M4 {
 #define STR_FONTOFF "font offsets"
 #define STR_FONTDATA "font data"
 
-static byte font_colors[4] = { __BLACK, __WHITE, __BLACK, __DKGRAY };
+static byte font_colors[4] = { 0, 15, 0, 8 };
 constexpr byte font_intr_w = 8;
 constexpr byte font_intr_h = 8;
 
diff --git a/engines/m4/gui/gui_item.cpp b/engines/m4/gui/gui_item.cpp
index 8f98325f4cc..e2fd6d86a8c 100644
--- a/engines/m4/gui/gui_item.cpp
+++ b/engines/m4/gui/gui_item.cpp
@@ -33,9 +33,9 @@ namespace M4 {
 #define _REDRAW_ACTIVE 4
 #define _INIT_LISTBOX 8
 
-#define _LB_BLACK	__BLACK
-#define _LB_LTGREY	0x07		//used to be 0x0c
-#define _LB_DKGREY	0x08		//used to be 0x04
+#define _LB_BLACK	0x00
+#define _LB_LTGREY	0x07
+#define _LB_DKGREY	0x08
 #define _LB_WHITE	0x0f
 #define _LB_BROWN	0x07