X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmain.c;h=0ecc10a3dec4b3aa30233cc52df1ffe2e430e595;hb=0399a31b31047ab82348f733d6c56524258d1188;hp=dff5d208414e02ea3749a85b96980de8dccfe37e;hpb=4ca4f2fc97bd592bcbbef5ed2b21b320c7336425;p=plomrogue

diff --git a/src/main.c b/src/main.c
index dff5d20..0ecc10a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,8 +5,8 @@
 #include <stdio.h> /* for FILE typedef, F_OK, rename() */
 #include <ncurses.h> /* for initscr(), noecho(), curs_set(), keypad(), raw() */
 #include <time.h> /* for time() */
-#include <unistd.h> /* for unlink(), getopt(), optarg */
-#include <stdint.h> /* for uint8_t */
+#include <unistd.h> /* for getopt(), optarg */
+#include <stdint.h> /* for uint16_t, uint32_t */
 #include <errno.h> /* for errno */
 #include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(),
                       * draw_all_wins()
@@ -14,27 +14,29 @@
 #include "draw_wins.h" /* for draw_keys_win(), draw_map_win(), draw_info_win(),
                         * draw_log_win()
                         */
-#include "keybindings.h" /* for initkeybindings(), get_action_key() */
+#include "keybindings.h" /* for init_keybindings(), get_action_key() */
 #include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */
 #include "map_objects.h" /* for structs Monster, Item, Player,
                           * init_map_object_defs(), read_map_objects(),
                           * build_map_objects()
                           */
-#include "map_object_actions.h" /* for player_wait(), move_player() */
 #include "map.h" /* for struct Map, init_map() */
-#include "misc.h" /* for update_log(), toggle_window(), find_passable_pos(),
-                   * save_game()
-                   */
-#include "yx_uint16.h" /* for dir enum */
+#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() */
+
 
 
 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";
@@ -94,13 +96,13 @@ int main(int argc, char *argv[])
     world.score = 0;
     world.log = calloc(1, sizeof(char));
     set_cleanup_flag(CLEANUP_LOG);
-    update_log (&world, " ");
+    update_log(&world, " ");
     struct Player player;
     player.hitpoints = 5;
     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()) / "
@@ -198,30 +200,20 @@ int main(int argc, char *argv[])
     init_keybindings(&world);
     set_cleanup_flag(CLEANUP_KEYBINDINGS);
     struct WinMeta win_meta;
-    char * err_winmem = "Trouble with init_win:meta() or draw_all_wins() in "
+    char * err_winmem = "Trouble with init_win_meta() or draw_all_wins() in "
                         "main().";
     exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
     world.wins.meta = &win_meta;
-    struct Win win_keys = init_win(&win_meta, "Keys",
-                                     0, 29, &world, draw_keys_win);
-    world.wins.keys = &win_keys;
-    struct Win win_info = init_win(&win_meta, "Info",
-                                   3, 20, &world, draw_info_win);
-    world.wins.info = &win_info;
-    uint16_t height_logwin = win_meta.padframe.size.y
-                             - (2 + win_info.frame.size.y);
-    struct Win win_log = init_win(&win_meta, "Log",
-                                  height_logwin, 20, &world, draw_log_win);
-    world.wins.log = &win_log;
-    uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x
-                            - win_log.frame.size.x - 2;
-    struct Win win_map = init_win(&win_meta, "Map",
-                                  0, width_mapwin, &world, draw_map_win);
-    world.wins.map = &win_map;
-    toggle_window(&win_meta, world.wins.keys);
-    toggle_window(&win_meta, world.wins.map);
-    toggle_window(&win_meta, world.wins.info);
-    toggle_window(&win_meta, world.wins.log);
+    world.wins.keys = init_win_from_file(&world, "Keys", draw_keys_win);
+    set_cleanup_flag(CLEANUP_WIN_KEYS);
+    world.wins.info = init_win_from_file(&world, "Info", draw_info_win);
+    set_cleanup_flag(CLEANUP_WIN_INFO);
+    world.wins.log = init_win_from_file(&world, "Log", draw_log_win);
+    set_cleanup_flag(CLEANUP_WIN_LOG);
+    world.wins.map = init_win_from_file(&world, "Map", draw_map_win);
+    set_cleanup_flag(CLEANUP_WIN_MAP);
+
+    sorted_wintoggle(&world);
 
     /* Replay mode. */
     int key;
@@ -245,7 +237,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)