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

Added range bound to keep internal cheat data within specified size 

The decision to change the value column to store G_TYPE_UINT is purely pragmatic--having all data be treated and displayed as unsized is simpler than writing a custom display to handle signedness and cleaner than 1-3 byte ints appearing unsigned and 4 byte int appearing signed.
This commit is contained in:
En-En 2024-09-26 20:52:04 -05:00
parent 8a3302c650
commit 8f73a9c255
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desmume/src/frontend/posix/gtk/cheatsGTK.cpp
View File

@ -129,11 +129,15 @@ static void cheat_list_modify_cheat(GtkCellRendererText * cell,
if (column == COLUMN_LO || column == COLUMN_HI
|| column == COLUMN_SIZE) {
u32 v = 0;
u32 data;
switch (column) {
case COLUMN_SIZE:
v = atoi(new_text);
cheats->update(v-1, cheat.code[0][0], cheat.code[0][1],
data = std::min(0xFFFFFFFF >> (24 - ((v-1) << 3)),
cheat.code[0][1]);
cheats->update(v-1, cheat.code[0][0], data,
cheat.description, cheat.enabled, ii);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, COLUMN_LO, data, -1);
break;
case COLUMN_HI:
sscanf(new_text, "%x", &v);
@ -143,6 +147,7 @@ static void cheat_list_modify_cheat(GtkCellRendererText * cell,
break;
case COLUMN_LO:
v = atoi(new_text);
v = std::min(0xFFFFFFFF >> (24 - (cheat.size << 3)), v);
cheats->update(cheat.size, cheat.code[0][0], v, cheat.description,
cheat.enabled, ii);
break;
@ -303,7 +308,7 @@ static void cheatListEnd()
static GtkListStore *cheat_list_populate()
{
GtkListStore *store = gtk_list_store_new (5, G_TYPE_BOOLEAN,
G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING);
G_TYPE_INT, G_TYPE_INT, G_TYPE_UINT, G_TYPE_STRING);
CHEATS_LIST cheat;
u32 chsize = cheats->getListSize();

9
desmume/src/frontend/posix/gtk2/cheatsGTK.cpp
View File

@ -129,11 +129,15 @@ static void cheat_list_modify_cheat(GtkCellRendererText * cell,
if (column == COLUMN_LO || column == COLUMN_HI
|| column == COLUMN_SIZE) {
u32 v = 0;
u32 data;
switch (column) {
case COLUMN_SIZE:
v = atoi(new_text);
cheats->update(v-1, cheat.code[0][0], cheat.code[0][1],
data = std::min(0xFFFFFFFF >> (24 - ((v-1) << 3)),
cheat.code[0][1]);
cheats->update(v-1, cheat.code[0][0], data,
cheat.description, cheat.enabled, ii);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, COLUMN_LO, data, -1);
break;
case COLUMN_HI:
sscanf(new_text, "%x", &v);
@ -143,6 +147,7 @@ static void cheat_list_modify_cheat(GtkCellRendererText * cell,
break;
case COLUMN_LO:
v = atoi(new_text);
v = std::min(0xFFFFFFFF >> (24 - (cheat.size << 3)), v);
cheats->update(cheat.size, cheat.code[0][0], v, cheat.description,
cheat.enabled, ii);
break;
@ -303,7 +308,7 @@ static void cheatListEnd()
static GtkListStore *cheat_list_populate()
{
GtkListStore *store = gtk_list_store_new (5, G_TYPE_BOOLEAN,
G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING);
G_TYPE_INT, G_TYPE_INT, G_TYPE_UINT, G_TYPE_STRING);
CHEATS_LIST cheat;
u32 chsize = cheats->getListSize();