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

win32: fix RAM Autosearch function which has been broken by the last commit.

This commit is contained in:
gocha 2012-07-21 11:56:28 +09:00
parent 5709da8085
commit 147512c112
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
win32/ram_search.cpp
View File

@ -1277,13 +1277,15 @@ LRESULT CustomDraw (LPARAM lParam)
return CDRF_DODEFAULT;
}
void Update_RAM_Search() //keeps RAM values up to date in the search and watch windows
void Update_RAM_Search(bool DoAutoSearch) //keeps RAM values up to date in the search and watch windows
{
DoAutoSearch &= AutoSearch;
if(disableRamSearchUpdate)
return;
int prevValuesNeededUpdate;
if (AutoSearch && !ResultCount)
if (DoAutoSearch && !ResultCount)
{
if(!AutoSearchAutoRetry)
{
@ -1309,7 +1311,7 @@ void Update_RAM_Search() //keeps RAM values up to date in the search and watch w
signal_new_frame();
}
if (AutoSearch && ResultCount)
if (DoAutoSearch && ResultCount)
{
//Clear_Sound_Buffer();
if(!rs_val_valid)

2
win32/ram_search.h
View File

@ -29,7 +29,7 @@ extern HWND RamSearchHWnd;
void ResetResults();
void CloseRamWindows(); //Close the Ram Search & Watch windows when rom closes
void ReopenRamWindows(); //Reopen them when a new Rom is loaded
void Update_RAM_Search(); //keeps RAM values up to date in the search and watch windows
void Update_RAM_Search(bool DoAutoSearch); //keeps RAM values up to date in the search and watch windows
#define RW_VIRTUAL_ADDR_SHIFT 24

6
win32/wsnes9x.cpp
View File

@ -3514,7 +3514,7 @@ int WINAPI WinMain(
}
S9xMainLoop();
UpdateToolWindows();
UpdateToolWindows(true);
GUI.FrameCount++;
}
@ -3589,9 +3589,9 @@ loop_exit:
return msg.wParam;
}
void UpdateToolWindows()
void UpdateToolWindows(bool frameAdvance)
{
Update_RAM_Search(); //Update_RAM_Watch() is also called
Update_RAM_Search(frameAdvance); //Update_RAM_Watch() is also called
RefreshAllToolWindows();
}

2
win32/wsnes9x.h
View File

@ -612,6 +612,6 @@ bool GetFilterHiResSupport(RenderFilter filterID);
const TCHAR * S9xGetDirectoryT (enum s9x_getdirtype);
RECT GetWindowMargins(HWND hwnd, UINT width);
void UpdateToolWindows();
void UpdateToolWindows(bool frameAdvance = false);
#endif // !defined(SNES9X_H_INCLUDED)