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

merge r3739 --start-paused fixes to release branch and as usual unnecessarily touch 1 million files

This commit is contained in:
zeromus 2010-08-10 03:09:14 +00:00
parent 609108fbb8
commit 32b031483d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/windows/hotkey.cpp
View File

@ -161,14 +161,14 @@ void HK_StateLoadSlot(int num, bool justPressed)
if (romloaded && justPressed) if (romloaded && justPressed)
{ {
BOOL wasPaused = paused; BOOL wasPaused = paused;
NDS_Pause(); Pause();
loadstate_slot(num); //Loadstate loadstate_slot(num); //Loadstate
lastSaveState = num; //Set last savestate used lastSaveState = num; //Set last savestate used
UpdateToolWindows(); UpdateToolWindows();
if(!wasPaused) if(!wasPaused)
NDS_UnPause(); Unpause();
else else
Display(); Display();

13
desmume/src/windows/main.cpp
View File

@ -174,6 +174,7 @@ HMENU mainMenu = NULL; //Holds handle to the main DeSmuME menu
CToolBar* MainWindowToolbar; CToolBar* MainWindowToolbar;
DWORD hKeyInputTimer; DWORD hKeyInputTimer;
bool start_paused;
extern LRESULT CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); extern LRESULT CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
void InitRamSearch(); void InitRamSearch();
@ -1915,7 +1916,7 @@ void LoadSaveStateInfo()
static BOOL LoadROM(const char * filename, const char * logicalName) static BOOL LoadROM(const char * filename, const char * logicalName)
{ {
ResetSaveStateTimes(); ResetSaveStateTimes();
NDS_Pause(); Pause();
//if (strcmp(filename,"")!=0) INFO("Attempting to load ROM: %s\n",filename); //if (strcmp(filename,"")!=0) INFO("Attempting to load ROM: %s\n",filename);
if (NDS_LoadROM(filename, logicalName) > 0) if (NDS_LoadROM(filename, logicalName) > 0)
@ -2425,6 +2426,7 @@ int _main()
cmdline.errorHelp(__argv[0]); cmdline.errorHelp(__argv[0]);
return 1; return 1;
} }
start_paused = cmdline.start_paused;
Desmume_InitOnce(); Desmume_InitOnce();
@ -2719,11 +2721,6 @@ int _main()
if(OpenCore(cmdline.nds_file.c_str())) if(OpenCore(cmdline.nds_file.c_str()))
{ {
romloaded = TRUE; romloaded = TRUE;
if(cmdline.start_paused)
{
NDS_Pause();
cmdline.start_paused = 0;
}
} }
} }
@ -3146,7 +3143,11 @@ static BOOL OpenCore(const char* filename)
{ {
romloaded = TRUE; romloaded = TRUE;
if(movieMode == MOVIEMODE_INACTIVE) if(movieMode == MOVIEMODE_INACTIVE)
{
if(!start_paused)
Unpause(); Unpause();
start_paused = 0;
}
// Update the toolbar // Update the toolbar
MainWindowToolbar->EnableButton(IDM_PAUSE, true); MainWindowToolbar->EnableButton(IDM_PAUSE, true);