From: notaz <notasas@gmail.com>
Date: Thu, 20 Sep 2007 21:06:14 +0000 (+0000)
Subject: giz menu
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7695af0a5bf50329be07289f8eb8b9a59636963e;p=libpicofe.git

giz menu

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@256 be3aeb3a-fb24-0410-a615-afba39da0efa
---

diff --git a/common/menu.c b/common/menu.c
index 53ef33d..ed02ff8 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -20,7 +20,8 @@
 #elif defined(__GIZ__)
 #include "../gizmondo/giz.h"
 #define SCREEN_WIDTH 321
-#define SCREEN_BUFFER giz_screen
+#define SCREEN_BUFFER menu_screen
+extern unsigned char menu_screen[321*240*2];
 #endif
 
 static unsigned char menu_font_data[10240];
diff --git a/gp2x/menu.c b/gp2x/menu.c
index 1a67e43..63ba6a0 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -739,7 +739,7 @@ static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_i
 					if (count_bound_keys(opts[sel].mask, player_idx, 0) >= 2)
 					     currentConfig.KeyBinds[i] &= ~opts[sel].mask; // allow to unbind only
 					else currentConfig.KeyBinds[i] ^=  opts[sel].mask;
-					if (player_idx >= 0 && currentConfig.KeyBinds[i] & opts[sel].mask) {
+					if (player_idx >= 0 && (currentConfig.KeyBinds[i] & opts[sel].mask)) {
 						currentConfig.KeyBinds[i] &= ~(3 << 16);
 						currentConfig.KeyBinds[i] |= player_idx << 16;
 					}