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

Removed Update_RAM_Watch() lines because it's called from Update_RAM_Search()

This commit is contained in:
gocha 2009-09-28 23:42:09 +00:00
parent 9e8a66a006
commit bc1d031b29
2 changed files with 7 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

@ -156,8 +156,8 @@ void HK_StateLoadSlot(int num, bool justPressed)
loadstate_slot(num); //Loadstate loadstate_slot(num); //Loadstate
lastSaveState = num; //Set last savestate used lastSaveState = num; //Set last savestate used
Update_RAM_Watch(); //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating
Update_RAM_Search(); //main.cpp - case IDM_STATE_LOAD: also calls these functions Update_RAM_Search(); //Update_RAM_Watch() is also called; main.cpp - case IDM_STATE_LOAD: also calls these functions
if(!wasPaused) if(!wasPaused)
NDS_UnPause(); NDS_UnPause();

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

@ -1258,9 +1258,7 @@ static void StepRunLoop_User()
mainLoopData.toolframecount = 0; mainLoopData.toolframecount = 0;
} }
Update_RAM_Search(); // Update_RAM_Watch() is also called.
Update_RAM_Watch();
Update_RAM_Search();
mainLoopData.fpsframecount++; mainLoopData.fpsframecount++;
QueryPerformanceCounter((LARGE_INTEGER *)&mainLoopData.curticks); QueryPerformanceCounter((LARGE_INTEGER *)&mainLoopData.curticks);
@ -3413,8 +3411,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
if ((fileDropped[extIndex+3] >= '0' && fileDropped[extIndex+3] <= '9') || fileDropped[extIndex+3] == '-' || fileDropped[extIndex+3] == 't') //If last character is 0-9 (making .ds0 - .ds9) or .dst if ((fileDropped[extIndex+3] >= '0' && fileDropped[extIndex+3] <= '9') || fileDropped[extIndex+3] == '-' || fileDropped[extIndex+3] == 't') //If last character is 0-9 (making .ds0 - .ds9) or .dst
{ {
savestate_load(filename); savestate_load(filename);
Update_RAM_Watch(); //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating
Update_RAM_Search(); //hotkey.cpp - HK_StateLoadSlot & State_Load also call these functions Update_RAM_Search(); //Update_RAM_Watch() is also called; hotkey.cpp - HK_StateLoadSlot & State_Load also call these functions
} }
} }
} }
@ -3692,8 +3690,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
} }
savestate_load(SavName); savestate_load(SavName);
Update_RAM_Watch(); //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating
Update_RAM_Search(); //hotkey.cpp - HK_StateLoadSlot also calls these functions Update_RAM_Search(); //Update_RAM_Watch() is also called; hotkey.cpp - HK_StateLoadSlot also calls these functions
NDS_UnPause(); NDS_UnPause();
} }
return 0; return 0;