[Refactor] #40477 Separated game-play-options.c/h

[hengband/hengband.git] / src / floor / floor-generate.c

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 46bbe51..ce42424 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -10,34 +10,40 @@
  * 2014 Deskull rearranged comment for Doxygen. \n
  */
 
-#include "system/angband.h"
-#include "util/util.h"
-#include "system/system-variables.h"
+#include "floor/floor-generate.h"
 #include "cmd-building/cmd-building.h"
-#include "io/write-diary.h"
 #include "cmd-io/cmd-dump.h"
-#include "grid/grid.h"
-#include "market/arena-info-table.h"
-#include "room/rooms.h"
 #include "dungeon/dungeon.h"
-#include "floor/floor.h"
-#include "floor/floor-save.h"
-#include "floor/floor-streams.h"
-#include "floor/floor-generate.h"
+#include "dungeon/quest.h"
 #include "floor/floor-events.h"
 #include "floor/floor-generate.h"
+#include "floor/floor-save.h"
+#include "floor/floor-streams.h"
+#include "floor/floor.h"
+#include "floor/wild.h"
+#include "game-option/game-play-options.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "grid/trap.h"
 #include "info-reader/feature-reader.h"
-#include "monster/monster.h"
-#include "dungeon/quest.h"
-#include "player/player-status.h"
-#include "floor/wild.h"
-#include "monster/monster-status.h"
 #include "info-reader/fixed-map-parser.h"
-#include "grid/feature.h"
-#include "world/world.h"
+#include "io/write-diary.h"
+#include "market/arena-info-table.h"
+#include "monster-race/race-flags1.h"
+#include "monster/monster-flag-types.h"
+#include "monster-floor/monster-generator.h"
+#include "monster-floor/monster-remover.h"
+#include "monster-floor/monster-summon.h"
+#include "monster/monster-status.h"
+#include "monster/monster-update.h"
+#include "monster/monster-util.h"
+#include "monster/monster-info.h"
+#include "monster-floor/place-monster-types.h"
+#include "player/player-status.h"
+#include "room/rooms.h"
+#include "system/system-variables.h"
 #include "view/display-main-window.h"
+#include "world/world.h"
 
 int dun_tun_rnd; 
 int dun_tun_chg;
@@ -843,7 +849,7 @@ static bool cave_gen(player_type *player_ptr, concptr *why)
        /* Put some monsters in the dungeon */
        for (i = i + k; i > 0; i--)
        {
-               (void)alloc_monster(player_ptr, 0, PM_ALLOW_SLEEP);
+               (void)alloc_monster(player_ptr, 0, PM_ALLOW_SLEEP, summon_specific);
        }
 
        /* Place some traps in the dungeon */