git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@256 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-09-20 21:06:14 +00:00
parent 77f53c65c9
commit 7695af0a5b
2 changed files with 3 additions and 2 deletions

View file

@ -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];

View file

@ -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;
}