From 7f7438028fe0ef3de04219c971110e9629ef0f4b Mon Sep 17 00:00:00 2001 From: Deskull Date: Wed, 20 Dec 2017 00:57:44 +0900 Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20=E5=9E=8B?= =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?= =?utf8?q?=E3=80=82=20/=20Ongoing=20type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/load.c | 6 ++++-- src/mspells3.c | 12 ++++++------ src/save.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/load.c b/src/load.c index b19f67e47..ab5c9eda0 100644 --- a/src/load.c +++ b/src/load.c @@ -3066,7 +3066,8 @@ static errr rd_saved_floor(saved_floor_type *sf_ptr) cave_template_type *ct_ptr = &templates[i]; /* Read it */ - rd_u16b(&ct_ptr->info); + rd_u16b(&tmp16u); + ct_ptr->info = (BIT_FLAGS)tmp16u; if (h_older_than(1, 7, 0, 2)) { rd_byte(&tmp8u); @@ -3327,7 +3328,8 @@ static errr rd_dungeon(void) saved_floor_type *sf_ptr = &saved_floors[i]; rd_s16b(&sf_ptr->floor_id); - rd_byte(&sf_ptr->savefile_id); + rd_byte(&tmp8u); + sf_ptr->savefile_id = (s16b)tmp8u; rd_s16b(&tmp16s); sf_ptr->dun_level = (DEPTH)tmp16s; diff --git a/src/mspells3.c b/src/mspells3.c index 3d129c200..d0b88c5f5 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -605,12 +605,12 @@ static int get_learned_power(SPELL_IDX *sn) */ static bool cast_learned_spell(int spell, bool success) { - int dir; - int plev = pseudo_plev(); - int summon_lev = p_ptr->lev * 2 / 3 + randint1(p_ptr->lev/2); - int damage = 0; - bool pet = success; - bool no_trump = FALSE; + DIRECTION dir; + PLAYER_LEVEL plev = pseudo_plev(); + PLAYER_LEVEL summon_lev = p_ptr->lev * 2 / 3 + randint1(p_ptr->lev/2); + HIT_POINT damage = 0; + bool pet = success; + bool no_trump = FALSE; u32b p_mode, u_mode = 0L, g_mode; if (pet) diff --git a/src/save.c b/src/save.c index 341f3c4c7..2ad14a883 100644 --- a/src/save.c +++ b/src/save.c @@ -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); -- 2.11.0