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

Fixed so that loadstate updates input display during movie playback as well.

This commit is contained in:
adelikat 2010-05-12 03:14:41 +00:00
parent 6131a6ea79
commit b5ea58271b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,5 +1,5 @@
11-may-2010 - ugetab - Win32 - Added Ram Search hotkeys for the first 6 search types in the list. 11-may-2010 - ugetab - Win32 - Added Ram Search hotkeys for the first 6 search types in the list.
10-may-2010 - adelikat - Loadstate while in record mode update input display 10-may-2010 - adelikat - Loadstate while movie is loaded updates input display
10-may-2010 - ugetab - Added gui.getpixel() which gets any gui.pixel() set pixel colors, and possibly other functions. Added emu.getscreenpixel() which gets the RGB and Palette of any pixel on the screen. 10-may-2010 - ugetab - Added gui.getpixel() which gets any gui.pixel() set pixel colors, and possibly other functions. Added emu.getscreenpixel() which gets the RGB and Palette of any pixel on the screen.
08-may-2010 - ugetab - Added savestate.object() which is savestate.create() with intuitive numbering under windows 08-may-2010 - ugetab - Added savestate.object() which is savestate.create() with intuitive numbering under windows
08-may-2010 - ugetab - Added emu.addgamegenie() and emu.delgamegenie() LUA functions. 08-may-2010 - ugetab - Added emu.addgamegenie() and emu.delgamegenie() LUA functions.

7
src/state.cpp
View File

@ -744,9 +744,6 @@ bool FCEUSS_Load(const char *fname)
} }
else else
{ {
//This looks redudant to me... but why bother deleting it:) //adelikat: TODO: remove this later
SaveStateStatus[CurrentState]=1;
FCEU_DispMessage("State %d loaded.",CurrentState); FCEU_DispMessage("State %d loaded.",CurrentState);
SaveStateStatus[CurrentState]=1; SaveStateStatus[CurrentState]=1;
} }
@ -778,8 +775,8 @@ bool FCEUSS_Load(const char *fname)
//Update input display if movie is loaded //Update input display if movie is loaded
extern uint32 cur_input_display; extern uint32 cur_input_display;
if (FCEUMOV_Mode(MOVIEMODE_RECORD) ) //TODO: the memcpy line doesn't work if playback mode, figure out why and have it up date during that mode as well if (FCEUMOV_Mode(MOVIEMODE_RECORD) || FCEUMOV_Mode(MOVIEMODE_PLAY))
memcpy(&cur_input_display,currMovieData.records[currMovieData.getNumRecords()-1].joysticks.data,4); memcpy(&cur_input_display,currMovieData.records[currFrameCounter-1].joysticks.data,4);
return true; return true;
} }