#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

[hengband/hengband.git] / src / save.c

diff --git a/src/save.c b/src/save.c
index 59debc6..367b8f1 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -171,20 +171,20 @@ static void wr_item(object_type *o_ptr)
        if (flags & SAVE_ITEM_PVAL) wr_s16b(o_ptr->pval);
 
        if (flags & SAVE_ITEM_DISCOUNT) wr_byte(o_ptr->discount);
-       if (flags & SAVE_ITEM_NUMBER) wr_byte(o_ptr->number);
+       if (flags & SAVE_ITEM_NUMBER) wr_byte((byte_hack)o_ptr->number);
 
        wr_s16b(o_ptr->weight);
 
-       if (flags & SAVE_ITEM_NAME1) wr_byte(o_ptr->name1);
-       if (flags & SAVE_ITEM_NAME2) wr_byte(o_ptr->name2);
+       if (flags & SAVE_ITEM_NAME1) wr_byte((byte_hack)o_ptr->name1);
+       if (flags & SAVE_ITEM_NAME2) wr_byte((byte_hack)o_ptr->name2);
        if (flags & SAVE_ITEM_TIMEOUT) wr_s16b(o_ptr->timeout);
 
        if (flags & SAVE_ITEM_TO_H) wr_s16b(o_ptr->to_h);
        if (flags & SAVE_ITEM_TO_D) wr_s16b((s16b)o_ptr->to_d);
        if (flags & SAVE_ITEM_TO_A) wr_s16b(o_ptr->to_a);
        if (flags & SAVE_ITEM_AC) wr_s16b(o_ptr->ac);
-       if (flags & SAVE_ITEM_DD) wr_byte(o_ptr->dd);
-       if (flags & SAVE_ITEM_DS) wr_byte(o_ptr->ds);
+       if (flags & SAVE_ITEM_DD) wr_byte((byte_hack)o_ptr->dd);
+       if (flags & SAVE_ITEM_DS) wr_byte((byte_hack)o_ptr->ds);
 
        if (flags & SAVE_ITEM_IDENT) wr_byte(o_ptr->ident);
 
@@ -310,7 +310,7 @@ static void wr_monster(monster_type *m_ptr)
  * @param r_idx モンスター種族ID
  * @return なし
  */
-static void wr_lore(int r_idx)
+static void wr_lore(MONRACE_IDX r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
@@ -569,8 +569,8 @@ static void save_quick_start(void)
        wr_byte(previous_char.prace);
        wr_byte(previous_char.pclass);
        wr_byte(previous_char.pseikaku);
-       wr_byte(previous_char.realm1);
-       wr_byte(previous_char.realm2);
+       wr_byte((byte_hack)previous_char.realm1);
+       wr_byte((byte_hack)previous_char.realm2);
 
        wr_s16b(previous_char.age);
        wr_s16b(previous_char.ht);
@@ -581,7 +581,7 @@ static void save_quick_start(void)
        for (i = 0; i < 6; i++) wr_s16b(previous_char.stat_max[i]);
        for (i = 0; i < 6; i++) wr_s16b(previous_char.stat_max_max[i]);
 
-       for (i = 0; i < PY_MAX_LEVEL; i++) wr_s16b(previous_char.player_hp[i]);
+       for (i = 0; i < PY_MAX_LEVEL; i++) wr_s16b((s16b)previous_char.player_hp[i]);
 
        wr_s16b(previous_char.chaos_patron);
 
@@ -626,8 +626,8 @@ static void wr_extra(void)
        wr_byte(p_ptr->pclass);
        wr_byte(p_ptr->pseikaku);
        wr_byte(p_ptr->psex);
-       wr_byte(p_ptr->realm1);
-       wr_byte(p_ptr->realm2);
+       wr_byte((byte_hack)p_ptr->realm1);
+       wr_byte((byte_hack)p_ptr->realm2);
        wr_byte(0);     /* oops */
 
        wr_byte((byte)p_ptr->hitdie);
@@ -666,8 +666,8 @@ static void wr_extra(void)
 
        for (i = 0; i < MAX_MANE; i++)
        {
-               wr_s16b(p_ptr->mane_spell[i]);
-               wr_s16b(p_ptr->mane_dam[i]);
+               wr_s16b((s16b)p_ptr->mane_spell[i]);
+               wr_s16b((s16b)p_ptr->mane_dam[i]);
        }
        wr_s16b(p_ptr->mane_num);
 
@@ -711,7 +711,7 @@ static void wr_extra(void)
        tmp8u = (byte)max_d_idx;
        wr_byte(tmp8u);
        for (i = 0; i < tmp8u; i++)
-               wr_s16b(max_dlv[i]);
+               wr_s16b((s16b)max_dlv[i]);
 
        /* More info */
        wr_s16b(0);     /* oops */
@@ -941,7 +941,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 
                wr_s16b(sf_ptr->floor_id);
                wr_byte(sf_ptr->savefile_id);
-               wr_s16b(sf_ptr->dun_level);
+               wr_s16b((s16b)sf_ptr->dun_level);
                wr_s32b(sf_ptr->last_visit);
                wr_u32b(sf_ptr->visit_mark);
                wr_s16b(sf_ptr->upper_floor_id);
@@ -1074,7 +1074,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
                        }
 
                        /* Extract an ID */
-                       tmp16u = i;
+                       tmp16u = (u16b)i;
 
                        /* If the run is broken, or too full, flush it */
                        if ((tmp16u != prev_u16b) || (count == MAX_UCHAR))
@@ -1183,7 +1183,7 @@ static bool wr_dungeon(void)
        wr_s16b(max_floor_id);
 
        /* Current dungeon type */
-       wr_byte(dungeon_type);
+       wr_byte((byte_hack)dungeon_type);
 
 
        /*** No saved floor (On the surface etc.) ***/
@@ -1212,7 +1212,7 @@ static bool wr_dungeon(void)
 
                wr_s16b(sf_ptr->floor_id);
                wr_byte(sf_ptr->savefile_id);
-               wr_s16b(sf_ptr->dun_level);
+               wr_s16b((s16b)sf_ptr->dun_level);
                wr_s32b(sf_ptr->last_visit);
                wr_u32b(sf_ptr->visit_mark);
                wr_s16b(sf_ptr->upper_floor_id);
@@ -1403,7 +1403,7 @@ static bool wr_savefile_new(void)
 
                /* And the dungeon level too */
                /* (prevents problems with multi-level quests) */
-               wr_s16b(q_ptr->level);
+               wr_s16b((s16b)q_ptr->level);
 
                wr_byte(q_ptr->complev);
                wr_u32b(q_ptr->comptime);
@@ -1460,7 +1460,7 @@ static bool wr_savefile_new(void)
        wr_u16b(tmp16u);
        for (i = 0; i < tmp16u; i++)
        {
-               wr_s16b(p_ptr->player_hp[i]);
+               wr_s16b((s16b)p_ptr->player_hp[i]);
        }
 
 
@@ -1478,7 +1478,7 @@ static bool wr_savefile_new(void)
        /* Dump the ordered spells */
        for (i = 0; i < 64; i++)
        {
-               wr_byte(p_ptr->spell_order[i]);
+               wr_byte((byte_hack)p_ptr->spell_order[i]);
        }
 
 
@@ -1650,9 +1650,9 @@ static bool save_player_aux(char *name)
  */
 bool save_player(void)
 {
-       int             result = FALSE;
+       bool result = FALSE;
 
-       char    safe[1024];
+       char safe[1024];
 
 
 #ifdef SET_UID