Improved and defined more precisely textfile_sizes().

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index d63f587c23955913c843c6cd2760ef2472883b71..fcf677ea4c55c92ff34710c21132accbde34cf40 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,7 +22,9 @@
                           */
 #include "map.h" /* for struct Map, init_map() */
 #include "misc.h" /* for update_log(), find_passable_pos(), save_game() */
-#include "wincontrol.h" /* for toggle_window() */
+#include "wincontrol.h" /* for create_winconfs(), init_winconfs(), init_wins(),
+                         * sorted_wintoggle()
+                         */
 #include "rrand.h" /* for rrand(), rrand_seed() */
 #include "rexit.h" /* for exit_game() */
 #include "control.h" /* for meta_control() */
@@ -133,7 +135,6 @@ int main(int argc, char *argv[])
         exit_err(fclose(file), &world, err_c);
         player.pos.y--;
         player.pos.x--;
-        world.turn = 1;
     }
 
     /* For non-interactive mode, try to load world state from record file. */
@@ -203,20 +204,16 @@ int main(int argc, char *argv[])
     raw();
     init_keybindings(&world);
     set_cleanup_flag(CLEANUP_KEYBINDINGS);
-    char * err_winmem = "Trouble with init_win_meta() or draw_all_wins() in "
-                        "main().";
-    exit_err(init_win_meta(screen, &world.wins.meta), &world, err_winmem);
+    char * err_winmem = "Trouble with init_win_meta() in main ().";
+    exit_err(init_win_meta(screen, &world.wmeta), &world, err_winmem);
     set_cleanup_flag(CLEANUP_WIN_META);
-    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);
-
+    // create_winconfs(&world);
+    init_winconfs(&world);
+    set_cleanup_flag(CLEANUP_WINCONFS);
+    init_wins(&world);
+    set_cleanup_flag(CLEANUP_WINS);
     sorted_wintoggle(&world);
+    err_winmem = "Trouble with draw_all_wins() in main().";
 
     /* Replay mode. */
     int key;
@@ -237,7 +234,7 @@ int main(int argc, char *argv[])
         }
         while (1)
         {
-            draw_all_wins(world.wins.meta);
+            draw_all_wins(world.wmeta);
             key = getch();
             if (   EOF != action
                 && key == get_action_key(world.keybindings, "wait"))
@@ -263,7 +260,7 @@ int main(int argc, char *argv[])
         while (1)
         {
             save_game(&world);
-            draw_all_wins(world.wins.meta);
+            draw_all_wins(world.wmeta);
             key = getch();
             if (0 != player.hitpoints && 0 == player_control(key, &world))
             {