Loadstate updates input display if movie is recording

This commit is contained in:
adelikat 2010-05-12 03:07:03 +00:00
parent b972313c34
commit 952320e1df
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,4 @@
10-may-2010 - adelikat - Loadstate while in record mode update input display
10-may-2010 - ugetab - Win32 - Added hotkey options for the cheat dialog buttons Equal, Not Equal, Greater Than, and Less Than. 10-may-2010 - ugetab - Win32 - Added hotkey options for the cheat dialog buttons Equal, Not Equal, Greater Than, and Less Than.
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

View File

@ -744,7 +744,7 @@ bool FCEUSS_Load(const char *fname)
} }
else else
{ {
//This looks redudant to me... but why bother deleting it:) //This looks redudant to me... but why bother deleting it:) //adelikat: TODO: remove this later
SaveStateStatus[CurrentState]=1; SaveStateStatus[CurrentState]=1;
FCEU_DispMessage("State %d loaded.",CurrentState); FCEU_DispMessage("State %d loaded.",CurrentState);
@ -775,6 +775,12 @@ bool FCEUSS_Load(const char *fname)
#ifdef WIN32 #ifdef WIN32
Update_RAM_Search(); // Update_RAM_Watch() is also called. Update_RAM_Search(); // Update_RAM_Watch() is also called.
#endif #endif
//Update input display if movie is loaded
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
memcpy(&cur_input_display,currMovieData.records[currMovieData.getNumRecords()-1].joysticks.data,4);
return true; return true;
} }
else else