diff options
| author | notaz | 2011-09-25 15:37:50 +0300 |
|---|---|---|
| committer | notaz | 2011-09-25 15:37:50 +0300 |
| commit | 2924e5711a8279228df4c03bc0a970c349e55938 (patch) | |
| tree | f49ef782e3ee0bcd80d7c197d024a5e015dbb33f /frontend | |
| parent | 3ebefe711e0fb2fe941951b764ea5623436cf887 (diff) | |
| download | pcsx_rearmed-2924e5711a8279228df4c03bc0a970c349e55938.tar.gz pcsx_rearmed-2924e5711a8279228df4c03bc0a970c349e55938.tar.bz2 pcsx_rearmed-2924e5711a8279228df4c03bc0a970c349e55938.zip | |
frontend: menu: don't assume onoff vars are int
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/common/menu.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/frontend/common/menu.c b/frontend/common/menu.c index cf31610..1513d39 100644 --- a/frontend/common/menu.c +++ b/frontend/common/menu.c @@ -1,5 +1,5 @@ /*
- * (C) Gražvydas "notaz" Ignotas, 2006-2010
+ * (C) Gražvydas "notaz" Ignotas, 2006-2011
*
* This work is licensed under the terms of any of these licenses
* (at your option):
@@ -372,6 +372,28 @@ static int me_count(const menu_entry *ent) return ret;
}
+static unsigned int me_read_onoff(const menu_entry *ent)
+{
+ // guess var size based on mask to avoid reading too much
+ if (ent->mask & 0xffff0000)
+ return *(unsigned int *)ent->var & ent->mask;
+ else if (ent->mask & 0xff00)
+ return *(unsigned short *)ent->var & ent->mask;
+ else
+ return *(unsigned char *)ent->var & ent->mask;
+}
+
+static void me_toggle_onoff(menu_entry *ent)
+{
+ // guess var size based on mask to avoid reading too much
+ if (ent->mask & 0xffff0000)
+ *(unsigned int *)ent->var ^= ent->mask;
+ else if (ent->mask & 0xff00)
+ *(unsigned short *)ent->var ^= ent->mask;
+ else
+ *(unsigned char *)ent->var ^= ent->mask;
+}
+
static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
{
const menu_entry *ent, *ent_sel = entries;
@@ -477,7 +499,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void)) case MB_NONE:
break;
case MB_OPT_ONOFF:
- text_out16(x + col2_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");
+ text_out16(x + col2_offs, y, me_read_onoff(ent) ? "ON" : "OFF");
break;
case MB_OPT_RANGE:
text_out16(x + col2_offs, y, "%i", *(int *)ent->var);
@@ -545,7 +567,7 @@ static int me_process(menu_entry *entry, int is_next, int is_lr) {
case MB_OPT_ONOFF:
case MB_OPT_CUSTONOFF:
- *(int *)entry->var ^= entry->mask;
+ me_toggle_onoff(entry);
return 1;
case MB_OPT_RANGE:
case MB_OPT_CUSTRANGE:
|