Merge pull request #233 from sikabane-works/release/3.0.0Alpha7

[hengbandforosx/hengbandosx.git] / src / dungeon / dungeon-processor.c

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index 8515b55..07bbe6f 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -1,29 +1,38 @@
 #include "dungeon/dungeon-processor.h"
+#include "cmd-building/cmd-building.h"
 #include "cmd-io/cmd-dump.h"
+#include "core/disturbance.h"
 #include "core/hp-mp-regenerator.h"
+#include "core/object-compressor.h"
 #include "core/player-processor.h"
+#include "core/player-redraw-types.h"
+#include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "core/turn-compensator.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/floor-leaver.h"
+#include "floor/floor-save-util.h"
 #include "floor/floor-save.h"
 #include "game-option/map-screen-options.h"
 #include "game-option/play-record-options.h"
+#include "io/cursor.h"
 #include "io/input-key-requester.h"
-#include "io/targeting.h"
 #include "io/write-diary.h"
 #include "market/arena.h"
+#include "mind/mind-ninja.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-compaction.h"
 #include "monster/monster-processor.h"
 #include "monster/monster-status.h"
 #include "monster/monster-util.h"
-#include "player/player-effects.h"
-#include "player/player-move.h"
+#include "player/special-defense-types.h"
 #include "realm/realm-song-numbers.h"
 #include "realm/realm-song.h"
-#include "view/display-main-window.h"
+#include "system/floor-type-definition.h"
+#include "target/target-checker.h"
 #include "view/display-messages.h"
 #include "world/world-turn-processor.h"
 #include "world/world.h"
@@ -84,7 +93,7 @@ void process_dungeon(player_type *player_ptr, bool load_game)
     msg_erase();
 
     current_world_ptr->character_xtra = TRUE;
-    player_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_MONSTER | PW_OVERHEAD | PW_DUNGEON);
+    player_ptr->window_flags |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_MONSTER | PW_OVERHEAD | PW_DUNGEON);
     player_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_EQUIPPY | PR_MAP);
     player_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS | PU_VIEW | PU_LITE | PU_MON_LITE | PU_TORCH | PU_MONSTERS | PU_DISTANCE | PU_FLOW);
     handle_stuff(player_ptr);
@@ -93,7 +102,7 @@ void process_dungeon(player_type *player_ptr, bool load_game)
     player_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
     player_ptr->update |= (PU_COMBINE | PU_REORDER);
     handle_stuff(player_ptr);
-    Term_fresh();
+    term_fresh();
 
     if (quest_num
         && (is_fixed_quest_idx(quest_num) && !((quest_num == QUEST_OBERON) || (quest_num == QUEST_SERPENT) || !(quest[quest_num].flags & QUEST_FLAG_PRESET))))
@@ -161,7 +170,7 @@ void process_dungeon(player_type *player_ptr, bool load_game)
 
         move_cursor_relative(player_ptr->y, player_ptr->x);
         if (fresh_after)
-            Term_fresh();
+            term_fresh_force();
 
         if (!player_ptr->playing || player_ptr->is_dead)
             break;
@@ -171,7 +180,7 @@ void process_dungeon(player_type *player_ptr, bool load_game)
 
         move_cursor_relative(player_ptr->y, player_ptr->x);
         if (fresh_after)
-            Term_fresh();
+            term_fresh_force();
 
         if (!player_ptr->playing || player_ptr->is_dead)
             break;
@@ -180,8 +189,9 @@ void process_dungeon(player_type *player_ptr, bool load_game)
         handle_stuff(player_ptr);
 
         move_cursor_relative(player_ptr->y, player_ptr->x);
-        if (fresh_after)
-            Term_fresh();
+        if (fresh_after) {
+            term_fresh_force();
+        }
 
         if (!player_ptr->playing || player_ptr->is_dead)
             break;