From e96db2c3bae765d9abc7eabb6aed3c7970c2b570 Mon Sep 17 00:00:00 2001 From: Arthur Moore Date: Sun, 22 Mar 2015 09:10:43 -0400 Subject: [PATCH] Fixed wxvbam Game Boy options not working --- src/gb/gbGlobals.cpp | 5 +++-- src/gb/gbGlobals.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gb/gbGlobals.cpp b/src/gb/gbGlobals.cpp index 4977853f..dcc0d10f 100644 --- a/src/gb/gbGlobals.cpp +++ b/src/gb/gbGlobals.cpp @@ -1,10 +1,11 @@ #include #include "../common/Types.h" +#include "gbGlobals.h" u8 *gbMemoryMap[16]; int gbRomSizeMask = 0; -int gbRomSize = 0; +unsigned int gbRomSize = 0; int gbRamSizeMask = 0; int gbRamSize = 0; int gbTAMA5ramSize = 0; @@ -27,7 +28,7 @@ bool genericflashcardEnable = false; int gbCgbMode = 0; u16 gbColorFilter[32768]; -int gbColorOption = 0; +bool gbColorOption = 0; int gbPaletteOption = 0; int gbEmulatorType = 0; int gbBorderOn = 0; diff --git a/src/gb/gbGlobals.h b/src/gb/gbGlobals.h index 354f8ff9..93b1bb54 100644 --- a/src/gb/gbGlobals.h +++ b/src/gb/gbGlobals.h @@ -25,7 +25,7 @@ extern u8 *gbMemoryMap[16]; extern int gbFrameSkip; extern u16 gbColorFilter[32768]; -extern int gbColorOption; +extern bool gbColorOption; extern int gbPaletteOption; extern int gbEmulatorType; extern int gbBorderOn;