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 f6c6a70..07bbe6f 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -3,6 +3,7 @@
 #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"
@@ -11,8 +12,9 @@
 #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 "floor/floor.h"
 #include "game-option/map-screen-options.h"
 #include "game-option/play-record-options.h"
 #include "io/cursor.h"
@@ -91,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);
@@ -168,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;
@@ -178,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;
@@ -187,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;