libretro/gambatte-libretro
1
0
Fork 0
mirror of https://github.com/libretro/gambatte-libretro.git synced 2024-11-27 01:40:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Append "_dmg" to save base name when forcing DMG mode, to avoid corrupting CGB save files and vice versa.

Browse Source 
git-svn-id: https://gambatte.svn.sourceforge.net/svnroot/gambatte@193 9dfb2916-2d38-0410-aef4-c5fe6c9ffc24
This commit is contained in:
sinamas 2008-10-26 06:23:42 +00:00
parent 1f6c8dc2d4
commit 12d33eca65
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libgambatte/src/memory.cpp
View File

@ -1541,6 +1541,37 @@ void Memory::nontrivial_write(const unsigned P, const unsigned data, const unsig
ioamhram[P - 0xFE00] = data;
}
static const std::string stripExtension(const std::string &str) {
const std::string::size_type lastDot = str.find_last_of('.');
const std::string::size_type lastSlash = str.find_last_of('/');
if (lastDot != std::string::npos && (lastSlash == std::string::npos || lastSlash < lastDot))
return str.substr(0, lastDot);
return str;
}
static const std::string stripDir(const std::string &str) {
const std::string::size_type lastSlash = str.find_last_of('/');
if (lastSlash != std::string::npos)
return str.substr(lastSlash + 1);
return str;
}
const std::string Memory::saveBasePath() const {
return saveDir.empty() ? defaultSaveBasePath : saveDir + stripDir(defaultSaveBasePath);
}
void Memory::set_savedir(const char *dir) {
saveDir = dir ? dir : "";
if (!saveDir.empty() && saveDir[saveDir.length() - 1] != '/') {
saveDir += '/';
}
}
static void enforce8bit(unsigned char *data, unsigned long sz) {
if (static_cast<unsigned char>(0x100))
while (sz--)
@ -1559,7 +1590,7 @@ static unsigned pow2ceil(unsigned n) {
}
bool Memory::loadROM(const char *romfile, const bool forceDmg) {
romFilePath = romfile;
defaultSaveBasePath = stripExtension(romfile);
File rom(romfile);
@ -1571,7 +1602,12 @@ bool Memory::loadROM(const char *romfile, const bool forceDmg) {
unsigned char header[0x150];
rom.read(reinterpret_cast<char*>(header), sizeof(header));
cgb = ~forceDmg & (header[0x0143] >> 7) & 1;
cgb = header[0x0143] >> 7 & 1;
if (cgb & forceDmg) {
cgb = false;
defaultSaveBasePath += "_dmg";
}
switch (header[0x0147]) {
case 0x00: std::printf("Plain ROM loaded.\n");
@ -1816,39 +1852,6 @@ void Memory::saveSavedata() {
}
}
static const std::string stripExtension(const std::string &str) {
const std::string::size_type lastDot = str.find_last_of('.');
const std::string::size_type lastSlash = str.find_last_of('/');
if (lastDot != std::string::npos && (lastSlash == std::string::npos || lastSlash < lastDot))
return str.substr(0, lastDot);
return str;
}
static const std::string stripDir(const std::string &str) {
const std::string::size_type lastSlash = str.find_last_of('/');
if (lastSlash != std::string::npos)
return str.substr(lastSlash + 1);
return str;
}
const std::string Memory::saveBasePath() const {
const std::string &extStrippedFilePath = stripExtension(romFilePath);
return saveDir.empty() ? extStrippedFilePath : saveDir + stripDir(extStrippedFilePath);
}
void Memory::set_savedir(const char *dir) {
saveDir = dir ? dir : "";
if (!saveDir.empty() && saveDir[saveDir.length() - 1] != '/') {
saveDir += '/';
}
}
unsigned Memory::fillSoundBuffer(const unsigned long cycleCounter) {
sound.generate_samples(cycleCounter, isDoubleSpeed());
return sound.fillBuffer();

2
libgambatte/src/memory.h
View File

@ -87,7 +87,7 @@ private:
irqEvents next_irqEvent;
cartridgetype romtype;
std::string romFilePath;
std::string defaultSaveBasePath;
std::string saveDir;
unsigned short rombanks;