[Refactor] #40392 Removed type alias CHARACTER_IDX; player_personality_type will...

diff --git a/src/birth/birth-select-personality.c b/src/birth/birth-select-personality.c
index 365c02a..78c4e49 100644 (file)
--- a/src/birth/birth-select-personality.c
+++ b/src/birth/birth-select-personality.c
@@ -184,7 +184,7 @@ bool get_player_personality(player_type *creature_ptr)
     if (!select_personality(creature_ptr, &k, &str, sym))
         return FALSE;
 
-    creature_ptr->pseikaku = (CHARACTER_IDX)k;
+    creature_ptr->pseikaku = (player_personality_type)k;
     ap_ptr = &seikaku_info[creature_ptr->pseikaku];
     char tmp[64];
 #ifdef JP

diff --git a/src/birth/quick-start.h b/src/birth/quick-start.h
index 1d77281..b3054be 100644 (file)
--- a/src/birth/quick-start.h
+++ b/src/birth/quick-start.h
@@ -7,7 +7,7 @@ typedef struct birther {
     SEX_IDX psex; /* Sex index */
     player_race_table prace; /* Race index */
     player_class_type pclass; /* Class index */
-    CHARACTER_IDX pseikaku; /* Seikaku index */
+    player_personality_type pseikaku; /* Seikaku index */
     REALM_IDX realm1; /* First magic realm */
     REALM_IDX realm2; /* Second magic realm */
 

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index b7ebd72..8da88a1 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -714,7 +714,7 @@ void do_cmd_browse(player_type *caster_ptr)
  * @param next_realm 変更先の魔法領域ID
  * @return なし
  */
-static void change_realm2(player_type *caster_ptr, CHARACTER_IDX next_realm)
+static void change_realm2(player_type *caster_ptr, player_personality_type next_realm)
 {
        int i, j = 0;
        char tmp[80];

diff --git a/src/io/load.c b/src/io/load.c
index 1f6c4d0..e0ca9fa 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -1570,7 +1570,7 @@ static void load_quick_start(void)
        rd_byte(&tmp8u);
        previous_char.pclass = (player_class_type)tmp8u;
        rd_byte(&tmp8u);
-       previous_char.pseikaku = (CHARACTER_IDX)tmp8u;
+       previous_char.pseikaku = (player_personality_type)tmp8u;
        rd_byte(&tmp8u);
        previous_char.realm1 = (REALM_IDX)tmp8u;
        rd_byte(&tmp8u);
@@ -1633,7 +1633,7 @@ static void rd_extra(player_type *creature_ptr)
        creature_ptr->pclass = (player_class_type)tmp8u;
 
        rd_byte(&tmp8u);
-       creature_ptr->pseikaku = (CHARACTER_IDX)tmp8u;
+       creature_ptr->pseikaku = (player_personality_type)tmp8u;
 
        rd_byte(&creature_ptr->psex);
        rd_byte(&tmp8u);

diff --git a/src/player/player-personalities-table.h b/src/player/player-personalities-table.h
index 57452a7..d012466 100644 (file)
--- a/src/player/player-personalities-table.h
+++ b/src/player/player-personalities-table.h
@@ -1,6 +1,6 @@
 #pragma once
 
-typedef enum player_personality_table {
+typedef enum player_personality_type {
        SEIKAKU_FUTUU = 0,
     SEIKAKU_CHIKARA = 1,
     SEIKAKU_KIREMONO = 2,
@@ -14,4 +14,4 @@ typedef enum player_personality_table {
     SEIKAKU_GAMAN = 10,
     SEIKAKU_MUNCHKIN = 11,
     SEIKAKU_CHARGEMAN = 12,
-} player_personality_table;
+} player_personality_type;

diff --git a/src/player/player-status.h b/src/player/player-status.h
index 6a2b8a4..4192441 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -1,5 +1,7 @@
 #pragma once 
 #include "market/building.h"
+#include "player/player-personalities-table.h"
+
 struct floor_type;
 typedef struct floor_type floor_type;
 
@@ -98,10 +100,10 @@ typedef struct player_type
        SEX_IDX psex;           /* Sex index */
        player_race_table prace;                /* Race index */
        player_class_type pclass;       /* Class index */
-       CHARACTER_IDX pseikaku; /* Seikaku index */
+       player_personality_type pseikaku;       /* Seikaku index */
        REALM_IDX realm1;               /* First magic realm */
        REALM_IDX realm2;               /* Second magic realm */
-       CHARACTER_IDX oops;             /* Unused */
+       player_personality_type oops;           /* Unused */
 
        DICE_SID hitdie;        /* Hit dice (sides) */
        u16b expfact;   /* Experience factor

diff --git a/src/system/h-type.h b/src/system/h-type.h
index 2359d6c..631a542 100644 (file)
--- a/src/system/h-type.h
+++ b/src/system/h-type.h
@@ -95,7 +95,6 @@ typedef s16b FEAT_IDX;                        /*!< ゲーム中の地形ID型を定義 */
 typedef s16b FLOOR_IDX;                        /*!< ゲーム中のフロアID型を定義 */
 
 typedef byte SEX_IDX;                  /*!< ゲーム中のプレイヤー性別ID型を定義 */
-typedef s16b CHARACTER_IDX;            /*!< ゲーム中のプレイヤー性格ID型を定義 */
 typedef s16b MIMIC_RACE_IDX;   /*!< ゲーム中のプレイヤー変身種族ID型を定義 */
 typedef s16b PATRON_IDX;               /*!< ゲーム中のプレイヤーパトロンID型を定義 */
 typedef s32b ACTION_IDX;               /*!< プレイヤーが現在取っている常時行動のID定義 */