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 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -20,7 +20,8 @@
 #elif defined(__GIZ__)\r
 #include "../gizmondo/giz.h"\r
 #define SCREEN_WIDTH 321\r
-#define SCREEN_BUFFER giz_screen\r
+#define SCREEN_BUFFER menu_screen\r
+extern unsigned char menu_screen[321*240*2];\r
 #endif\r
 \r
 static unsigned char menu_font_data[10240];\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 1a67e43..63ba6a0 100644 (file)
--- 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)\r
                                             currentConfig.KeyBinds[i] &= ~opts[sel].mask; // allow to unbind only\r
                                        else currentConfig.KeyBinds[i] ^=  opts[sel].mask;\r
-                                       if (player_idx >= 0 && currentConfig.KeyBinds[i] & opts[sel].mask) {\r
+                                       if (player_idx >= 0 && (currentConfig.KeyBinds[i] & opts[sel].mask)) {\r
                                                currentConfig.KeyBinds[i] &= ~(3 << 16);\r
                                                currentConfig.KeyBinds[i] |= player_idx << 16;\r
                                        }\r