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

Fixed the bug that the first frame of user input after movie end would be ignored.

This commit is contained in:
aquanull 2018-04-13 11:59:34 +08:00
parent c7710ae244
commit da4194ec7a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drivers/win/input.cpp
View File

@ -245,9 +245,6 @@ int DTestButton(ButtConfig *bc)
void UpdateGamepad(bool snes) void UpdateGamepad(bool snes)
{ {
if(FCEUMOV_Mode(MOVIEMODE_PLAY))
return;
int JS=0; int JS=0;
if(FCEUMOV_Mode(MOVIEMODE_RECORD)) if(FCEUMOV_Mode(MOVIEMODE_RECORD))
AutoFire(); AutoFire();
@ -422,10 +419,13 @@ void FCEUD_UpdateInput()
bool joy=false; bool joy=false;
bool mouse=false; bool mouse=false;
bool mouse_relative=false; bool mouse_relative=false;
EMOVIEMODE FCEUMOVState = FCEUMOV_Mode();
UpdateRawInputAndHotkeys(); //aquanull: if we are ok with getting real input even when emulation is paused, why should we bother skipping it when playing a movie?
bool skipRealInput = (FCEUMOV_Mode() == MOVIEMODE_PLAY && currFrameCounter < (int)currMovieData.records.size());
UpdateRawInputAndHotkeys();
if (!skipRealInput) //FatRatKnight: Moved this if out of the function, a more concise fix may be desired.
{ {
for(int x=0;x<2;x++) for(int x=0;x<2;x++)
switch(InputType[x]) switch(InputType[x])
@ -469,11 +469,8 @@ void FCEUD_UpdateInput()
if(joy) if(joy)
UpdateGamepad(false); UpdateGamepad(false);
if (FCEUMOVState != MOVIEMODE_PLAY) //FatRatKnight: Moved this if out of the function, a more concise fix may be desired. if (mouse) GetMouseData(MouseData);
{ if (mouse_relative) GetMouseRelative(MouseRelative);
if (mouse) GetMouseData(MouseData);
if (mouse_relative) GetMouseRelative(MouseRelative);
}
} }
} }