all repos — mgba @ b20cda21e145e08912213ba1c35cf687b44724d1

mGBA Game Boy Advance Emulator

GBA RR: Starting from savestate now embeds the savegame
Jeffrey Pfau jeffrey@endrift.com
Mon, 28 Dec 2015 15:13:54 -0500
commit

b20cda21e145e08912213ba1c35cf687b44724d1

parent

b2193d919150c9f5cc6eb8ede7361f20ec01328b

2 files changed, 3 insertions(+), 2 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -39,6 +39,7 @@ - Util: Add MutexTryLock
  - Qt: Gray out "Skip BIOS intro" while "Use BIOS file" is unchecked
  - Qt: Allow use of modifier keys as input
  - Qt: Optimize log viewer
+ - GBA RR: Starting from savestate now embeds the savegame
 
 0.3.2: (2015-12-16)
 Bugfixes:
M src/gba/rr/rr.c → src/gba/rr/rr.c 
@@ -27,7 +27,7 @@ }
 
 	if (gba->rr->initFrom & INIT_FROM_SAVESTATE) {
 		struct VFile* vf = gba->rr->openSavestate(gba->rr, O_TRUNC | O_CREAT | O_RDWR);
-		GBASaveStateNamed(gba, vf, 0);
+		GBASaveStateNamed(gba, vf, SAVESTATE_SAVEDATA);
 		vf->close(vf);
 	} else {
 		ARMReset(gba->cpu);

@@ -51,7 +51,7 @@ }
 
 	if (gba->rr->initFrom & INIT_FROM_SAVESTATE) {
 		struct VFile* vf = gba->rr->openSavestate(gba->rr, O_RDONLY);
-		GBALoadStateNamed(gba, vf, SAVESTATE_SCREENSHOT);
+		GBALoadStateNamed(gba, vf, SAVESTATE_SCREENSHOT | SAVESTATE_SAVEDATA);
 		vf->close(vf);
 	} else {
 		ARMReset(gba->cpu);