X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=6c60afa83de8f613aa1e0ccf83ed6e317fe1fedf;hb=e6dcab0e1261bc96d7754b24b798cc3a5f262335;hp=247ec507173c9af85e02d6549926f08e3d5b6db4;hpb=24a8edd8a9f5393cf67c1d9a86923f388e43e104;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 247ec50..6c60afa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,12 +21,12 @@
* build_map_objects()
*/
#include "map.h" /* for struct Map, init_map() */
-#include "misc.h" /* for update_log(), toggle_window(), find_passable_pos(),
- * save_game()
- */
+#include "misc.h" /* for update_log(), find_passable_pos(), save_game() */
+#include "wincontrol.h" /* for toggle_window() */
#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 +34,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";
@@ -99,7 +102,7 @@ int main(int argc, char *argv[])
world.player = &player;
world.monster = 0;
world.item = 0;
- init_map_object_defs(&world, "defs");
+ init_map_object_defs(&world, "config/defs");
/* For interactive mode, try to load world state from savefile. */
char * err_o = "Trouble loading game (fopen() in main()) / "
@@ -244,7 +247,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)