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

Resolved cppcheck warnings in cheats.cpp.

This commit is contained in:
Matthew Budd 2020-06-15 22:09:12 -04:00
parent 9eaad6e14d
commit 96cba27965
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/win/cheat.cpp
View File

@ -538,7 +538,7 @@ INT_PTR CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
break;
case CHEAT_CONTEXT_POSSI_ADDTOMEMORYWATCH:
{
char addr[16] = { 0 };
char addr[32] = { 0 };
int sel = SendDlgItemMessage(hwndDlg, IDC_CHEAT_LIST_POSSIBILITIES, LVM_GETSELECTIONMARK, 0, 0);
if (sel != -1)
{
@ -816,9 +816,9 @@ INT_PTR CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
if (strchr(buf, ':'))
{
if (strchr(buf, '?'))
sscanf(buf, "%X:%X?%X", &a, &c, &v);
sscanf(buf, "%X:%X?%X", (unsigned int*)&a, (unsigned int*)&c, (unsigned int*)&v);
else
sscanf(buf, "%X:%X", &a, &v);
sscanf(buf, "%X:%X", (unsigned int*)&a, (unsigned int*)&v);
}
SetDlgItemText(hwndDlg, IDC_CHEAT_ADDR, (LPCSTR)(a == -1 ? "" : U16ToStr(a)));
@ -978,7 +978,7 @@ INT_PTR CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
break;
case NM_DBLCLK:
{
char addr[16];
char addr[32];
sprintf(addr, "%04X", possiList[((NMITEMACTIVATE*)lParam)->iItem].addr);
AddMemWatch(addr);
}
@ -1035,19 +1035,19 @@ void UpdateCheatListGroupBoxUI()
char temp[64];
if (FrozenAddressCount < 256)
{
sprintf(temp, "Active Cheats %d", FrozenAddressCount);
sprintf(temp, "Active Cheats %u", FrozenAddressCount);
EnableWindow(GetDlgItem(hCheat, IDC_BTN_CHEAT_ADD), TRUE);
EnableWindow(GetDlgItem(hCheat, IDC_BTN_CHEAT_ADDFROMFILE), TRUE);
}
else if (FrozenAddressCount == 256)
{
sprintf(temp, "Active Cheats %d (Max Limit)", FrozenAddressCount);
sprintf(temp, "Active Cheats %u (Max Limit)", FrozenAddressCount);
EnableWindow(GetDlgItem(hCheat, IDC_BTN_CHEAT_ADD), FALSE);
EnableWindow(GetDlgItem(hCheat, IDC_BTN_CHEAT_ADDFROMFILE), FALSE);
}
else
{
sprintf(temp, "%d Error: Too many cheats loaded!", FrozenAddressCount);
sprintf(temp, "%u Error: Too many cheats loaded!", FrozenAddressCount);
EnableWindow(GetDlgItem(hCheat, IDC_BTN_CHEAT_ADD), FALSE);
EnableWindow(GetDlgItem(hCheat, IDC_BTN_CHEAT_ADDFROMFILE), FALSE);
}

8
src/drivers/win/ramwatch.h
View File

@ -52,11 +52,17 @@ struct AddressWatcher
{
unsigned int Address; // hardware address
unsigned int CurValue;
char* comment = NULL; // NULL means no comment, non-NULL means allocated comment
char* comment; // NULL means no comment, non-NULL means allocated comment
bool WrongEndian;
char Size; //'d' = 4 bytes, 'w' = 2 bytes, 'b' = 1 byte, and 'S' means it's a separator.
char Type;//'s' = signed integer, 'u' = unsigned, 'h' = hex, 'b' = binary, 'S' = separator
short Cheats; // how many bytes are affected by cheat
AddressWatcher(void)
{
Address = 0; CurValue = 0; comment = NULL; WrongEndian = false;
Size = 'b'; Type = 's'; Cheats = 0;
}
};
// the struct for communicating with add watch window