Commands are now to be managed by a Command DB, not by passing around arbitrary strings.

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index 38e67b8471a2347f9834e6868e129f423824bf74..f2409758bf13183103d73686575b5868a77729d6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -27,6 +27,7 @@
 #include "rrand.h" /* for rrand(), rrand_seed() */
 #include "rexit.h" /* for exit_game() */
 #include "control.h" /* for meta_control() */
+#include "command_db.h" /* for init_command_db() */
 
 
 
@@ -34,6 +35,9 @@ int main(int argc, char *argv[])
 {
     struct World world;
 
+    init_command_db(&world);
+    set_cleanup_flag(CLEANUP_COMMAND_DB);
+
     /* Check for corrupted savefile / recordfile savings. */
     char * recordfile = "record";
     char * savefile = "savefile";
@@ -244,7 +248,7 @@ int main(int argc, char *argv[])
             draw_all_wins(&win_meta);
             key = getch();
             if (   EOF != action
-                && key == get_action_key(world.keybindings, "wait / next turn"))
+                && key == get_action_key(world.keybindings, "wait"))
             {
                 action = getc(file);
                 if (EOF != action)