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

diff --git a/src/bldg.c b/src/bldg.c
index 7d77228..94796cd 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4451,7 +4451,7 @@ static void bldg_process_command(building_type *bldg, int i)
                        else if(quest[QUEST_SERPENT].status != QUEST_STATUS_FINISHED) max_depth = 99;
                }
                amt = get_quantity(format(_("%sの何階にテレポートしますか？", "Teleport to which level of %s? "), 
-                                                       d_name + d_info[select_dungeon].name), max_depth);
+                                                       d_name + d_info[select_dungeon].name), (QUANTITY)max_depth);
 
                if (amt > 0)
                {

diff --git a/src/cmd4.c b/src/cmd4.c
index c325b72..09b18f6 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5747,7 +5747,8 @@ static void do_cmd_knowledge_uniques(void)
  */
 static void do_cmd_knowledge_weapon_exp(void)
 {
-       int i, j, num, weapon_exp;
+       int i, num, weapon_exp;
+       KIND_OBJECT_IDX j;
 
        FILE *fff;
 

diff --git a/src/externs.h b/src/externs.h
index 4256249..9fa1965 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -545,18 +545,18 @@ extern s16b world_monster;
 extern bool world_player;
 extern int cap_mon;
 extern int cap_mspeed;
-extern int cap_hp;
-extern int cap_maxhp;
-extern u16b cap_nickname;
-extern IDX battle_mon[4];
+extern HIT_POINT cap_hp;
+extern HIT_POINT cap_maxhp;
+extern STR_OFFSET cap_nickname;
+extern MONRACE_IDX battle_mon[4];
 extern int sel_monster;
 extern int battle_odds;
-extern int kakekin;
+extern PRICE kakekin;
 extern u32b mon_odds[4];
 extern MONSTER_IDX pet_t_m_idx;
 extern MONSTER_IDX riding_t_m_idx;
-extern s16b kubi_r_idx[MAX_KUBI];
-extern s16b today_mon;
+extern MONRACE_IDX kubi_r_idx[MAX_KUBI];
+extern MONRACE_IDX today_mon;
 extern bool write_level;
 extern u32b playtime;
 extern u32b start_time;
@@ -1362,7 +1362,7 @@ extern bool get_string(cptr prompt, char *buf, int len);
 extern bool get_check(cptr prompt);
 extern bool get_check_strict(cptr prompt, int mode);
 extern bool get_com(cptr prompt, char *command, bool z_escape);
-extern s16b get_quantity(cptr prompt, COMMAND_CODE max);
+extern QUANTITY get_quantity(cptr prompt, QUANTITY max);
 extern void pause_line(int row);
 extern void request_command(int shopping);
 extern bool is_a_vowel(int ch);

diff --git a/src/h-type.h b/src/h-type.h
index 3aa85e3..8bc4dff 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -181,6 +181,8 @@ typedef s32b SPELL_IDX;    /*!< 各魔法領域/職業能力ごとの呪文ID型
 typedef s16b PROB;         /*!< 確率の重みの型定義 */
 typedef byte FEAT_POWER;   /*!< 地形強度の型定義 */
 
+typedef int QUANTITY; /*!< インターフェース上の指定個数 */
+
 /*** Pointers to all the basic types defined above ***/
 
 typedef real *real_ptr;

diff --git a/src/mane.c b/src/mane.c
index a89faea..776aaa2 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -39,7 +39,7 @@ static void mane_info(char *p, int power, HIT_POINT dam)
        strcpy(p, "");
 
        if ((power > 2 && power < 41) || (power > 41 && power < 59) || (power == 75))
-               sprintf(p, " %s%d", s_dam, dam);
+               sprintf(p, " %s%d", s_dam, (int)dam);
        else
        {
                switch (power)

diff --git a/src/save.c b/src/save.c
index 073b36c..6c08f41 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -1411,8 +1411,8 @@ static bool wr_savefile_new(void)
                /* Save quest status if quest is running */
                if (q_ptr->status == QUEST_STATUS_TAKEN || q_ptr->status == QUEST_STATUS_COMPLETED || !is_fixed_quest_idx(i))
                {
-                       wr_s16b(q_ptr->cur_num);
-                       wr_s16b(q_ptr->max_num);
+                       wr_s16b((s16b)q_ptr->cur_num);
+                       wr_s16b((s16b)q_ptr->max_num);
                        wr_s16b(q_ptr->type);
                        wr_s16b(q_ptr->r_idx);
                        wr_s16b(q_ptr->k_idx);

diff --git a/src/util.c b/src/util.c
index 20373ca..d4d48d7 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3802,7 +3802,7 @@ bool get_com(cptr prompt, char *command, bool z_escape)
  *
  * Hack -- allow "command_arg" to specify a quantity
  */
-s16b get_quantity(cptr prompt, COMMAND_CODE max)
+QUANTITY get_quantity(cptr prompt, QUANTITY max)
 {
        bool res;
        COMMAND_CODE amt;

diff --git a/src/variable.c b/src/variable.c
index 8f48d22..852b0fe 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -1142,21 +1142,21 @@ bool world_player;
 
 int cap_mon;
 int cap_mspeed;
-int cap_hp;
-int cap_maxhp;
-u16b cap_nickname;
+HIT_POINT cap_hp;
+HIT_POINT cap_maxhp;
+STR_OFFSET cap_nickname;
 
-IDX battle_mon[4];
+MONRACE_IDX battle_mon[4];
 int sel_monster;
 int battle_odds;
-int kakekin;
+PRICE kakekin;
 u32b mon_odds[4];
 
 MONSTER_IDX pet_t_m_idx;
 MONSTER_IDX riding_t_m_idx;
 
-IDX kubi_r_idx[MAX_KUBI];
-IDX today_mon;
+MONSTER_IDX kubi_r_idx[MAX_KUBI];
+MONSTER_IDX today_mon;
 
 bool write_level;