Merge branch 'feature/bounty-endless-loop' into develop

[hengband/hengband.git] / src / core / game-play.c

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 03f511c..3cc8ea8 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -53,6 +53,7 @@
 #include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "market/bounty.h"
+#include "market/building-initializer.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-lite.h"
 #include "monster-floor/monster-remover.h"
@@ -233,7 +234,7 @@ static void set_wizard_mode_by_argument(player_type *player_ptr)
 static void generate_wilderness(player_type *player_ptr)
 {
     floor_type *floor_ptr = player_ptr->current_floor_ptr;
-    if ((floor_ptr->dun_level == 0) || floor_ptr->inside_quest)
+    if ((floor_ptr->dun_level == 0) && floor_ptr->inside_quest)
         return;
 
     parse_fixed_map(player_ptr, "w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x);
@@ -397,7 +398,7 @@ void play_game(player_type *player_ptr, bool new_game, bool browsing_movie)
     }
 
     restore_windows(player_ptr);
-    if (!load_savedata(player_ptr))
+    if (!load_savedata(player_ptr, &new_game))
         quit(_("セーブファイルが壊れています", "broken savefile"));
 
     extract_option_vars();