Fixed bug that reset turn number to 1 on each savefile load.

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index 566a660ea29afb8de4bd22c8fccc7e22dfa71bc5..0041b1ea396d1af7c3a5fb1535ce586e60df6268 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -33,6 +33,7 @@
 int main(int argc, char *argv[])
 {
     struct World world;
+    world.turn = 0;        /* Turns to 1 when map and objects are initalized. */
 
     init_command_db(&world);
     set_cleanup_flag(CLEANUP_COMMAND_DB);
@@ -96,13 +97,14 @@ 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, "config/defs");
+    set_cleanup_flag(CLEANUP_MAP_OBJECT_DEFS);
 
     /* For interactive mode, try to load world state from savefile. */
     char * err_o = "Trouble loading game (fopen() in main()) / "
@@ -127,6 +129,7 @@ int main(int argc, char *argv[])
         {
             exit_err(1, &world, err_r);
         }
+        set_cleanup_flag(CLEANUP_MAP_OBJECTS);
         exit_err(fclose(file), &world, err_c);
         player.pos.y--;
         player.pos.x--;
@@ -139,7 +142,6 @@ int main(int argc, char *argv[])
                 "opening file 'record' for reading.";
         err_r = "Trouble loading record file (read_uint32_bigendian() in "
                 "main()) / reading from opened file 'record'.";
-        world.turn = 1;
         if (0 == world.interactive)
         {
             file = fopen(recordfile, "r");
@@ -171,7 +173,6 @@ int main(int argc, char *argv[])
         }
     }
 
-
     /* Generate map from seed and, if newly generated world, start positions of
      * actors.
      */
@@ -179,7 +180,7 @@ int main(int argc, char *argv[])
     struct Map map = init_map();
     world.map = ↦
     set_cleanup_flag(CLEANUP_MAP);
-    if (1 == world.turn)
+    if (0 == world.turn)
     {
         player.pos = find_passable_pos(world.map);
         void * foo;
@@ -188,6 +189,8 @@ int main(int argc, char *argv[])
         build_map_objects(&world, foo, 3, 1 + rrand() % 3);
         foo = build_map_objects(&world, &world.item, 4, 1 + rrand() % 3);
         build_map_objects(&world, foo, 5, 1 + rrand() % 3);
+        set_cleanup_flag(CLEANUP_MAP_OBJECTS);
+        world.turn = 1;
     }
 
     /* Initialize window system and windows. */
@@ -199,25 +202,19 @@ int main(int argc, char *argv[])
     raw();
     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 "
-                        "main().";
-    exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
-    world.wins.meta = &win_meta;
-    struct Win win_keys = init_win_from_file(&world, "Keys", draw_keys_win);
-    world.wins.keys = &win_keys;
+    char * err_winmem = "Trouble with init_win_meta() in main ().";
+    exit_err(init_win_meta(screen, &world.wins.meta), &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);
-    struct Win win_info = init_win_from_file(&world, "Info", draw_info_win);
-    world.wins.info = &win_info;
+    world.wins.info = init_win_from_file(&world, "Info", draw_info_win);
     set_cleanup_flag(CLEANUP_WIN_INFO);
-    struct Win win_log  = init_win_from_file(&world, "Log",  draw_log_win);
-    world.wins.log  = &win_log;
+    world.wins.log = init_win_from_file(&world, "Log", draw_log_win);
     set_cleanup_flag(CLEANUP_WIN_LOG);
-    struct Win win_map  = init_win_from_file(&world, "Map",  draw_map_win);
-    world.wins.map  = &win_map;
+    world.wins.map = init_win_from_file(&world, "Map", draw_map_win);
     set_cleanup_flag(CLEANUP_WIN_MAP);
-
     sorted_wintoggle(&world);
+    err_winmem = "Trouble with draw_all_wins() in main().";
 
     /* Replay mode. */
     int key;
@@ -238,7 +235,7 @@ int main(int argc, char *argv[])
         }
         while (1)
         {
-            draw_all_wins(&win_meta);
+            draw_all_wins(world.wins.meta);
             key = getch();
             if (   EOF != action
                 && key == get_action_key(world.keybindings, "wait"))
@@ -264,7 +261,7 @@ int main(int argc, char *argv[])
         while (1)
         {
             save_game(&world);
-            draw_all_wins(&win_meta);
+            draw_all_wins(world.wins.meta);
             key = getch();
             if (0 != player.hitpoints && 0 == player_control(key, &world))
             {