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

Merge branch 'master' into master

This commit is contained in:
zeromus 2019-03-18 00:08:52 -04:00 committed by GitHub
parent 8c485d23a2 abed13c392
commit afbb4fe37f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/win/archive.cpp
View File

@ -277,7 +277,7 @@ public:
// indicator for the open in archive dialog that if the load was canceled by the user.
// TODO: Since I can't think of a better way to indicate it, hope someone could imporve it.
// bool archiveManuallyCanceled;
extern bool archiveManuallyCanceled;
static BOOL CALLBACK ArchiveFileSelectorCallback(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{

2
src/drivers/win/debugger.cpp
View File

@ -2200,7 +2200,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
//mbg merge 7/18/06 changed pausing check and set
if (FCEUI_EmulationPaused()) {
UpdateRegs(hwndDlg);
FCEUI_SetEmulationPaused(0);
FCEUI_ToggleEmulationPause();
//DebuggerWasUpdated = false done in above function;
}
break;

12
src/fceu.cpp
View File

@ -112,7 +112,6 @@ bool movieSubtitles = true; //Toggle for displaying movie subtitles
bool DebuggerWasUpdated = false; //To prevent the debugger from updating things without being updated.
bool AutoResumePlay = false;
char romNameWhenClosingEmulator[2048] = {0};
bool togglePausedRequested = false; //Flaged true to pause at frame boundary
// indicator for the open in archive dialog that if the load was canceled by the user.
@ -405,6 +404,7 @@ int FDSLoad(const char *name, FCEUFILE *fp);
int NSFLoad(const char *name, FCEUFILE *fp);
//char lastLoadedGameName [2048] = {0,}; // hack for movie WRAM clearing on record from poweron
bool archiveManuallyCanceled;
//name should be UTF-8, hopefully, or else there may be trouble
FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silent)
@ -668,14 +668,6 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
JustFrameAdvanced = false;
//do pausing at frame boundary to avoid inconsistency
if (togglePausedRequested)
{
togglePausedRequested = false;
if (!frameAdvanceRequested)
EmulationPaused ^= EMULATIONPAUSED_PAUSED;
}
if (frameAdvanceRequested)
{
if (frameAdvance_Delay_count == 0 || frameAdvance_Delay_count >= frameAdvance_Delay)
@ -1141,7 +1133,7 @@ void FCEUI_SetEmulationPaused(int val) {
void FCEUI_ToggleEmulationPause(void)
{
togglePausedRequested = true;;
EmulationPaused = (EmulationPaused & EMULATIONPAUSED_PAUSED) ^ EMULATIONPAUSED_PAUSED;
DebuggerWasUpdated = false;
}