max_quests を max_q_idx に改名。BGM選択時クエストの参照処理を修正。 / Rename max_quest to man_q_idx, Fix...

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

diff --git a/src/save.c b/src/save.c
index a80ee73..e2f4d19 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -173,7 +173,7 @@ static void wr_item(object_type *o_ptr)
        if (flags & SAVE_ITEM_DISCOUNT) wr_byte(o_ptr->discount);
        if (flags & SAVE_ITEM_NUMBER) wr_byte((byte_hack)o_ptr->number);
 
-       wr_s16b(o_ptr->weight);
+       wr_s16b((s16b)o_ptr->weight);
 
        if (flags & SAVE_ITEM_NAME1) wr_byte((byte_hack)o_ptr->name1);
        if (flags & SAVE_ITEM_NAME2) wr_byte((byte_hack)o_ptr->name2);
@@ -315,11 +315,11 @@ static void wr_lore(MONRACE_IDX r_idx)
        monster_race *r_ptr = &r_info[r_idx];
 
        /* Count sights/deaths/kills */
-       wr_s16b(r_ptr->r_sights);
-       wr_s16b(r_ptr->r_deaths);
-       wr_s16b(r_ptr->r_pkills);
-       wr_s16b(r_ptr->r_akills);
-       wr_s16b(r_ptr->r_tkills);
+       wr_s16b((s16b)r_ptr->r_sights);
+       wr_s16b((s16b)r_ptr->r_deaths);
+       wr_s16b((s16b)r_ptr->r_pkills);
+       wr_s16b((s16b)r_ptr->r_akills);
+       wr_s16b((s16b)r_ptr->r_tkills);
 
        /* Count wakes and ignores */
        wr_byte(r_ptr->r_wake);
@@ -330,8 +330,8 @@ static void wr_lore(MONRACE_IDX r_idx)
        wr_byte(r_ptr->r_xtra2);
 
        /* Count drops */
-       wr_byte(r_ptr->r_drop_gold);
-       wr_byte(r_ptr->r_drop_item);
+       wr_byte((byte_hack)r_ptr->r_drop_gold);
+       wr_byte((byte_hack)r_ptr->r_drop_item);
 
        /* Count spells */
        wr_byte(0); /* unused now */
@@ -354,7 +354,7 @@ static void wr_lore(MONRACE_IDX r_idx)
 
 
        /* Monster limit per level */
-       wr_byte(r_ptr->max_num);
+       wr_byte((byte_hack)r_ptr->max_num);
 
        /* Location in saved floor */
        wr_s16b(r_ptr->floor_id);
@@ -797,7 +797,7 @@ static void wr_extra(void)
        wr_byte(p_ptr->knowledge);
        wr_byte(p_ptr->autopick_autoregister);
        wr_byte(0);     /* oops */
-       wr_byte(p_ptr->action);
+       wr_byte((byte_hack)p_ptr->action);
        wr_byte(0);
        wr_byte(preserve_mode);
        wr_byte(p_ptr->wait_report_score);
@@ -940,7 +940,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
                /*** The saved floor ***/
 
                wr_s16b(sf_ptr->floor_id);
-               wr_byte(sf_ptr->savefile_id);
+               wr_byte((byte_hack)sf_ptr->savefile_id);
                wr_s16b((s16b)sf_ptr->dun_level);
                wr_s32b(sf_ptr->last_visit);
                wr_u32b(sf_ptr->visit_mark);
@@ -1043,7 +1043,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
                cave_template_type *ct_ptr = &templates[i];
 
                /* Dump it */
-               wr_u16b(ct_ptr->info);
+               wr_u16b((u16b)ct_ptr->info);
                wr_s16b(ct_ptr->feat);
                wr_s16b(ct_ptr->mimic);
                wr_s16b(ct_ptr->special);
@@ -1211,7 +1211,7 @@ static bool wr_dungeon(void)
                saved_floor_type *sf_ptr = &saved_floors[i];
 
                wr_s16b(sf_ptr->floor_id);
-               wr_byte(sf_ptr->savefile_id);
+               wr_byte((byte_hack)sf_ptr->savefile_id);
                wr_s16b((s16b)sf_ptr->dun_level);
                wr_s32b(sf_ptr->last_visit);
                wr_u32b(sf_ptr->visit_mark);
@@ -1387,14 +1387,14 @@ static bool wr_savefile_new(void)
        wr_u16b(tmp16u);
 
        /* Dump the quests */
-       tmp16u = max_quests;
+       tmp16u = max_q_idx;
        wr_u16b(tmp16u);
 
        /* Dump the quests */
        tmp8u = MAX_RANDOM_QUEST-MIN_RANDOM_QUEST;
        wr_byte(tmp8u);
 
-       for (i = 0; i < max_quests; i++)
+       for (i = 0; i < max_q_idx; i++)
        {
                quest_type* const q_ptr = &quest[i];
 
@@ -1405,7 +1405,7 @@ static bool wr_savefile_new(void)
                /* (prevents problems with multi-level quests) */
                wr_s16b((s16b)q_ptr->level);
 
-               wr_byte(q_ptr->complev);
+               wr_byte((byte_hack)q_ptr->complev);
                wr_u32b(q_ptr->comptime);
 
                /* Save quest status if quest is running */
@@ -1416,8 +1416,8 @@ static bool wr_savefile_new(void)
                        wr_s16b(q_ptr->type);
                        wr_s16b(q_ptr->r_idx);
                        wr_s16b(q_ptr->k_idx);
-                       wr_byte(q_ptr->flags);
-                       wr_byte(q_ptr->dungeon);
+                       wr_byte((byte_hack)q_ptr->flags);
+                       wr_byte((byte_hack)q_ptr->dungeon);
                }
        }
 
@@ -2141,7 +2141,7 @@ static bool save_floor_aux(saved_floor_type *sf_ptr)
  * @param mode 保存オプション
  * @return なし
  */
-bool save_floor(saved_floor_type *sf_ptr, u32b mode)
+bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode)
 {
        FILE *old_fff = NULL;
        byte old_xor_byte = 0;