void save_keybindings(struct World *);
int get_action_key (struct KeyBinding *, char *);
char * get_keyname(int);
-void mod_key (struct World *, struct WinMeta *);
+void keyswin_mod_key (struct World *, struct WinMeta *);
void keyswin_move_selection (struct World *, char);
char is_passable (struct World *, int, int);
void move_player (struct World *, char);
sprintf(keyname, "(unknown)");
return keyname; }
-void mod_key (struct World * world, struct WinMeta * win_meta) {
-// In keybinding window, mark selection modifiable, modify key. Ensure max of three digits in key code field.
+void keyswin_mod_key (struct World * world, struct WinMeta * win_meta) {
+// In keybindings window, mark selection modifiable, modify key. Ensure max of three digits in key code field.
world->keyswindata->edit = 1;
draw_all_windows (win_meta);
int key = getch();
toggle_window(&win_meta, &win_info);
else if (key == get_action_key(world.keybindings, "toggle log window"))
toggle_window(&win_meta, &win_log);
- else if (key == get_action_key(world.keybindings, "cycle forwards") && win_meta.active != 0)
+ else if (key == get_action_key(world.keybindings, "cycle forwards"))
cycle_active_window(&win_meta, 'n');
- else if (key == get_action_key(world.keybindings, "cycle backwards") && win_meta.active != 0)
+ else if (key == get_action_key(world.keybindings, "cycle backwards"))
cycle_active_window(&win_meta, 'p');
else if (key == get_action_key(world.keybindings, "shift forwards") && win_meta.active != 0)
shift_window(&win_meta, 'f');
else if (key == get_action_key(world.keybindings, "keys nav down"))
keyswin_move_selection (&world, 'd');
else if (key == get_action_key(world.keybindings, "keys mod"))
- mod_key (&world, &win_meta);
+ keyswin_mod_key (&world, &win_meta);
else if (key == get_action_key(world.keybindings, "map up") && map.offset_y > 0)
map.offset_y--;
else if (key == get_action_key(world.keybindings, "map down"))