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

win32: changes to GUI cheat handling

This commit is contained in:
OV2 2018-04-30 23:58:49 +02:00
parent e69fd7c50e
commit 25fa85bce4
1 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
win32/wsnes9x.cpp
View File

@ -2306,10 +2306,8 @@ LRESULT CALLBACK WinProc(
break; break;
case ID_CHEAT_ENTER: case ID_CHEAT_ENTER:
RestoreGUIDisplay (); RestoreGUIDisplay ();
S9xCheatsDisable ();
DialogBox(g_hInst, MAKEINTRESOURCE(IDD_CHEATER), hWnd, DlgCheater); DialogBox(g_hInst, MAKEINTRESOURCE(IDD_CHEATER), hWnd, DlgCheater);
S9xSaveCheatFile (S9xGetFilename (".cht", CHEAT_DIR)); S9xSaveCheatFile (S9xGetFilename (".cht", CHEAT_DIR));
S9xCheatsEnable ();
RestoreSNESDisplay (); RestoreSNESDisplay ();
break; break;
case ID_CHEAT_SEARCH: case ID_CHEAT_SEARCH:
@ -8544,19 +8542,18 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
for(counter=0; counter < Cheat.g.size(); counter++) for(counter=0; counter < Cheat.g.size(); counter++)
{ {
char *code_string; char *code_string;
Utf8ToWide *wstring;
int curr_idx=-1; int curr_idx=-1;
code_string = S9xCheatGroupToText(counter); code_string = S9xCheatGroupToText(counter);
wstring = new Utf8ToWide(code_string); Utf8ToWide wstring(code_string);
delete[] code_string;
LVITEM lvi; LVITEM lvi;
memset(&lvi, 0, sizeof(LVITEM)); memset(&lvi, 0, sizeof(LVITEM));
lvi.mask=LVIF_TEXT; lvi.mask=LVIF_TEXT;
lvi.cchTextMax = CHEAT_SIZE; lvi.cchTextMax = CHEAT_SIZE;
lvi.pszText = *wstring; lvi.pszText = wstring;
lvi.iItem=counter; lvi.iItem=counter;
curr_idx=ListView_InsertItem(GetDlgItem(hDlg,IDC_CHEAT_LIST), &lvi); curr_idx=ListView_InsertItem(GetDlgItem(hDlg,IDC_CHEAT_LIST), &lvi);
delete[] code_string;
delete wstring;
unsigned int k; unsigned int k;
for(k=0;k<counter;k++) for(k=0;k<counter;k++)
@ -8567,15 +8564,14 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
ct.index[counter]=curr_idx; ct.index[counter]=curr_idx;
ct.state[counter]=Untouched; ct.state[counter]=Untouched;
wstring = new Utf8ToWide(Cheat.g[counter].name); Utf8ToWide wstring2(Cheat.g[counter].name);
memset(&lvi, 0, sizeof(LVITEM)); memset(&lvi, 0, sizeof(LVITEM));
lvi.iItem=curr_idx; lvi.iItem=curr_idx;
lvi.iSubItem=1; lvi.iSubItem=1;
lvi.mask=LVIF_TEXT; lvi.mask=LVIF_TEXT;
lvi.cchTextMax = CHEAT_SIZE; lvi.cchTextMax = CHEAT_SIZE;
lvi.pszText = *wstring; lvi.pszText = wstring2;
SendDlgItemMessage(hDlg,IDC_CHEAT_LIST, LVM_SETITEM, 0, (LPARAM)&lvi); SendDlgItemMessage(hDlg,IDC_CHEAT_LIST, LVM_SETITEM, 0, (LPARAM)&lvi);
delete wstring;
ListView_SetCheckState(GetDlgItem(hDlg,IDC_CHEAT_LIST), curr_idx, Cheat.g[counter].enabled); ListView_SetCheckState(GetDlgItem(hDlg,IDC_CHEAT_LIST), curr_idx, Cheat.g[counter].enabled);
@ -8663,10 +8659,7 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
if(valid_cheat) if(valid_cheat)
{ {
Utf8ToWide *wstring; Utf8ToWide wstring(valid_cheat);
wstring = new Utf8ToWide(valid_cheat);
delete[] valid_cheat; delete[] valid_cheat;
int curr_idx=-1; int curr_idx=-1;
@ -8674,11 +8667,11 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
LVITEM lvi; LVITEM lvi;
memset(&lvi, 0, sizeof(LVITEM)); memset(&lvi, 0, sizeof(LVITEM));
lvi.mask=LVIF_TEXT; lvi.mask=LVIF_TEXT;
lvi.pszText=*wstring; lvi.pszText=wstring;
lvi.iItem=ListView_GetItemCount(GetDlgItem(hDlg,IDC_CHEAT_LIST)); lvi.iItem=ListView_GetItemCount(GetDlgItem(hDlg,IDC_CHEAT_LIST));
curr_idx=ListView_InsertItem(GetDlgItem(hDlg,IDC_CHEAT_LIST), &lvi); curr_idx=ListView_InsertItem(GetDlgItem(hDlg,IDC_CHEAT_LIST), &lvi);
SetDlgItemText(hDlg, IDC_CHEAT_CODE, *wstring); SetDlgItemText(hDlg, IDC_CHEAT_CODE, wstring);
unsigned int k; unsigned int k;
for(k=0;k<Cheat.g.size();k++) for(k=0;k<Cheat.g.size();k++)
@ -8694,8 +8687,6 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
lvi.pszText=tempDesc; lvi.pszText=tempDesc;
lvi.cchTextMax=CHEAT_SIZE; lvi.cchTextMax=CHEAT_SIZE;
SendDlgItemMessage(hDlg,IDC_CHEAT_LIST, LVM_SETITEM, 0, (LPARAM)&lvi); SendDlgItemMessage(hDlg,IDC_CHEAT_LIST, LVM_SETITEM, 0, (LPARAM)&lvi);
delete wstring;
} }
} }
break; break;
@ -8710,7 +8701,7 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
if(valid_cheat) if(valid_cheat)
{ {
Utf8ToWide *wstring; delete[] valid_cheat;
for(j=0;j<(int)Cheat.g.size();j++) for(j=0;j<(int)Cheat.g.size();j++)
{ {
@ -8718,19 +8709,16 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
ct.state[j]=Modified; ct.state[j]=Modified;
} }
wstring = new Utf8ToWide(code); Utf8ToWide wstring(code);
LVITEM lvi; LVITEM lvi;
memset(&lvi, 0, sizeof(LVITEM)); memset(&lvi, 0, sizeof(LVITEM));
lvi.mask=LVIF_TEXT; lvi.mask=LVIF_TEXT;
lvi.pszText=*wstring; lvi.pszText=wstring;
lvi.iItem=sel_idx; lvi.iItem=sel_idx;
lvi.cchTextMax = CHEAT_SIZE; lvi.cchTextMax = CHEAT_SIZE;
ListView_SetItem(GetDlgItem(hDlg,IDC_CHEAT_LIST), &lvi); ListView_SetItem(GetDlgItem(hDlg,IDC_CHEAT_LIST), &lvi);
SetDlgItemText(hDlg, IDC_CHEAT_CODE, *wstring); SetDlgItemText(hDlg, IDC_CHEAT_CODE, wstring);
delete wstring;
delete[] valid_cheat;
GetDlgItemText(hDlg, IDC_CHEAT_DESCRIPTION, temp, CHEAT_SIZE); GetDlgItemText(hDlg, IDC_CHEAT_DESCRIPTION, temp, CHEAT_SIZE);
@ -8817,14 +8805,9 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
if(ct.index[l]==k) if(ct.index[l]==k)
{ {
hit=true; hit=true;
Cheat.g[l].enabled=ListView_GetCheckState(GetDlgItem(hDlg, IDC_CHEAT_LIST),l);
if(ct.state[l]==Untouched)
l=Cheat.g.size();
else if(ct.state[l]==(unsigned long)Modified) if(ct.state[l]==(unsigned long)Modified) // modified in GUI, change in core
{ {
S9xDisableCheatGroup(l);
TCHAR wcode[CHEAT_SIZE]; TCHAR wcode[CHEAT_SIZE];
TCHAR wdescription[CHEAT_SIZE]; TCHAR wdescription[CHEAT_SIZE];
@ -8848,11 +8831,16 @@ INT_PTR CALLBACK DlgCheater(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
WideToUtf8 description(wdescription); WideToUtf8 description(wdescription);
S9xModifyCheatGroup(l, description, code); S9xModifyCheatGroup(l, description, code);
if (ListView_GetCheckState(GetDlgItem(hDlg, IDC_CHEAT_LIST), k))
S9xEnableCheatGroup(l);
} }
// set core state according to checkbox
if (ListView_GetCheckState(GetDlgItem(hDlg, IDC_CHEAT_LIST), k))
S9xEnableCheatGroup(l);
else
S9xDisableCheatGroup(l);
// we've found the internal cheat index, stop checking for this list entry
break;
} }
} }
if(!hit) if(!hit)