libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-15 16:58:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

M4: Fix global constructor warnings

Browse Source
This commit is contained in:
Paul Gilbert 2023-12-23 18:51:33 -10:00
parent fd61d4c5e7
commit 4282719871
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/m4/burger/rooms/section1/room142.cpp
View File

@ -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

2
engines/m4/graphics/gr_font.cpp
View File

@ -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;

6
engines/m4/gui/gui_item.cpp
View File

@ -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