[Refactor] #3286 Removed player-redraw-types.h

[hengbandforosx/hengbandosx.git] / src / io / input-key-processor.cpp

diff --git a/src/io/input-key-processor.cpp b/src/io/input-key-processor.cpp
index f9aab75..ad61eb7 100644 (file)
--- a/src/io/input-key-processor.cpp
+++ b/src/io/input-key-processor.cpp
@@ -46,11 +46,8 @@
 #include "cmd-visual/cmd-map.h"
 #include "cmd-visual/cmd-visuals.h"
 #include "core/asking-player.h"
-#include "core/player-redraw-types.h"
-#include "core/player-update-types.h"
 #include "core/special-internal-keys.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h" //!< @do_cmd_quest() がある。後で移設する.
 #include "effect/spells-effect-util.h"
 #include "floor/wild.h"
@@ -87,14 +84,18 @@
 #include "store/cmd-store.h"
 #include "store/home.h"
 #include "store/store-util.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
+#include "system/redrawing-flags-updater.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"
 #include "view/display-messages.h"
 #include "window/display-sub-windows.h"
 #include "wizard/cmd-wizard.h"
 #include "world/world.h"
+#include <optional>
+#include <string>
 
 /*!
  * @brief ウィザードモードへの導入処理
@@ -187,8 +188,9 @@ void process_command(PlayerType *player_ptr)
             msg_print(_("ウィザードモード突入。", "Wizard mode on."));
         }
 
-        player_ptr->update |= (PU_MONSTERS);
-        player_ptr->redraw |= (PR_TITLE);
+        auto &rfu = RedrawingFlagsUpdater::get_instance();
+        rfu.set_flag(StatusRedrawingFlag::MONSTER_STATUSES);
+        rfu.set_flag(MainWindowRedrawingFlag::TITLE);
         break;
     }
     case KTRL('A'): {
@@ -199,20 +201,23 @@ void process_command(PlayerType *player_ptr)
         break;
     }
     case 'w': {
-        if (!player_ptr->wild_mode)
+        if (!player_ptr->wild_mode) {
             do_cmd_wield(player_ptr);
+        }
 
         break;
     }
     case 't': {
-        if (!player_ptr->wild_mode)
+        if (!player_ptr->wild_mode) {
             do_cmd_takeoff(player_ptr);
+        }
 
         break;
     }
     case 'd': {
-        if (!player_ptr->wild_mode)
+        if (!player_ptr->wild_mode) {
             do_cmd_drop(player_ptr);
+        }
 
         break;
     }
@@ -238,14 +243,16 @@ void process_command(PlayerType *player_ptr)
         break;
     }
     case '+': {
-        if (!player_ptr->wild_mode)
+        if (!player_ptr->wild_mode) {
             do_cmd_alter(player_ptr);
+        }
 
         break;
     }
     case 'T': {
-        if (!player_ptr->wild_mode)
+        if (!player_ptr->wild_mode) {
             do_cmd_tunnel(player_ptr);
+        }
 
         break;
     }
@@ -258,8 +265,9 @@ void process_command(PlayerType *player_ptr)
         break;
     }
     case '.': {
-        if (!player_ptr->wild_mode)
+        if (!player_ptr->wild_mode) {
             do_cmd_run(player_ptr);
+        }
 
         break;
     }
@@ -280,10 +288,11 @@ void process_command(PlayerType *player_ptr)
         break;
     }
     case 'S': {
-        if (player_ptr->action == ACTION_SEARCH)
+        if (player_ptr->action == ACTION_SEARCH) {
             set_action(player_ptr, ACTION_NONE);
-        else
+        } else {
             set_action(player_ptr, ACTION_SEARCH);
+        }
 
         break;
     }
@@ -301,8 +310,9 @@ void process_command(PlayerType *player_ptr)
     }
     case '<': {
         if (!player_ptr->wild_mode && !floor_ptr->dun_level && !floor_ptr->inside_arena && !inside_quest(floor_ptr->quest_number)) {
-            if (vanilla_town)
+            if (vanilla_town) {
                 break;
+            }
 
             if (player_ptr->ambush_flag) {
                 msg_print(_("襲撃から逃げるにはマップの端まで移動しなければならない。", "To flee the ambush you have to reach the edge of the map."));
@@ -315,16 +325,18 @@ void process_command(PlayerType *player_ptr)
             }
 
             change_wild_mode(player_ptr, false);
-        } else
+        } else {
             do_cmd_go_up(player_ptr);
+        }
 
         break;
     }
     case '>': {
-        if (player_ptr->wild_mode)
+        if (player_ptr->wild_mode) {
             change_wild_mode(player_ptr, false);
-        else
+        } else {
             do_cmd_go_down(player_ptr);
+        }
 
         break;
     }
@@ -350,31 +362,33 @@ void process_command(PlayerType *player_ptr)
     }
     case 'G': {
         PlayerClass pc(player_ptr);
-        if (pc.is_every_magic() || pc.equals(PlayerClassType::ELEMENTALIST))
+        if (pc.is_every_magic() || pc.equals(PlayerClassType::ELEMENTALIST)) {
             msg_print(_("呪文を学習する必要はない！", "You don't have to learn spells!"));
-        else if (pc.equals(PlayerClassType::SAMURAI))
+        } else if (pc.equals(PlayerClassType::SAMURAI)) {
             do_cmd_gain_hissatsu(player_ptr);
-        else if (pc.equals(PlayerClassType::MAGIC_EATER))
+        } else if (pc.equals(PlayerClassType::MAGIC_EATER)) {
             import_magic_device(player_ptr);
-        else
+        } else {
             do_cmd_study(player_ptr);
+        }
 
         break;
     }
     case 'b': {
         PlayerClass pc(player_ptr);
-        if (pc.can_browse())
+        if (pc.can_browse()) {
             do_cmd_mind_browse(player_ptr);
-        else if (pc.equals(PlayerClassType::ELEMENTALIST))
+        } else if (pc.equals(PlayerClassType::ELEMENTALIST)) {
             do_cmd_element_browse(player_ptr);
-        else if (pc.equals(PlayerClassType::SMITH))
+        } else if (pc.equals(PlayerClassType::SMITH)) {
             do_cmd_kaji(player_ptr, true);
-        else if (pc.equals(PlayerClassType::MAGIC_EATER))
+        } else if (pc.equals(PlayerClassType::MAGIC_EATER)) {
             do_cmd_magic_eater(player_ptr, true, false);
-        else if (pc.equals(PlayerClassType::SNIPER))
+        } else if (pc.equals(PlayerClassType::SNIPER)) {
             do_cmd_snipe_browse(player_ptr);
-        else
+        } else {
             do_cmd_browse(player_ptr);
+        }
 
         break;
     }
@@ -389,13 +403,16 @@ void process_command(PlayerType *player_ptr)
             break;
         }
 
-        if (floor_ptr->dun_level && d_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::NO_MAGIC) && !pc.equals(PlayerClassType::BERSERKER) && !pc.equals(PlayerClassType::SMITH)) {
+        const auto &dungeon = dungeons_info[player_ptr->dungeon_idx];
+        auto non_magic_class = pc.equals(PlayerClassType::BERSERKER);
+        non_magic_class |= pc.equals(PlayerClassType::SMITH);
+        if (floor_ptr->dun_level && dungeon.flags.has(DungeonFeatureType::NO_MAGIC) && !non_magic_class) {
             msg_print(_("ダンジョンが魔法を吸収した！", "The dungeon absorbs all attempted magic!"));
             msg_print(nullptr);
             break;
         }
 
-        if (player_ptr->anti_magic && !pc.equals(PlayerClassType::BERSERKER) && !pc.equals(PlayerClassType::SMITH)) {
+        if (player_ptr->anti_magic && !non_magic_class) {
             concptr which_power = _("魔法", "magic");
             switch (player_ptr->pclass) {
             case PlayerClassType::MINDCRAFTER:
@@ -417,8 +434,9 @@ void process_command(PlayerType *player_ptr)
                 which_power = _("元素魔法", "magic");
                 break;
             default:
-                if (mp_ptr->spell_book == ItemKindType::LIFE_BOOK)
+                if (mp_ptr->spell_book == ItemKindType::LIFE_BOOK) {
                     which_power = _("祈り", "prayer");
+                }
                 break;
             }
 
@@ -433,24 +451,25 @@ void process_command(PlayerType *player_ptr)
             break;
         }
 
-        if (pc.can_browse())
+        if (pc.can_browse()) {
             do_cmd_mind(player_ptr);
-        else if (pc.equals(PlayerClassType::ELEMENTALIST))
+        } else if (pc.equals(PlayerClassType::ELEMENTALIST)) {
             do_cmd_element(player_ptr);
-        else if (pc.equals(PlayerClassType::IMITATOR))
+        } else if (pc.equals(PlayerClassType::IMITATOR)) {
             do_cmd_mane(player_ptr, false);
-        else if (pc.equals(PlayerClassType::MAGIC_EATER))
+        } else if (pc.equals(PlayerClassType::MAGIC_EATER)) {
             do_cmd_magic_eater(player_ptr, false, false);
-        else if (pc.equals(PlayerClassType::SAMURAI))
+        } else if (pc.equals(PlayerClassType::SAMURAI)) {
             do_cmd_hissatsu(player_ptr);
-        else if (pc.equals(PlayerClassType::BLUE_MAGE))
+        } else if (pc.equals(PlayerClassType::BLUE_MAGE)) {
             do_cmd_cast_learned(player_ptr);
-        else if (pc.equals(PlayerClassType::SMITH))
+        } else if (pc.equals(PlayerClassType::SMITH)) {
             do_cmd_kaji(player_ptr, false);
-        else if (pc.equals(PlayerClassType::SNIPER))
+        } else if (pc.equals(PlayerClassType::SNIPER)) {
             do_cmd_snipe(player_ptr);
-        else
+        } else {
             (void)do_cmd_cast(player_ptr);
+        }
 
         break;
     }
@@ -508,10 +527,11 @@ void process_command(PlayerType *player_ptr)
         break;
     }
     case 'u': {
-        if (use_command && !rogue_like_commands)
+        if (use_command && !rogue_like_commands) {
             do_cmd_use(player_ptr);
-        else
+        } else {
             do_cmd_use_staff(player_ptr);
+        }
 
         break;
     }
@@ -654,20 +674,23 @@ void process_command(PlayerType *player_ptr)
         break;
     }
     case '`': {
-        if (!player_ptr->wild_mode)
+        if (!player_ptr->wild_mode) {
             do_cmd_travel(player_ptr);
+        }
         PlayerClass(player_ptr).break_samurai_stance({ SamuraiStanceType::MUSOU });
 
         break;
     }
     default: {
-        if (flush_failure)
+        if (flush_failure) {
             flush();
+        }
         if (one_in_(2)) {
-            char error_m[1024];
             sound(SOUND_ILLEGAL);
-            if (!get_rnd_line(_("error_j.txt", "error.txt"), 0, error_m))
-                msg_print(error_m);
+            const auto error_mes = get_random_line(_("error_j.txt", "error.txt"), 0);
+            if (error_mes.has_value()) {
+                msg_print(error_mes.value());
+            }
         } else {
             prt(_(" '?' でヘルプが表示されます。", "Type '?' for help."), 0, 0);
         }
@@ -676,6 +699,7 @@ void process_command(PlayerType *player_ptr)
     }
     }
 
-    if (!player_ptr->energy_use && !now_message)
+    if (!player_ptr->energy_use && !now_message) {
         now_message = old_now_message;
+    }
 }