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

Don't make empty savestate files when loading savestates

This commit is contained in:
Jeffrey Pfau 2014-07-23 00:19:50 -07:00
parent 94001b1133
commit c7f7d0f752
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gba/gba-serialize.c
View File

@ -68,11 +68,11 @@ void GBADeserialize(struct GBA* gba, struct GBASerializedState* state) {
GBAAudioDeserialize(&gba->audio, state); GBAAudioDeserialize(&gba->audio, state);
} }
static struct VFile* _getStateVf(struct GBA* gba, int slot) { static struct VFile* _getStateVf(struct GBA* gba, int slot, bool write) {
char path[PATH_MAX]; char path[PATH_MAX];
path[PATH_MAX - 1] = '\0'; path[PATH_MAX - 1] = '\0';
snprintf(path, PATH_MAX - 1, "%s.ss%d", gba->activeFile, slot); snprintf(path, PATH_MAX - 1, "%s.ss%d", gba->activeFile, slot);
struct VFile* vf = VFileOpen(path, O_CREAT | O_RDWR); struct VFile* vf = VFileOpen(path, write ? (O_CREAT | O_RDWR) : O_RDONLY);
if (vf) { if (vf) {
vf->truncate(vf, sizeof(struct GBASerializedState)); vf->truncate(vf, sizeof(struct GBASerializedState));
} }
@ -80,37 +80,29 @@ static struct VFile* _getStateVf(struct GBA* gba, int slot) {
} }
bool GBASaveState(struct GBA* gba, int slot) { bool GBASaveState(struct GBA* gba, int slot) {
struct VFile* vf = _getStateVf(gba, slot); struct VFile* vf = _getStateVf(gba, slot, true);
if (!vf) { if (!vf) {
return false; return false;
} }
struct GBASerializedState* state = GBAMapState(vf); struct GBASerializedState* state = vf->map(vf, sizeof(struct GBASerializedState), MAP_WRITE);
GBASerialize(gba, state); GBASerialize(gba, state);
GBAUnmapState(vf, state); vf->unmap(vf, state, sizeof(struct GBASerializedState));
vf->close(vf); vf->close(vf);
return true; return true;
} }
bool GBALoadState(struct GBA* gba, int slot) { bool GBALoadState(struct GBA* gba, int slot) {
struct VFile* vf = _getStateVf(gba, slot); struct VFile* vf = _getStateVf(gba, slot, false);
if (!vf) { if (!vf) {
return false; return false;
} }
struct GBASerializedState* state = GBAMapState(vf); struct GBASerializedState* state = vf->map(vf, sizeof(struct GBASerializedState), MAP_READ);
GBADeserialize(gba, state); GBADeserialize(gba, state);
GBAUnmapState(vf, state); vf->unmap(vf, state, sizeof(struct GBASerializedState));
vf->close(vf); vf->close(vf);
return true; return true;
} }
struct GBASerializedState* GBAMapState(struct VFile* vf) {
return vf->map(vf, sizeof(struct GBASerializedState), MAP_WRITE);
}
void GBAUnmapState(struct VFile* vf, struct GBASerializedState* state) {
vf->unmap(vf, state, sizeof(struct GBASerializedState));
}
struct GBASerializedState* GBAAllocateState(void) { struct GBASerializedState* GBAAllocateState(void) {
return anonymousMemoryMap(sizeof(struct GBASerializedState)); return anonymousMemoryMap(sizeof(struct GBASerializedState));
} }

3
src/gba/gba-serialize.h
View File

@ -266,9 +266,6 @@ void GBADeserialize(struct GBA* gba, struct GBASerializedState* state);
bool GBASaveState(struct GBA* gba, int slot); bool GBASaveState(struct GBA* gba, int slot);
bool GBALoadState(struct GBA* gba, int slot); bool GBALoadState(struct GBA* gba, int slot);
struct GBASerializedState* GBAMapState(struct VFile* vf);
void GBAUnmapState(struct VFile* vf, struct GBASerializedState* state);
struct GBASerializedState* GBAAllocateState(void); struct GBASerializedState* GBAAllocateState(void);
void GBADeallocateState(struct GBASerializedState* state); void GBADeallocateState(struct GBASerializedState* state);