#37287 #37353 (2.2.0.89) CLASS_IDX 型を定義し、型の置換を継続中。 / Define CLASS_IDX, ongoing type...

diff --git a/src/h-type.h b/src/h-type.h
index 4680486..90f7ea4 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -108,6 +108,7 @@ typedef s16b IDX;                           /*!< ゲーム中のID型を定義 */
 typedef s16b FEAT_IDX;                 /*!< ゲーム中の地形ID型を定義 */
 
 typedef s16b RACE_IDX;                 /*!< ゲーム中のプレイヤー種族ID型を定義 */
+typedef s16b CLASS_IDX;                        /*!< ゲーム中のプレイヤー職業ID型を定義 */
 typedef s16b MIMIC_RACE_IDX;   /*!< ゲーム中のプレイヤー変身種族ID型を定義 */
 typedef s16b PATRON_IDX;               /*!< ゲーム中のプレイヤーパトロンID型を定義 */
 

diff --git a/src/init1.c b/src/init1.c
index 5004af9..14a1027 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -3875,7 +3875,7 @@ static errr parse_line_building(char *buf)
                        {
                                for (i = 0; i < MAX_CLASS; i++)
                                {
-                                       building[index].member_class[i] = atoi(zz[i]);
+                                       building[index].member_class[i] = (CLASS_IDX)atoi(zz[i]);
                                }
 
                                break;
@@ -3891,7 +3891,7 @@ static errr parse_line_building(char *buf)
                        {
                                for (i = 0; i < MAX_RACES; i++)
                                {
-                                       building[index].member_race[i] = atoi(zz[i]);
+                                       building[index].member_race[i] = (RACE_IDX)atoi(zz[i]);
                                }
 
                                break;
@@ -3907,7 +3907,7 @@ static errr parse_line_building(char *buf)
                        {
                                for (i = 0; i < MAX_MAGIC; i++)
                                {
-                                       building[index].member_realm[i+1] = atoi(zz[i]);
+                                       building[index].member_realm[i+1] = (REALM_IDX)atoi(zz[i]);
                                }
 
                                break;

diff --git a/src/object2.c b/src/object2.c
index 9be7b86..a50301a 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -8669,7 +8669,7 @@ static void erase_essence(void)
  */
 void do_cmd_kaji(bool only_browse)
 {
-       IDX mode = 0;
+       int mode = 0;
        char choice;
 
        int menu_line = (use_menu ? 1 : 0);

diff --git a/src/types.h b/src/types.h
index 737340b..27359bf 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1461,9 +1461,9 @@ struct building_type
        s16b actions[8];                /* action codes */
        s16b action_restr[8];           /* action restrictions */
 
-       s16b member_class[MAX_CLASS];   /* which classes are part of guild */
-       s16b member_race[MAX_RACES];    /* which classes are part of guild */
-       s16b member_realm[MAX_MAGIC+1]; /* which realms are part of guild */
+       CLASS_IDX member_class[MAX_CLASS];   /* which classes are part of guild */
+       RACE_IDX member_race[MAX_RACES];    /* which classes are part of guild */
+       REALM_IDX member_realm[MAX_MAGIC+1]; /* which realms are part of guild */
 };