From a2c7355b97c846bc758e5beb8e8b42db26848457 Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 29 Nov 2011 23:12:26 +0000 Subject: [PATCH] apparently we must support geriatric compilers for xcode, so do not use an enum size for new consoletype value or else it will get confused --- desmume/src/NDSSystem.h | 4 ++-- desmume/src/saves.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h index 89b22f6c2..e1b7964bd 100644 --- a/desmume/src/NDSSystem.h +++ b/desmume/src/NDSSystem.h @@ -157,7 +157,7 @@ enum ENSATA_HANDSHAKE ENSATA_HANDSHAKE_complete = 4, }; -enum NDS_CONSOLE_TYPE : u8 +enum NDS_CONSOLE_TYPE { NDS_CONSOLE_TYPE_FAT, NDS_CONSOLE_TYPE_LITE, @@ -208,7 +208,7 @@ struct NDSSystem s32 cpuloopIterationCount; //counts the number of times during a frame that a reschedule happened //console type must be copied in when the system boots. it can't be changed on the fly. - NDS_CONSOLE_TYPE ConsoleType; + int ConsoleType; bool Is_DSI() { return ConsoleType == NDS_CONSOLE_TYPE_DSI; } bool Is_DebugConsole() { return _DebugConsole!=0; } BOOL _DebugConsole; diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp index a1c47dac1..1684c68fe 100644 --- a/desmume/src/saves.cpp +++ b/desmume/src/saves.cpp @@ -170,7 +170,7 @@ SFORMAT SF_NDS[]={ { "_TPB", 4, 1, &nds.isTouch}, { "_DBG", 4, 1, &nds._DebugConsole}, { "_ENS", 4, 1, &nds.ensataEmulation}, - { "_TYP", 1, 1, &nds.ConsoleType}, + { "_TYP", 4, 1, &nds.ConsoleType}, { "_ENH", 4, 1, &nds.ensataHandshake}, { "_ENI", 4, 1, &nds.ensataIpcSyncCounter}, { "_SLP", 4, 1, &nds.sleeping},