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

mc: rename ADVANsCEne::check() to ::checkDB() to fix compilation on MacOS X 

Also while at it define it as class instead of struct.

Another step to fix #3411141
This commit is contained in:
riccardom 2011-09-18 15:43:18 +00:00
parent 3bd84c2bb8
commit d5ce941e01
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/NDSSystem.cpp
View File

@ -578,7 +578,7 @@ int NDS_LoadROM(const char *filename, const char *logicalFilename)
buf[2] = gameInfo.header.gameCode[2]; buf[2] = gameInfo.header.gameCode[2];
buf[3] = gameInfo.header.gameCode[3]; buf[3] = gameInfo.header.gameCode[3];
buf[4] = 0; buf[4] = 0;
if (advsc.check(buf)) if (advsc.checkDB(buf))
{ {
u8 sv = advsc.getSaveType(); u8 sv = advsc.getSaveType();
printf("ADVANsCEne database:\n"); printf("ADVANsCEne database:\n");

2
desmume/src/mc.cpp
View File

@ -1253,7 +1253,7 @@ void BackupDevice::forceManualBackupType()
} }
// ============================================= ADVANsCEne // ============================================= ADVANsCEne
u8 ADVANsCEne::check(const char *serial) u8 ADVANsCEne::checkDB(const char *serial)
{ {
FILE *fp = fopen(database_path, "rb"); FILE *fp = fopen(database_path, "rb");
if (fp) if (fp)

4
desmume/src/mc.h
View File

@ -57,7 +57,7 @@
#define _ADVANsCEne_BASE_VERSION_MAJOR 1 #define _ADVANsCEne_BASE_VERSION_MAJOR 1
#define _ADVANsCEne_BASE_VERSION_MINOR 0 #define _ADVANsCEne_BASE_VERSION_MINOR 0
#define _ADVANsCEne_BASE_NAME "ADVANsCEne Nintendo DS Collection" #define _ADVANsCEne_BASE_NAME "ADVANsCEne Nintendo DS Collection"
struct ADVANsCEne class ADVANsCEne
{ {
private: private:
char database_path[MAX_PATH]; // DeSmuME save types char database_path[MAX_PATH]; // DeSmuME save types
@ -83,7 +83,7 @@ public:
} }
void setDatabase(const char *path) { strcpy(database_path, path); } void setDatabase(const char *path) { strcpy(database_path, path); }
u32 convertDB(const char *in_filaname); u32 convertDB(const char *in_filaname);
u8 check(const char *serial); u8 checkDB(const char *serial);
u32 getSaveType() { return saveType; } u32 getSaveType() { return saveType; }
u32 getCRC32() { return crc32; } u32 getCRC32() { return crc32; }
}; };