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 786e72e51f173349e90740e027515d1067430bf4..0041b1ea396d1af7c3a5fb1535ce586e60df6268 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -133,7 +133,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,11 +202,9 @@ 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;
+    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);
     world.wins.info = init_win_from_file(&world, "Info", draw_info_win);
@@ -216,8 +213,8 @@ int main(int argc, char *argv[])
     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);
+    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))
             {