[Refactor] #40483 Separated window-redrawer.c/h from display-main-window.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 81f9f73..2f89645 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -173,6 +173,7 @@
     <ClCompile Include="..\..\src\cmd-io\macro-util.c" />\r
     <ClCompile Include="..\..\src\core\asking-player.c" />\r
     <ClCompile Include="..\..\src\core\visuals-reseter.c" />\r
+    <ClCompile Include="..\..\src\core\window-redrawer.c" />\r
     <ClCompile Include="..\..\src\floor\fixed-map-generator.c" />\r
     <ClCompile Include="..\..\src\game-option\auto-destruction-options.c" />\r
     <ClCompile Include="..\..\src\game-option\birth-options.c" />\r
@@ -560,6 +561,7 @@
     <ClInclude Include="..\..\src\cmd-io\macro-util.h" />\r
     <ClInclude Include="..\..\src\core\asking-player.h" />\r
     <ClInclude Include="..\..\src\core\visuals-reseter.h" />\r
+    <ClInclude Include="..\..\src\core\window-redrawer.h" />\r
     <ClInclude Include="..\..\src\floor\fixed-map-generator.h" />\r
     <ClInclude Include="..\..\src\game-option\auto-destruction-options.h" />\r
     <ClInclude Include="..\..\src\game-option\birth-options.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 833b12e..93e1cf2 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1418,6 +1418,9 @@
     <ClCompile Include="..\..\src\view\display-sub-windows.c">
       <Filter>view</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\core\window-redrawer.c">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -3124,6 +3127,9 @@
     <ClInclude Include="..\..\src\view\display-sub-windows.h">
       <Filter>view</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\core\window-redrawer.h">
+      <Filter>core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 5949885..b2e35e6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,6 +118,7 @@ hengband_SOURCES = \
        core/stuff-handler.c core/stuff-handler.h \
        core/turn-compensator.c core/turn-compensator.h \
        core/visuals-reseter.c core/visuals-reseter.h \
+       core/window-redrawer.c core/window-redrawer.h \
        \
        dungeon/dungeon.c dungeon/dungeon.h \
        dungeon/dungeon-processor.c dungeon/dungeon-processor.h \

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 7641259..a75f27f 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -23,6 +23,7 @@
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"
 #include "core/visuals-reseter.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon-processor.h"
 #include "floor/floor-events.h"
 #include "floor/floor-save.h"

diff --git a/src/core/output-updater.c b/src/core/output-updater.c
index ab577b7..363c7c0 100644 (file)
--- a/src/core/output-updater.c
+++ b/src/core/output-updater.c
@@ -4,9 +4,8 @@
  * @author Hourier
  */
 
-#include "system/angband.h"
 #include "core/output-updater.h"
