X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=roguelike.c;h=e1852abb0b415f57e33ca26a7c4739dd083e37b0;hb=a97116ef1f9717596e316f57b12f1915b4de66e5;hp=8e7cae124fe62199842f53cf72d5b0759a28dfe9;hpb=e2b7451c5cdfb4113488334b919641a38f378deb;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 8e7cae1..e1852ab 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -51,7 +51,8 @@ void update_log (struct World *, char *);
 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);
 void player_wait(struct World *);
@@ -348,8 +349,8 @@ char * get_keyname(int keycode) {
     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();
@@ -357,6 +358,13 @@ void mod_key (struct World * world, struct WinMeta * win_meta) {
     world->keybindings[world->keyswindata->select].key = key;
   world->keyswindata->edit = 0; }
 
+void keyswin_move_selection (struct World * world, char dir) {
+// In keybindings window, move selection upwards or downwards (if within limits of list length).
+  if ('u' == dir && world->keyswindata->select > 0)
+    world->keyswindata->select--;
+  else if ('d' == dir && world->keyswindata->select < world->keyswindata->max)
+    world->keyswindata->select++; }
+
 char is_passable (struct World * world, int x, int y) {
 // Check if coordinate on (or beyond) map is accessible to movement.
   char passable = 0;
@@ -484,12 +492,12 @@ int main () {
       resize_window(&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "save keys"))
       save_keybindings(&world);
-    else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0)
-      world.keyswindata->select--;
-    else if (key == get_action_key(world.keybindings, "keys nav down") && world.keyswindata->select < world.keyswindata->max)
-      world.keyswindata->select++;
+    else if (key == get_action_key(world.keybindings, "keys nav up"))
+      keyswin_move_selection (&world, 'u');
+    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"))