Made keybindings array into linked list; on the way rewrote / improved great parts...

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index 0cdcaf16293db6472075f472c6ac09aacf29b1a9..a9d22f273ba81bf5d18c5868ddb32a84c709dd5d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -13,9 +13,9 @@
 #include "draw_wins.h" /* for draw_keys_win(), draw_map_win(), draw_info_win(),
                         * draw_log_win()
                         */
-#include "keybindings.h" /* for init_keybindings(), get_action_key() */
+#include "keybindings.h" /* for init_keybindings(), get_keycode_to_action() */
 #include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian](),
-                        * try_fopen(), try_fclose(), try_fclose_unlink_renmae()
+                        * try_fopen(), try_fclose(), try_fclose_unlink_rename()
                         */
 #include "map_objects.h" /* for structs Monster, Item, Player,
                           * init_map_object_defs(), read_map_objects(),
@@ -123,8 +123,8 @@ int main(int argc, char *argv[])
     /* For non-interactive mode, try to load world state from record file. */
     else
     {
-        err_r = "Trouble reading from 'record' file (read_uint32_bigendian() in "
-                "main()).";
+        err_r = "Trouble reading from 'record' file (read_uint32_bigendian() "
+                "in main()).";
         if (0 == world.interactive)
         {
             file = try_fopen(recordfile, "r", &world, f_name);
@@ -209,7 +209,7 @@ int main(int argc, char *argv[])
             draw_all_wins(world.wmeta);
             key = getch();
             if (   EOF != action
-                && key == get_action_key(world.keybindings, "wait"))
+                && key == get_keycode_to_action(world.keybindings, "wait"))
             {
                 action = getc(file);
                 if (EOF != action)