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

Taseditor: fixed Greenzone saving while emulator is unpaused

This commit is contained in:
ansstuff 2012-12-25 15:54:12 +00:00
parent bf8649f110
commit afd4675104
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/win/taseditor/greenzone.cpp
View File

@ -228,6 +228,7 @@ void GREENZONE::save(EMUFILE *os, bool really_save)
{ {
if (really_save) if (really_save)
{ {
CollectCurrentState(); // in case the project is being saved before the greenzone.update() was called within current frame
// write "GREENZONE" string // write "GREENZONE" string
os->fwrite(greenzone_save_id, GREENZONE_ID_LEN); os->fwrite(greenzone_save_id, GREENZONE_ID_LEN);
// write LagLog // write LagLog
@ -236,7 +237,6 @@ void GREENZONE::save(EMUFILE *os, bool really_save)
write32le(greenZoneCount, os); write32le(greenZoneCount, os);
// write Playback cursor position // write Playback cursor position
write32le(currFrameCounter, os); write32le(currFrameCounter, os);
CollectCurrentState();
// write savestates // write savestates
int frame, size; int frame, size;
int last_tick = 0; int last_tick = 0;
@ -374,6 +374,8 @@ bool GREENZONE::load(EMUFILE *is, unsigned int offset)
} else } else
{ {
// load this savestate // load this savestate
if ((int)savestates.size() <= frame)
savestates.resize(frame + 1);
savestates[frame].resize(size); savestates[frame].resize(size);
if ((int)is->fread(&savestates[frame][0], size) < size) break; if ((int)is->fread(&savestates[frame][0], size) < size) break;
prev_frame = frame; // successfully read one Greenzone frame info prev_frame = frame; // successfully read one Greenzone frame info

2
src/drivers/win/taseditor/piano_roll.h
View File

@ -103,7 +103,7 @@ enum DRAG_MODES
#define NORMAL_BACKGROUND_COLOR 0xFFFFFF #define NORMAL_BACKGROUND_COLOR 0xFFFFFF
#define NORMAL_FRAMENUM_COLOR 0xFFFFFF #define NORMAL_FRAMENUM_COLOR 0xFFFFFF
#define NORMAL_INPUT_COLOR1 0xE9E9E9 #define NORMAL_INPUT_COLOR1 0xEDEDED
#define NORMAL_INPUT_COLOR2 0xE2E2E2 #define NORMAL_INPUT_COLOR2 0xE2E2E2
#define GREENZONE_FRAMENUM_COLOR 0xDDFFDD #define GREENZONE_FRAMENUM_COLOR 0xDDFFDD

2
src/drivers/win/video.cpp
View File

@ -1208,7 +1208,7 @@ BOOL CALLBACK VideoConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
"1600x1200 6x,5y", "1600x1200 6x,5y",
"800x600 Stretched" "800x600 Stretched"
}; };
int x; //int x;
switch(uMsg) switch(uMsg)
{ {