ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
zeromus 2011-11-29 23:12:26 +00:00
parent 3f674a7cf6
commit a2c7355b97
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/NDSSystem.h
View File

@ -157,7 +157,7 @@ enum ENSATA_HANDSHAKE
ENSATA_HANDSHAKE_complete = 4, ENSATA_HANDSHAKE_complete = 4,
}; };
enum NDS_CONSOLE_TYPE : u8 enum NDS_CONSOLE_TYPE
{ {
NDS_CONSOLE_TYPE_FAT, NDS_CONSOLE_TYPE_FAT,
NDS_CONSOLE_TYPE_LITE, NDS_CONSOLE_TYPE_LITE,
@ -208,7 +208,7 @@ struct NDSSystem
s32 cpuloopIterationCount; //counts the number of times during a frame that a reschedule happened 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. //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_DSI() { return ConsoleType == NDS_CONSOLE_TYPE_DSI; }
bool Is_DebugConsole() { return _DebugConsole!=0; } bool Is_DebugConsole() { return _DebugConsole!=0; }
BOOL _DebugConsole; BOOL _DebugConsole;

2
desmume/src/saves.cpp
View File

@ -170,7 +170,7 @@ SFORMAT SF_NDS[]={
{ "_TPB", 4, 1, &nds.isTouch}, { "_TPB", 4, 1, &nds.isTouch},
{ "_DBG", 4, 1, &nds._DebugConsole}, { "_DBG", 4, 1, &nds._DebugConsole},
{ "_ENS", 4, 1, &nds.ensataEmulation}, { "_ENS", 4, 1, &nds.ensataEmulation},
{ "_TYP", 1, 1, &nds.ConsoleType}, { "_TYP", 4, 1, &nds.ConsoleType},
{ "_ENH", 4, 1, &nds.ensataHandshake}, { "_ENH", 4, 1, &nds.ensataHandshake},
{ "_ENI", 4, 1, &nds.ensataIpcSyncCounter}, { "_ENI", 4, 1, &nds.ensataIpcSyncCounter},
{ "_SLP", 4, 1, &nds.sleeping}, { "_SLP", 4, 1, &nds.sleeping},