[Refactor] #2628 ObjectType をItemEntity に変更した

[hengbandforosx/hengbandosx.git] / src / view / object-describer.cpp

diff --git a/src/view/object-describer.cpp b/src/view/object-describer.cpp
index e8f2577..c6dc9fe 100644 (file)
--- a/src/view/object-describer.cpp
+++ b/src/view/object-describer.cpp
@@ -22,10 +22,12 @@
 void inven_item_charges(PlayerType *player_ptr, INVENTORY_IDX item)
 {
     auto *o_ptr = &player_ptr->inventory_list[item];
-    if ((o_ptr->tval != ItemKindType::STAFF) && (o_ptr->tval != ItemKindType::WAND))
+    if ((o_ptr->tval != ItemKindType::STAFF) && (o_ptr->tval != ItemKindType::WAND)) {
         return;
-    if (!o_ptr->is_known())
+    }
+    if (!o_ptr->is_known()) {
         return;
+    }
 
 #ifdef JP
     if (o_ptr->pval <= 0) {
@@ -76,17 +78,18 @@ void inven_item_describe(PlayerType *player_ptr, INVENTORY_IDX item)
  */
 void display_koff(PlayerType *player_ptr, KIND_OBJECT_IDX k_idx)
 {
-    ObjectType forge;
-    ObjectType *q_ptr;
+    ItemEntity forge;
+    ItemEntity *q_ptr;
     int sval;
     int16_t use_realm;
     GAME_TEXT o_name[MAX_NLEN];
-    for (int y = 0; y < Term->hgt; y++) {
+    for (int y = 0; y < game_term->hgt; y++) {
         term_erase(0, y, 255);
     }
 
-    if (!k_idx)
+    if (!k_idx) {
         return;
+    }
     q_ptr = &forge;
 
     q_ptr->prep(k_idx);
@@ -97,16 +100,20 @@ void display_koff(PlayerType *player_ptr, KIND_OBJECT_IDX k_idx)
     use_realm = tval2realm(q_ptr->tval);
 
     if (player_ptr->realm1 || player_ptr->realm2) {
-        if ((use_realm != player_ptr->realm1) && (use_realm != player_ptr->realm2))
+        if ((use_realm != player_ptr->realm1) && (use_realm != player_ptr->realm2)) {
             return;
+        }
     } else {
         PlayerClass pc(player_ptr);
-        if (!pc.is_every_magic())
+        if (!pc.is_every_magic()) {
             return;
-        if (!is_magic(use_realm))
+        }
+        if (!is_magic(use_realm)) {
             return;
-        if (pc.equals(PlayerClassType::RED_MAGE) && (use_realm != REALM_ARCANE) && (sval > 1))
+        }
+        if (pc.equals(PlayerClassType::RED_MAGE) && (use_realm != REALM_ARCANE) && (sval > 1)) {
             return;
+        }
     }
 
     int num = 0;