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

re-fix advanscene import to use the file that was intended, which always has serial numbers

This commit is contained in:
zeromus 2013-04-30 17:53:58 +00:00
parent faf39c8f52
commit 66a9a09483
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
desmume/src/mc.cpp
View File

@ -1451,6 +1451,8 @@ u32 ADVANsCEne::convertDB(const char *in_filaname)
u32 crc32 = 0;
u32 reserved = 0;
lastImportErrorMessage = "";
printf("Converting DB...\n");
if (getXMLConfig(in_filaname))
{
@ -1492,13 +1494,20 @@ u32 ADVANsCEne::convertDB(const char *in_filaname)
}
else { fclose(fp); return 0; }
//zero 28-apr-2013 - serial doesnt seem to be present anymore
//el_serial = el->FirstChildElement("serial");
//if (!el_serial || fwrite(el_serial->GetText(), 1, 8, fp) != 8)
//{
// fclose(fp); return 0;
//}
fwrite("nothere",1,8,fp);
el_serial = el->FirstChildElement("serial");
if(!el_serial)
{
lastImportErrorMessage = "Missing <serial> element. Did you use the right xml file? We need the RtoolDS one.";
fclose(fp);
return 0;
}
if (fwrite(el_serial->GetText(), 1, 8, fp) != 8)
{
lastImportErrorMessage = "Error writing output file";
fclose(fp); return 0;
}
// CRC32
el_crc32 = el->FirstChildElement("files");

2
desmume/src/mc.h
View File

@ -73,6 +73,7 @@ private:
std::string urlVersion;
std::string urlDat;
bool getXMLConfig(const char *in_filaname);
public:
ADVANsCEne() : saveType(0xFF),
crc32(0),
@ -93,6 +94,7 @@ public:
if(foundAsSerial) return "Serial";
return "";
}
std::string lastImportErrorMessage;
};

5
desmume/src/windows/main.cpp
View File

@ -5363,7 +5363,10 @@ DOKEYDOWN:
MessageBox(hwnd,buffer,"DeSmuME",MB_OK|MB_ICONINFORMATION);
}
else
MessageBox(hwnd,"ADVANsCEne database was not successfully imported","DeSmuME",MB_OK|MB_ICONERROR);
{
MessageBox(hwnd,"ADVANsCEne database was not successfully imported.","DeSmuME",MB_OK|MB_ICONERROR);
if(advsc.lastImportErrorMessage != "") MessageBox(hwnd,advsc.lastImportErrorMessage.c_str(),"DeSmuME",MB_OK|MB_ICONERROR);
}
NDS_UnPause();
return 0;
}