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

Fixed rerecord counting broken outside taseditor since r2974.

This commit is contained in:
feos-tas 2014-09-06 11:46:32 +00:00
parent 590e0577c2
commit 1dd08eddf1
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trunk/src/movie.cpp
View File

@ -103,6 +103,7 @@ SFORMAT FCEUMOV_STATEINFO[]={
char curMovieFilename[512] = {0}; char curMovieFilename[512] = {0};
MovieData currMovieData; MovieData currMovieData;
MovieData defaultMovieData; MovieData defaultMovieData;
int currRerecordCount; // Keep the global value
char lagcounterbuf[32] = {0}; char lagcounterbuf[32] = {0};
@ -902,6 +903,8 @@ bool FCEUI_LoadMovie(const char *fname, bool _read_only, int _pauseframe)
pauseframe = _pauseframe; pauseframe = _pauseframe;
movie_readonly = _read_only; movie_readonly = _read_only;
movieMode = MOVIEMODE_PLAY; movieMode = MOVIEMODE_PLAY;
if (movieMode != MOVIEMODE_TASEDITOR)
currRerecordCount = currMovieData.rerecordCount;
if(movie_readonly) if(movie_readonly)
FCEU_DispMessage("Replay started Read-Only.",0); FCEU_DispMessage("Replay started Read-Only.",0);
@ -972,6 +975,8 @@ void FCEUI_SaveMovie(const char *fname, EMOVIE_FLAG flags, std::wstring author)
movieMode = MOVIEMODE_RECORD; movieMode = MOVIEMODE_RECORD;
movie_readonly = false; movie_readonly = false;
if (movieMode != MOVIEMODE_TASEDITOR)
currRerecordCount = 0;
FCEU_DispMessage("Movie recording started.",0); FCEU_DispMessage("Movie recording started.",0);
} }
@ -1406,10 +1411,18 @@ void FCEUMOV_IncrementRerecordCount()
{ {
#ifdef _S9XLUA_H #ifdef _S9XLUA_H
if(!FCEU_LuaRerecordCountSkip()) if(!FCEU_LuaRerecordCountSkip())
if (movieMode != MOVIEMODE_TASEDITOR)
currRerecordCount++;
else
currMovieData.rerecordCount++; currMovieData.rerecordCount++;
#else #else
if (movieMode != MOVIEMODE_TASEDITOR)currRerecordCount++;
currRerecordCount++;
else
currMovieData.rerecordCount++; currMovieData.rerecordCount++;
#endif #endif
if (movieMode != MOVIEMODE_TASEDITOR)
currMovieData.rerecordCount = currRerecordCount;
} }
void FCEUI_MovieToggleFrameDisplay(void) void FCEUI_MovieToggleFrameDisplay(void)