-#include "view/display-main-window.h"
+#include "core/window-redrawer.h"
 
 void update_output(player_type* player_ptr)
 {

diff --git a/src/core/output-updater.h b/src/core/output-updater.h
index ce26e49..925630b 100644 (file)
--- a/src/core/output-updater.h
+++ b/src/core/output-updater.h
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "system/angband.h"
+
 void update_output(player_type* player_ptr);

diff --git a/src/core/stuff-handler.c b/src/core/stuff-handler.c
index 045dedc..523af3a 100644 (file)
--- a/src/core/stuff-handler.c
+++ b/src/core/stuff-handler.c
@@ -1,6 +1,5 @@
-#include "system/angband.h"
-#include "core/stuff-handler.h"
-#include "view/display-main-window.h"
+#include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 
 /*!
  * @brief 全更新処理をチェックして処理していく

diff --git a/src/core/stuff-handler.h b/src/core/stuff-handler.h
index 00c4c5c..af59169 100644 (file)
--- a/src/core/stuff-handler.h
+++ b/src/core/stuff-handler.h
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "system/angband.h"
+
 void handle_stuff(player_type* player_ptr);

diff --git a/src/core/window-redrawer.c b/src/core/window-redrawer.c
new file mode 100644 (file)
index 0000000..b2b856f
--- /dev/null
+++ b/src/core/window-redrawer.c
@@ -0,0 +1,270 @@
+/*!
+ * @brief ウィンドウの再描画処理
+ * @date 2020/06/27
+ * @author Hourier
+ */
+#include "core/window-redrawer.h"
+#include "game-option/option-flags.h"
+#include "player/player-race.h"
+#include "term/gameterm.h"
+#include "term/screen-processor.h"
+#include "term/term-color-types.h"
+#include "view/display-main-window.h"
+#include "view/display-messages.h"
+#include "view/display-player.h"
+#include "view/display-sub-windows.h"
+#include "view/main-window-left-frame.h"
+#include "view/main-window-row-column.h"
+#include "view/main-window-stat-poster.h"
+#include "view/main-window-util.h"
+#include "world/world.h"
+
+/*!
+ * @brief 現在のマップ名を描画する / Print dungeon
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ */
+static void print_dungeon(player_type *creature_ptr)
+{
+    c_put_str(TERM_WHITE, "             ", ROW_DUNGEON, COL_DUNGEON);
+    concptr dungeon_name = map_name(creature_ptr);
+    TERM_LEN col = COL_DUNGEON + 6 - strlen(dungeon_name) / 2;
+    if (col < 0)
+        col = 0;
+
+    c_put_str(TERM_L_UMBER, format("%s", dungeon_name), ROW_DUNGEON, col);
+}
+
+/*!
+ * @brief redraw のフラグに応じた更新をまとめて行う / Handle "redraw"
+ * @return なし
+ * @details 更新処理の対象はゲーム中の全描画処理
+ */
+void redraw_stuff(player_type *creature_ptr)
+{
+    if (!creature_ptr->redraw)
+        return;
+
+    if (!current_world_ptr->character_generated)
+        return;
+
+    if (current_world_ptr->character_icky)
+        return;
+
+    if (creature_ptr->redraw & (PR_WIPE)) {
+        creature_ptr->redraw &= ~(PR_WIPE);
+        msg_print(NULL);
+        Term_clear();
+    }
+
+    if (creature_ptr->redraw & (PR_MAP)) {
+        creature_ptr->redraw &= ~(PR_MAP);
+        print_map(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_BASIC)) {
+        creature_ptr->redraw &= ~(PR_BASIC);
+        creature_ptr->redraw &= ~(PR_MISC | PR_TITLE | PR_STATS);
+        creature_ptr->redraw &= ~(PR_LEV | PR_EXP | PR_GOLD);
+        creature_ptr->redraw &= ~(PR_ARMOR | PR_HP | PR_MANA);
+        creature_ptr->redraw &= ~(PR_DEPTH | PR_HEALTH | PR_UHEALTH);
+        print_frame_basic(creature_ptr);
+        print_time(creature_ptr);
+        print_dungeon(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_EQUIPPY)) {
+        creature_ptr->redraw &= ~(PR_EQUIPPY);
+        display_player_equippy(creature_ptr, ROW_EQUIPPY, COL_EQUIPPY, 0);
+    }
+
+    if (creature_ptr->redraw & (PR_MISC)) {
+        creature_ptr->redraw &= ~(PR_MISC);
+        print_field(rp_ptr->title, ROW_RACE, COL_RACE);
+    }
+
+    if (creature_ptr->redraw & (PR_TITLE)) {
+        creature_ptr->redraw &= ~(PR_TITLE);
+        print_title(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_LEV)) {
+        creature_ptr->redraw &= ~(PR_LEV);
+        print_level(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_EXP)) {
+        creature_ptr->redraw &= ~(PR_EXP);
+        print_exp(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_STATS)) {
+        creature_ptr->redraw &= ~(PR_STATS);
+        print_stat(creature_ptr, A_STR);
+        print_stat(creature_ptr, A_INT);
+        print_stat(creature_ptr, A_WIS);
+        print_stat(creature_ptr, A_DEX);
+        print_stat(creature_ptr, A_CON);
+        print_stat(creature_ptr, A_CHR);
+    }
+
+    if (creature_ptr->redraw & (PR_STATUS)) {
+        creature_ptr->redraw &= ~(PR_STATUS);
+        print_status(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_ARMOR)) {
+        creature_ptr->redraw &= ~(PR_ARMOR);
+        print_ac(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_HP)) {
+        creature_ptr->redraw &= ~(PR_HP);
+        print_hp(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_MANA)) {
+        creature_ptr->redraw &= ~(PR_MANA);
+        print_sp(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_GOLD)) {
+        creature_ptr->redraw &= ~(PR_GOLD);
+        print_gold(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_DEPTH)) {
+        creature_ptr->redraw &= ~(PR_DEPTH);
+        print_depth(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_HEALTH)) {
+        creature_ptr->redraw &= ~(PR_HEALTH);
+        health_redraw(creature_ptr, FALSE);
+    }
+
+    if (creature_ptr->redraw & (PR_UHEALTH)) {
+        creature_ptr->redraw &= ~(PR_UHEALTH);
+        health_redraw(creature_ptr, TRUE);
+    }
+
+    if (creature_ptr->redraw & (PR_EXTRA)) {
+        creature_ptr->redraw &= ~(PR_EXTRA);
+        creature_ptr->redraw &= ~(PR_CUT | PR_STUN);
+        creature_ptr->redraw &= ~(PR_HUNGER);
+        creature_ptr->redraw &= ~(PR_STATE | PR_SPEED | PR_STUDY | PR_IMITATION | PR_STATUS);
+        print_frame_extra(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_CUT)) {
+        creature_ptr->redraw &= ~(PR_CUT);
+        print_cut(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_STUN)) {
+        creature_ptr->redraw &= ~(PR_STUN);
+        print_stun(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_HUNGER)) {
+        creature_ptr->redraw &= ~(PR_HUNGER);
+        print_hunger(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_STATE)) {
+        creature_ptr->redraw &= ~(PR_STATE);
+        print_state(creature_ptr);
+    }
+
+    if (creature_ptr->redraw & (PR_SPEED)) {
+        creature_ptr->redraw &= ~(PR_SPEED);
+        print_speed(creature_ptr);
+    }
+
+    if (creature_ptr->pclass == CLASS_IMITATOR) {
+        if (creature_ptr->redraw & (PR_IMITATION)) {
+            creature_ptr->redraw &= ~(PR_IMITATION);
+            print_imitation(creature_ptr);
+        }
+
+        return;
+    }
+
+    if (creature_ptr->redraw & (PR_STUDY)) {
+        creature_ptr->redraw &= ~(PR_STUDY);
+        print_study(creature_ptr);
+    }
+}
+
+/*!
+ * @brief player_ptr->window のフラグに応じた更新をまとめて行う / Handle "player_ptr->window"
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ * @details 更新処理の対象はサブウィンドウ全般
+ */
+void window_stuff(player_type *player_ptr)
+{
+    if (!player_ptr->window)
+        return;
+
+    BIT_FLAGS mask = 0L;
+    for (int j = 0; j < 8; j++) {
+        if (angband_term[j])
+            mask |= window_flag[j];
+    }
+
+    player_ptr->window &= mask;
+
+    if (!player_ptr->window)
+        return;
+
+    if (player_ptr->window & (PW_INVEN)) {
+        player_ptr->window &= ~(PW_INVEN);
+        fix_inventory(player_ptr, 0); // TODO:2.2.2 まともなtval参照手段を確保
+    }
+
+    if (player_ptr->window & (PW_EQUIP)) {
+        player_ptr->window &= ~(PW_EQUIP);
+        fix_equip(player_ptr, 0); // TODO:2.2.2 まともなtval参照手段を確保
+    }
+
+    if (player_ptr->window & (PW_SPELL)) {
+        player_ptr->window &= ~(PW_SPELL);
+        fix_spell(player_ptr);
+    }
+
+    if (player_ptr->window & (PW_PLAYER)) {
+        player_ptr->window &= ~(PW_PLAYER);
+        fix_player(player_ptr);
+    }
+
+    if (player_ptr->window & (PW_MONSTER_LIST)) {
+        player_ptr->window &= ~(PW_MONSTER_LIST);
+        fix_monster_list(player_ptr);
+    }
+
+    if (player_ptr->window & (PW_MESSAGE)) {
+        player_ptr->window &= ~(PW_MESSAGE);
+        fix_message();
+    }
+
+    if (player_ptr->window & (PW_OVERHEAD)) {
+        player_ptr->window &= ~(PW_OVERHEAD);
+        fix_overhead(player_ptr);
+    }
+
+    if (player_ptr->window & (PW_DUNGEON)) {
+        player_ptr->window &= ~(PW_DUNGEON);
+        fix_dungeon(player_ptr);
+    }
+
+    if (player_ptr->window & (PW_MONSTER)) {
+        player_ptr->window &= ~(PW_MONSTER);
+        fix_monster(player_ptr);
+    }
+
+    if (player_ptr->window & (PW_OBJECT)) {
+        player_ptr->window &= ~(PW_OBJECT);
+        fix_object(player_ptr);
+    }
+}

diff --git a/src/core/window-redrawer.h b/src/core/window-redrawer.h
new file mode 100644 (file)
index 0000000..7c35014
--- /dev/null
+++ b/src/core/window-redrawer.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "system/angband.h"
+
+void redraw_window(void);
+void window_stuff(player_type *player_ptr);
+void redraw_stuff(player_type *creature_ptr);

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index fb39dfe..c637554 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -21,7 +21,6 @@
 #include "floor/floor-town.h"
 #include "floor/floor.h"
 #include "game-option/map-screen-options.h"
-#include "game-option/option-flags.h"
 #include "game-option/special-options.h"
 #include "grid/grid.h"
 #include "io/input-key-acceptor.h"
@@ -34,16 +33,10 @@
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "player/mimic-info-table.h"
-#include "term/gameterm.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
-#include "view/display-messages.h"
-#include "view/display-player.h"
-#include "view/display-sub-windows.h" // todo 相互依存している、後で何とかする.
-#include "view/main-window-left-frame.h"
 #include "view/main-window-row-column.h"
-#include "view/main-window-stat-poster.h"
 #include "view/main-window-util.h" // 相互依存している。後で何とかする.
 #include "world/world.h"
 
@@ -95,256 +88,6 @@ concptr map_name(player_type *creature_ptr)
 }
 
 /*!
- * @brief 現在のマップ名を描画する / Print dungeon
- * @param creature_ptr プレーヤーへの参照ポインタ
- * @return なし
- */
-static void print_dungeon(player_type *creature_ptr)
-{
-    c_put_str(TERM_WHITE, "             ", ROW_DUNGEON, COL_DUNGEON);
-    concptr dungeon_name = map_name(creature_ptr);
-    TERM_LEN col = COL_DUNGEON + 6 - strlen(dungeon_name) / 2;
-    if (col < 0)
-        col = 0;
-
-    c_put_str(TERM_L_UMBER, format("%s", dungeon_name), ROW_DUNGEON, col);
-}
-
-/*!
- * @brief redraw のフラグに応じた更新をまとめて行う / Handle "redraw"
- * @return なし
- * @details 更新処理の対象はゲーム中の全描画処理
- */
-void redraw_stuff(player_type *creature_ptr)
-{
-    if (!creature_ptr->redraw)
-        return;
-
-    if (!current_world_ptr->character_generated)
-        return;
-
-    if (current_world_ptr->character_icky)
-        return;
-
-    if (creature_ptr->redraw & (PR_WIPE)) {
-        creature_ptr->redraw &= ~(PR_WIPE);
-        msg_print(NULL);
-        Term_clear();
-    }
-
-    if (creature_ptr->redraw & (PR_MAP)) {
-        creature_ptr->redraw &= ~(PR_MAP);
-        print_map(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_BASIC)) {
-        creature_ptr->redraw &= ~(PR_BASIC);
-        creature_ptr->redraw &= ~(PR_MISC | PR_TITLE | PR_STATS);
-        creature_ptr->redraw &= ~(PR_LEV | PR_EXP | PR_GOLD);
-        creature_ptr->redraw &= ~(PR_ARMOR | PR_HP | PR_MANA);
-        creature_ptr->redraw &= ~(PR_DEPTH | PR_HEALTH | PR_UHEALTH);
-        print_frame_basic(creature_ptr);
-        print_time(creature_ptr);
-        print_dungeon(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_EQUIPPY)) {
-        creature_ptr->redraw &= ~(PR_EQUIPPY);
-        display_player_equippy(creature_ptr, ROW_EQUIPPY, COL_EQUIPPY, 0);
-    }
-
-    if (creature_ptr->redraw & (PR_MISC)) {
-        creature_ptr->redraw &= ~(PR_MISC);
-        print_field(rp_ptr->title, ROW_RACE, COL_RACE);
-    }
-
-    if (creature_ptr->redraw & (PR_TITLE)) {
-        creature_ptr->redraw &= ~(PR_TITLE);
-        print_title(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_LEV)) {
-        creature_ptr->redraw &= ~(PR_LEV);
-        print_level(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_EXP)) {
-        creature_ptr->redraw &= ~(PR_EXP);
-        print_exp(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_STATS)) {
-        creature_ptr->redraw &= ~(PR_STATS);
-        print_stat(creature_ptr, A_STR);
-        print_stat(creature_ptr, A_INT);
-        print_stat(creature_ptr, A_WIS);
-        print_stat(creature_ptr, A_DEX);
-        print_stat(creature_ptr, A_CON);
-        print_stat(creature_ptr, A_CHR);
-    }
-
-    if (creature_ptr->redraw & (PR_STATUS)) {
-        creature_ptr->redraw &= ~(PR_STATUS);
-        print_status(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_ARMOR)) {
-        creature_ptr->redraw &= ~(PR_ARMOR);
-        print_ac(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_HP)) {
-        creature_ptr->redraw &= ~(PR_HP);
-        print_hp(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_MANA)) {
-        creature_ptr->redraw &= ~(PR_MANA);
-        print_sp(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_GOLD)) {
-        creature_ptr->redraw &= ~(PR_GOLD);
-        print_gold(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_DEPTH)) {
-        creature_ptr->redraw &= ~(PR_DEPTH);
-        print_depth(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_HEALTH)) {
-        creature_ptr->redraw &= ~(PR_HEALTH);
-        health_redraw(creature_ptr, FALSE);
-    }
-
-    if (creature_ptr->redraw & (PR_UHEALTH)) {
-        creature_ptr->redraw &= ~(PR_UHEALTH);
-        health_redraw(creature_ptr, TRUE);
-    }
-
-    if (creature_ptr->redraw & (PR_EXTRA)) {
-        creature_ptr->redraw &= ~(PR_EXTRA);
-        creature_ptr->redraw &= ~(PR_CUT | PR_STUN);
-        creature_ptr->redraw &= ~(PR_HUNGER);
-        creature_ptr->redraw &= ~(PR_STATE | PR_SPEED | PR_STUDY | PR_IMITATION | PR_STATUS);
-        print_frame_extra(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_CUT)) {
-        creature_ptr->redraw &= ~(PR_CUT);
-        print_cut(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_STUN)) {
-        creature_ptr->redraw &= ~(PR_STUN);
-        print_stun(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_HUNGER)) {
-        creature_ptr->redraw &= ~(PR_HUNGER);
-        print_hunger(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_STATE)) {
-        creature_ptr->redraw &= ~(PR_STATE);
-        print_state(creature_ptr);
-    }
-
-    if (creature_ptr->redraw & (PR_SPEED)) {
-        creature_ptr->redraw &= ~(PR_SPEED);
-        print_speed(creature_ptr);
-    }
-
-    if (creature_ptr->pclass == CLASS_IMITATOR) {
-        if (creature_ptr->redraw & (PR_IMITATION)) {
-            creature_ptr->redraw &= ~(PR_IMITATION);
-            print_imitation(creature_ptr);
-        }
-
-        return;
-    }
-
-    if (creature_ptr->redraw & (PR_STUDY)) {
-        creature_ptr->redraw &= ~(PR_STUDY);
-        print_study(creature_ptr);
-    }
-}
-
-/*!
- * @brief player_ptr->window のフラグに応じた更新をまとめて行う / Handle "player_ptr->window"
- * @param player_ptr プレーヤーへの参照ポインタ
- * @return なし
- * @details 更新処理の対象はサブウィンドウ全般
- */
-void window_stuff(player_type *player_ptr)
-{
-    if (!player_ptr->window)
-        return;
-
-    BIT_FLAGS mask = 0L;
-    for (int j = 0; j < 8; j++) {
-        if (angband_term[j])
-            mask |= window_flag[j];
-    }
-
-    player_ptr->window &= mask;
-
-    if (!player_ptr->window)
-        return;
-
-    if (player_ptr->window & (PW_INVEN)) {
-        player_ptr->window &= ~(PW_INVEN);
-        fix_inventory(player_ptr, 0); // TODO:2.2.2 まともなtval参照手段を確保
-    }
-
-    if (player_ptr->window & (PW_EQUIP)) {
-        player_ptr->window &= ~(PW_EQUIP);
-        fix_equip(player_ptr, 0); // TODO:2.2.2 まともなtval参照手段を確保
-    }
-
-    if (player_ptr->window & (PW_SPELL)) {
-        player_ptr->window &= ~(PW_SPELL);
-        fix_spell(player_ptr);
-    }
-
-    if (player_ptr->window & (PW_PLAYER)) {
-        player_ptr->window &= ~(PW_PLAYER);
-        fix_player(player_ptr);
-    }
-
-    if (player_ptr->window & (PW_MONSTER_LIST)) {
-        player_ptr->window &= ~(PW_MONSTER_LIST);
-        fix_monster_list(player_ptr);
-    }
-
-    if (player_ptr->window & (PW_MESSAGE)) {
-        player_ptr->window &= ~(PW_MESSAGE);
-        fix_message();
-    }
-
-    if (player_ptr->window & (PW_OVERHEAD)) {
-        player_ptr->window &= ~(PW_OVERHEAD);
-        fix_overhead(player_ptr);
-    }
-
-    if (player_ptr->window & (PW_DUNGEON)) {
-        player_ptr->window &= ~(PW_DUNGEON);
-        fix_dungeon(player_ptr);
-    }
-
-    if (player_ptr->window & (PW_MONSTER)) {
-        player_ptr->window &= ~(PW_MONSTER);
-        fix_monster(player_ptr);
-    }
-
-    if (player_ptr->window & (PW_OBJECT)) {
-        player_ptr->window &= ~(PW_OBJECT);
-        fix_object(player_ptr);
-    }
-}
-
-/*!
  * todo ここにplayer_type を追加するとz-termに影響が行くので保留
  * @brief コンソールのリサイズに合わせてマップを再描画する /
  * Map resizing whenever the main term changes size

diff --git a/src/view/display-main-window.h b/src/view/display-main-window.h
index 1fe1db1..f4d324e 100644 (file)
--- a/src/view/display-main-window.h
+++ b/src/view/display-main-window.h
@@ -17,18 +17,11 @@ extern void print_path(player_type *player_ptr, POSITION y, POSITION x);
 extern void monster_race_track(player_type *player_ptr, MONRACE_IDX r_idx);
 extern void object_kind_track(player_type *player_ptr, KIND_OBJECT_IDX k_idx);
 extern void resize_map(void);
-extern void redraw_window(void);
 extern bool change_panel(player_type *player_ptr, POSITION dy, POSITION dx);
 
-extern void window_stuff(player_type *player_ptr);
 extern void update_playtime(void);
 
 /*
- * Bit flags for the "redraw" variable
- */
-extern void redraw_stuff(player_type *creature_ptr);
-
-/*
  * Determines if a map location is currently "on screen" -RAK-
  * Note that "panel_contains(Y,X)" always implies "in_bounds2(Y,X)".
  */