[Refactor] #1366 Removed type alias 'REALM_IDX'

diff --git a/src/avatar/avatar.cpp b/src/avatar/avatar.cpp
index 7930be3..57309f8 100644 (file)
--- a/src/avatar/avatar.cpp
+++ b/src/avatar/avatar.cpp
@@ -153,7 +153,7 @@ static void get_random_virtue(player_type *creature_ptr, int which)
  * @param realm 魔法領域のID
  * @return 対応する徳のID
  */
-static enum virtue_idx get_realm_virtues(player_type *creature_ptr, REALM_IDX realm)
+static enum virtue_idx get_realm_virtues(player_type *creature_ptr, int16_t realm)
 {
     switch (realm) {
     case REALM_LIFE:

diff --git a/src/birth/quick-start.h b/src/birth/quick-start.h
index 2db6f87..a02c45f 100644 (file)
--- a/src/birth/quick-start.h
+++ b/src/birth/quick-start.h
@@ -15,8 +15,8 @@ struct birther {
     player_race_type prace{}; /* Race index */
     player_class_type pclass{}; /* Class index */
     player_personality_type pseikaku{}; /* Seikaku index */
-    REALM_IDX realm1{}; /* First magic realm */
-    REALM_IDX realm2{}; /* Second magic realm */
+    int16_t realm1{}; /* First magic realm */
+    int16_t realm2{}; /* Second magic realm */
 
     int16_t age{};
     int16_t ht{};

diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index c0b8f5c..651b69b 100644 (file)
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -298,7 +298,7 @@ static bool spell_okay(player_type *caster_ptr, int spell, bool learned, bool st
  * The "known" should be TRUE for cast/pray, FALSE for study
  * </pre>
  */
-static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm)
+static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, int16_t use_realm)
 {
     int i;
     SPELL_IDX spell = -1;
@@ -591,7 +591,7 @@ void do_cmd_browse(player_type *caster_ptr)
 {
     OBJECT_IDX item;
     OBJECT_SUBTYPE_VALUE sval;
-    REALM_IDX use_realm = 0;
+    int16_t use_realm = 0;
     int j, line;
     SPELL_IDX spell = -1;
     int num = 0;
@@ -707,7 +707,7 @@ void do_cmd_browse(player_type *caster_ptr)
  * @param caster_ptr プレーヤーへの参照ポインタ
  * @param next_realm 変更先の魔法領域ID
  */
-static void change_realm2(player_type *caster_ptr, REALM_IDX next_realm)
+static void change_realm2(player_type *caster_ptr, int16_t next_realm)
 {
     int i, j = 0;
     char tmp[80];
@@ -976,10 +976,10 @@ bool do_cmd_cast(player_type *caster_ptr)
     OBJECT_IDX item;
     OBJECT_SUBTYPE_VALUE sval;
     SPELL_IDX spell;
-    REALM_IDX realm;
+    int16_t realm;
     int chance;
     int increment = 0;
-    REALM_IDX use_realm;
+    int16_t use_realm;
     MANA_POINT need_mana;
 
     concptr prayer;

diff --git a/src/info-reader/general-parser.cpp b/src/info-reader/general-parser.cpp
index 2b288ed..852e2d2 100644 (file)
--- a/src/info-reader/general-parser.cpp
+++ b/src/info-reader/general-parser.cpp
@@ -251,7 +251,7 @@ parse_error_type parse_line_building(char *buf)
         int n;
         n = tokenize(s + 2, MAX_MAGIC, zz, 0);
         for (int i = 0; i < MAX_MAGIC; i++) {
-            building[index].member_realm[i + 1] = ((i < n) ? (REALM_IDX)atoi(zz[i]) : 1);
+            building[index].member_realm[i + 1] = ((i < n) ? static_cast<int16_t>(atoi(zz[i])) : 1);
         }
 
         break;

diff --git a/src/load/birth-loader.cpp b/src/load/birth-loader.cpp
index ebedddd..94de2e8 100644 (file)
--- a/src/load/birth-loader.cpp
+++ b/src/load/birth-loader.cpp
@@ -26,9 +26,9 @@ void load_quick_start(void)
     rd_byte(&tmp8u);
     previous_char.pseikaku = (player_personality_type)tmp8u;
     rd_byte(&tmp8u);
-    previous_char.realm1 = (REALM_IDX)tmp8u;
+    previous_char.realm1 = (int16_t)tmp8u;
     rd_byte(&tmp8u);
-    previous_char.realm2 = (REALM_IDX)tmp8u;
+    previous_char.realm2 = (int16_t)tmp8u;
 
     rd_s16b(&previous_char.age);
     rd_s16b(&previous_char.ht);

diff --git a/src/load/player-info-loader.cpp b/src/load/player-info-loader.cpp
index fa665f8..668bb1c 100644 (file)
--- a/src/load/player-info-loader.cpp
+++ b/src/load/player-info-loader.cpp
@@ -30,12 +30,12 @@ static void rd_realms(player_type *creature_ptr)
 
     rd_byte(&tmp8u);
     if (creature_ptr->pclass == CLASS_ELEMENTALIST)
-        creature_ptr->element = (REALM_IDX)tmp8u;
+        creature_ptr->element = (int16_t)tmp8u;
     else
-        creature_ptr->realm1 = (REALM_IDX)tmp8u;
+        creature_ptr->realm1 = (int16_t)tmp8u;
 
     rd_byte(&tmp8u);
-    creature_ptr->realm2 = (REALM_IDX)tmp8u;
+    creature_ptr->realm2 = (int16_t)tmp8u;
     if (creature_ptr->realm2 == 255)
         creature_ptr->realm2 = 0;
 }

diff --git a/src/market/building-service.cpp b/src/market/building-service.cpp
index 0d7ced9..e0fa745 100644 (file)
--- a/src/market/building-service.cpp
+++ b/src/market/building-service.cpp
@@ -24,8 +24,8 @@ bool is_owner(player_type *player_ptr, building_type *bldg)
         return true;
     }
 
-    REALM_IDX realm1 = player_ptr->realm1;
-    REALM_IDX realm2 = player_ptr->realm2;
+    int16_t realm1 = player_ptr->realm1;
+    int16_t realm2 = player_ptr->realm2;
     if ((is_magic(realm1) && (bldg->member_realm[realm1] == BUILDING_OWNER)) || (is_magic(realm2) && (bldg->member_realm[realm2] == BUILDING_OWNER))) {
         return true;
     }
@@ -53,8 +53,8 @@ bool is_member(player_type *player_ptr, building_type *bldg)
         return true;
     }
 
-    REALM_IDX realm1 = player_ptr->realm1;
-    REALM_IDX realm2 = player_ptr->realm2;
+    int16_t realm1 = player_ptr->realm1;
+    int16_t realm2 = player_ptr->realm2;
     if ((is_magic(realm1) && bldg->member_realm[realm1]) || (is_magic(realm2) && bldg->member_realm[realm2])) {
         return true;
     }

diff --git a/src/player/player-realm.cpp b/src/player/player-realm.cpp
index d81b2d1..d0fa871 100644 (file)
--- a/src/player/player-realm.cpp
+++ b/src/player/player-realm.cpp
@@ -72,9 +72,9 @@ const uint32_t realm_choices2[MAX_CLASS] = {
     (CH_NONE), /* Elementalist */
 };
 
-REALM_IDX get_realm1_book(player_type *player_ptr) { return player_ptr->realm1 + TV_LIFE_BOOK - 1; }
+int16_t get_realm1_book(player_type *player_ptr) { return player_ptr->realm1 + TV_LIFE_BOOK - 1; }
 
-REALM_IDX get_realm2_book(player_type *player_ptr) { return player_ptr->realm2 + TV_LIFE_BOOK - 1; }
+int16_t get_realm2_book(player_type *player_ptr) { return player_ptr->realm2 + TV_LIFE_BOOK - 1; }
 
 bool is_wizard_class(player_type *player_ptr)
 {

diff --git a/src/player/player-realm.h b/src/player/player-realm.h
index 397f96c..55a287f 100644 (file)
--- a/src/player/player-realm.h
+++ b/src/player/player-realm.h
@@ -25,6 +25,6 @@ extern const uint32_t realm_choices1[];
 extern const uint32_t realm_choices2[];
 
 typedef struct player_type player_type;
-REALM_IDX get_realm1_book(player_type *player_ptr);
-REALM_IDX get_realm2_book(player_type *player_ptr);
+int16_t get_realm1_book(player_type *player_ptr);
+int16_t get_realm2_book(player_type *player_ptr);
 bool is_wizard_class(player_type *player_ptr);

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 16135b3..c2e45fb 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -595,7 +595,7 @@ static void update_num_of_spells(player_type *creature_ptr)
         if (!is_spell_learned)
             continue;
 
-        REALM_IDX which;
+        int16_t which;
         if (j < 32) {
             set_bits(creature_ptr->spell_forgotten1, (1UL << j));
             which = creature_ptr->realm1;
@@ -635,7 +635,7 @@ static void update_num_of_spells(player_type *creature_ptr)
         if (!is_spell_learned)
             continue;
 
-        REALM_IDX which;
+        int16_t which;
         if (j < 32) {
             set_bits(creature_ptr->spell_forgotten1, (1UL << j));
             which = creature_ptr->realm1;
@@ -688,7 +688,7 @@ static void update_num_of_spells(player_type *creature_ptr)
         if (!is_spell_learned)
             continue;
 
-        REALM_IDX which;
+        int16_t which;
         if (j < 32) {
             reset_bits(creature_ptr->spell_forgotten1, (1UL << j));
             which = creature_ptr->realm1;

diff --git a/src/spell/spell-info.cpp b/src/spell/spell-info.cpp
index 6196307..2ab4717 100644 (file)
--- a/src/spell/spell-info.cpp
+++ b/src/spell/spell-info.cpp
@@ -30,7 +30,7 @@ static const int extra_min_magic_fail_rate = 2;
  * @param use_realm 魔法領域
  * @return 経験値
  */
-EXP experience_of_spell(player_type *caster_ptr, SPELL_IDX spell, REALM_IDX use_realm)
+EXP experience_of_spell(player_type *caster_ptr, SPELL_IDX spell, int16_t use_realm)
 {
     if (caster_ptr->pclass == CLASS_SORCERER)
         return SPELL_EXP_MASTER;
@@ -53,7 +53,7 @@ EXP experience_of_spell(player_type *caster_ptr, SPELL_IDX spell, REALM_IDX use_
  * @param realm 魔法領域
  * @return 消費MP
  */
-MANA_POINT mod_need_mana(player_type *caster_ptr, MANA_POINT need_mana, SPELL_IDX spell, REALM_IDX realm)
+MANA_POINT mod_need_mana(player_type *caster_ptr, MANA_POINT need_mana, SPELL_IDX spell, int16_t realm)
 {
 #define MANA_CONST 2400
 #define MANA_DIV 4
@@ -131,7 +131,7 @@ PERCENTAGE mod_spell_chance_2(player_type *caster_ptr, PERCENTAGE chance)
  * @param use_realm 魔法領域ID
  * @return 失敗率(%)
  */
-PERCENTAGE spell_chance(player_type *caster_ptr, SPELL_IDX spell, REALM_IDX use_realm)
+PERCENTAGE spell_chance(player_type *caster_ptr, SPELL_IDX spell, int16_t use_realm)
 {
     if (!mp_ptr->spell_book)
         return 100;
@@ -224,7 +224,7 @@ PERCENTAGE spell_chance(player_type *caster_ptr, SPELL_IDX spell, REALM_IDX use_
  * @param x 表示メッセージ左上X座標
  * @param use_realm 魔法領域ID
  */
-void print_spells(player_type *caster_ptr, SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, REALM_IDX use_realm)
+void print_spells(player_type *caster_ptr, SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, int16_t use_realm)
 {
     if (((use_realm <= REALM_NONE) || (use_realm > MAX_REALM)) && current_world_ptr->wizard)
         msg_print(_("警告！ print_spell が領域なしに呼ばれた", "Warning! print_spells called with null realm"));

diff --git a/src/spell/spell-info.h b/src/spell/spell-info.h
index a1a5ffd..6fc5faa 100644 (file)
--- a/src/spell/spell-info.h
+++ b/src/spell/spell-info.h
@@ -3,9 +3,9 @@
 #include "system/angband.h"
 
 typedef struct player_type player_type;
-EXP experience_of_spell(player_type *caster_ptr, SPELL_IDX spell, REALM_IDX use_realm);
-MANA_POINT mod_need_mana(player_type *caster_ptr, MANA_POINT need_mana, SPELL_IDX spell, REALM_IDX realm);
+EXP experience_of_spell(player_type *caster_ptr, SPELL_IDX spell, int16_t use_realm);
+MANA_POINT mod_need_mana(player_type *caster_ptr, MANA_POINT need_mana, SPELL_IDX spell, int16_t realm);
 PERCENTAGE mod_spell_chance_1(player_type *caster_ptr, PERCENTAGE chance);
 PERCENTAGE mod_spell_chance_2(player_type *caster_ptr, PERCENTAGE chance);
-PERCENTAGE spell_chance(player_type *caster_ptr, SPELL_IDX spell, REALM_IDX realm);
-void print_spells(player_type *caster_ptr, SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, REALM_IDX realm);
+PERCENTAGE spell_chance(player_type *caster_ptr, SPELL_IDX spell, int16_t realm);
+void print_spells(player_type *caster_ptr, SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, int16_t realm);

diff --git a/src/spell/spells-execution.cpp b/src/spell/spells-execution.cpp
index 98c57de..15b7c58 100644 (file)
--- a/src/spell/spells-execution.cpp
+++ b/src/spell/spells-execution.cpp
@@ -22,7 +22,7 @@
  * @param mode 求める処理
  * @return 各領域魔法に各種テキストを求めた場合は文字列参照ポインタ、そうでない場合はNULLポインタを返す。
  */
-concptr exe_spell(player_type *caster_ptr, REALM_IDX realm, SPELL_IDX spell, spell_type mode)
+concptr exe_spell(player_type *caster_ptr, int16_t realm, SPELL_IDX spell, spell_type mode)
 {
        switch (realm)
        {

diff --git a/src/spell/spells-execution.h b/src/spell/spells-execution.h
index 60ef6eb..9d6c8c7 100644 (file)
--- a/src/spell/spells-execution.h
+++ b/src/spell/spells-execution.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 typedef struct player_type player_type;
-concptr exe_spell(player_type *caster_ptr, REALM_IDX realm, SPELL_IDX spell, spell_type mode);
+concptr exe_spell(player_type *caster_ptr, int16_t realm, SPELL_IDX spell, spell_type mode);

diff --git a/src/system/building-type-definition.h b/src/system/building-type-definition.h
index 711e1fa..f664670 100644 (file)
--- a/src/system/building-type-definition.h
+++ b/src/system/building-type-definition.h
@@ -32,7 +32,7 @@ typedef struct building_type {
 
     player_class_type member_class[MAX_CLASS]; /* which classes are part of guild */
     player_race_type member_race[MAX_RACES]; /* which classes are part of guild */
-    REALM_IDX member_realm[MAX_MAGIC + 1]; /* which realms are part of guild */
+    int16_t member_realm[MAX_MAGIC + 1]; /* ギルド (店主？)ごとの魔法領域ID / which realms are part of guild */
 } building_type;
 
 extern building_type building[MAX_BLDG];

diff --git a/src/system/h-type.h b/src/system/h-type.h
index cc22dcd..e96a5f2 100644 (file)
--- a/src/system/h-type.h
+++ b/src/system/h-type.h
@@ -81,7 +81,6 @@ typedef int16_t FLOOR_IDX; /*!< ゲーム中のフロアID型を定義 */
 typedef int16_t MONRACE_IDX; /*!< @todo monster_race_typeに差し替えて消滅させる ゲーム中のモンスター種族ID型を定義 */
 typedef int16_t MONSTER_IDX; /*!< @todo monster_race_typeに差し替えて消滅させる ゲーム中のモンスター個体ID型を定義 */
 typedef int16_t DUNGEON_IDX; /*!< ゲーム中のダンジョンID型を定義 */
-typedef int16_t REALM_IDX; /*!< ゲーム中の魔法領域ID型を定義 */
 typedef int16_t ARTIFACT_IDX; /*!< ゲーム中のアーティファクトID型を定義 */
 typedef int16_t EGO_IDX; /*!< アイテムエゴのID型を定義 */
 typedef int16_t QUEST_IDX; /*!< ゲーム中のクエストID型を定義 */

diff --git a/src/system/player-type-definition.h b/src/system/player-type-definition.h
index 874c224..63433b3 100644 (file)
--- a/src/system/player-type-definition.h
+++ b/src/system/player-type-definition.h
@@ -31,9 +31,9 @@ typedef struct player_type {
     player_race_type prace{}; /* Race index */
     player_class_type pclass{}; /* Class index */
     player_personality_type pseikaku{}; /* Seikaku index */
-    REALM_IDX realm1{}; /* First magic realm */
-    REALM_IDX realm2{}; /* Second magic realm */
-    REALM_IDX element{}; //!< 元素使い領域番号 / Elementalist system index
+    int16_t realm1{}; /* First magic realm */
+    int16_t realm2{}; /* Second magic realm */
+    int16_t element{}; //!< 元素使い領域番号 / Elementalist system index
     player_personality_type oops{}; /* Unused */
 
     DICE_SID hitdie{}; /* Hit dice (sides) */

diff --git a/src/view/object-describer.cpp b/src/view/object-describer.cpp
index 260872f..b3323d4 100644 (file)
--- a/src/view/object-describer.cpp
+++ b/src/view/object-describer.cpp
@@ -77,7 +77,7 @@ void display_koff(player_type *owner_ptr, KIND_OBJECT_IDX k_idx)
     object_type forge;
     object_type *q_ptr;
     int sval;
-    REALM_IDX use_realm;
+    int16_t use_realm;
     GAME_TEXT o_name[MAX_NLEN];
     for (int y = 0; y < Term->hgt; y++) {
         term_erase(0, y, 255);

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index 063c320..5b86282 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -563,14 +563,14 @@ void wiz_reset_realms(player_type *creature_ptr)
     if (!get_string(ppp, tmp_val, 2))
         return;
 
-    creature_ptr->realm1 = static_cast<REALM_IDX>(atoi(tmp_val));
+    creature_ptr->realm1 = static_cast<int16_t>(atoi(tmp_val));
 
     sprintf(ppp, "2st Realm (None=0, 1-%d): ", MAX_REALM - 1);
     sprintf(tmp_val, "%d", creature_ptr->realm2);
     if (!get_string(ppp, tmp_val, 2))
         return;
 
-    creature_ptr->realm2 = static_cast<REALM_IDX>(atoi(tmp_val));
+    creature_ptr->realm2 = static_cast<int16_t>(atoi(tmp_val));
     creature_ptr->window_flags |= PW_PLAYER;
     creature_ptr->update |= PU_BONUS | PU_HP | PU_MANA | PU_SPELLS;
     creature_ptr->redraw |= PR_BASIC;

diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp
index 451ae91..143990d 100644 (file)
--- a/src/wizard/wizard-spoiler.cpp
+++ b/src/wizard/wizard-spoiler.cpp
@@ -274,7 +274,7 @@ static spoiler_output_status spoil_player_spell(concptr fname)
             continue;
         }
 
-        for (REALM_IDX r = 1; r < MAX_MAGIC; r++) {
+        for (int16_t r = 1; r < MAX_MAGIC; r++) {
             sprintf(buf, "[Realm: %s]\n", realm_names[r]);
             spoil_out(buf);
             spoil_out("Name                     Lv Cst Dif Exp\n");