diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp index 5e2bd9c80..577aa5379 100644 --- a/desmume/src/movie.cpp +++ b/desmume/src/movie.cpp @@ -372,9 +372,6 @@ static void StopRecording() void FCEUI_StopMovie() { - //if(suppressMovieStop) - // return; - if(movieMode == MOVIEMODE_PLAY) StopPlayback(); else if(movieMode == MOVIEMODE_RECORD) diff --git a/desmume/src/windows/hotkey.cpp b/desmume/src/windows/hotkey.cpp index d64aa553d..2a4a51b40 100644 --- a/desmume/src/windows/hotkey.cpp +++ b/desmume/src/windows/hotkey.cpp @@ -30,6 +30,7 @@ #include "../movie.h" #include "ramwatch.h" //In order to call UpdateRamWatch (for loadstate functions) #include "ram_search.h" //In order to call UpdateRamSearch (for loadstate functions) +#include "replay.h" extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function @@ -181,13 +182,29 @@ void HK_ToggleReadOnly(int) { SetMessageToDisplay("Read+Write"); } -void HK_PlayMovie(int) { +void HK_PlayMovie(int) +{ + if (romloaded) + { + //NDS_Pause(); + //Replay_LoadMovie(); + //NDS_UnPause(); + } } -void HK_RecordMovie(int) { +void HK_RecordMovie(int) +{ + if (romloaded) + { + //NDS_Pause(); + //MovieRecordTo(); + //NDS_UnPause(); + } } -void HK_StopMovie(int) { +void HK_StopMovie(int) +{ + FCEUI_StopMovie(); } void HK_AutoHoldKeyDown(int) {AutoHoldPressed = true;}