#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 6220870..367b8f1 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -165,26 +165,26 @@ static void wr_item(object_type *o_ptr)
        wr_s16b(o_ptr->k_idx);
 
        /* Location */
-       wr_byte(o_ptr->iy);
-       wr_byte(o_ptr->ix);
+       wr_byte((byte_hack)o_ptr->iy);
+       wr_byte((byte_hack)o_ptr->ix);
 
        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(o_ptr->to_d);
+       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);
 
@@ -248,11 +248,11 @@ static void wr_monster(monster_type *m_ptr)
 
        /*** Write only un-obvious elements ***/
        wr_s16b(m_ptr->r_idx);
-       wr_byte(m_ptr->fy);
-       wr_byte(m_ptr->fx);
-       wr_s16b(m_ptr->hp);
-       wr_s16b(m_ptr->maxhp);
-       wr_s16b(m_ptr->max_maxhp);
+       wr_byte((byte_hack)m_ptr->fy);
+       wr_byte((byte_hack)m_ptr->fx);
+       wr_s16b((s16b)m_ptr->hp);
+       wr_s16b((s16b)m_ptr->maxhp);
+       wr_s16b((s16b)m_ptr->max_maxhp);
        wr_u32b(m_ptr->dealt_damage);
        
 
@@ -290,8 +290,8 @@ static void wr_monster(monster_type *m_ptr)
                tmp8u = (byte)m_ptr->mtimed[MTIMED_MONFEAR];
                wr_byte(tmp8u);
        }
-       if (flags & SAVE_MON_TARGET_Y) wr_s16b(m_ptr->target_y);
-       if (flags & SAVE_MON_TARGET_X) wr_s16b(m_ptr->target_x);
+       if (flags & SAVE_MON_TARGET_Y) wr_s16b((s16b)m_ptr->target_y);
+       if (flags & SAVE_MON_TARGET_X) wr_s16b((s16b)m_ptr->target_x);
        if (flags & SAVE_MON_INVULNER)
        {
                tmp8u = (byte)m_ptr->mtimed[MTIMED_INVULNER];
@@ -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];
 
@@ -476,6 +476,8 @@ static void wr_options(void)
 
        if (p_ptr->wizard) c |= 0x0002;
 
+       if (cheat_turn) c |= 0x0080;
+
        if (cheat_peek) c |= 0x0100;
        if (cheat_hear) c |= 0x0200;
        if (cheat_room) c |= 0x0400;
@@ -567,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);
@@ -579,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);
 
@@ -624,11 +626,11 @@ 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(p_ptr->hitdie);
+       wr_byte((byte)p_ptr->hitdie);
        wr_u16b(p_ptr->expfact);
 
        wr_s16b(p_ptr->age);
@@ -664,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);
 
@@ -690,8 +692,8 @@ static void wr_extra(void)
        wr_byte(p_ptr->exit_bldg);
        wr_byte(0); /* Unused */
 
-       wr_s16b(p_ptr->oldpx);
-       wr_s16b(p_ptr->oldpy);
+       wr_s16b((s16b)p_ptr->oldpx);
+       wr_s16b((s16b)p_ptr->oldpy);
 
        /* Was number of p_ptr->rewards[] */
        wr_s16b(0);
@@ -709,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 */
@@ -931,7 +933,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
        {
                /*** Not a saved floor ***/
 
-               wr_s16b(dun_level);
+               wr_s16b((s16b)dun_level);
        }
        else
        {
@@ -939,19 +941,19 @@ 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);
                wr_s16b(sf_ptr->lower_floor_id);
        }
 
-       wr_u16b(base_level);
+       wr_u16b((u16b)base_level);
        wr_u16b(num_repro);
        wr_u16b((u16b)p_ptr->y);
        wr_u16b((u16b)p_ptr->x);
-       wr_u16b(cur_hgt);
-       wr_u16b(cur_wid);
+       wr_u16b((u16b)cur_hgt);
+       wr_u16b((u16b)cur_wid);
        wr_byte(p_ptr->feeling);
 
 
@@ -1072,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))
@@ -1181,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.) ***/
@@ -1210,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);
@@ -1401,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);
@@ -1458,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]);
        }
 
 
@@ -1476,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]);
        }
 
 
@@ -1648,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