From: Deskull Date: Tue, 15 Jan 2019 14:47:45 +0000 (+0900) Subject: [Refactor] #37353 型の置換。 / Type replacement. X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=6ed5c92885086f743505f4df8fdcc158ed767246 [Refactor] #37353 型の置換。 / Type replacement. --- diff --git a/src/birth.c b/src/birth.c index 7be722148..41609c239 100644 --- a/src/birth.c +++ b/src/birth.c @@ -2282,7 +2282,7 @@ void player_outfit(void) case RACE_ENT: /* Potions of Water */ object_prep(q_ptr, lookup_kind(TV_POTION, SV_POTION_WATER)); - q_ptr->number = (byte)rand_range(15, 23); + q_ptr->number = (ITEM_NUMBER)rand_range(15, 23); add_outfit(q_ptr); break; @@ -2294,7 +2294,7 @@ void player_outfit(void) /* Fuel with oil (move pval to xtra4) */ apply_magic(q_ptr, 1, AM_NO_FIXED_ART); - q_ptr->number = (byte)rand_range(7, 12); + q_ptr->number = (ITEM_NUMBER)rand_range(7, 12); add_outfit(q_ptr); break; @@ -2302,7 +2302,7 @@ void player_outfit(void) default: /* Food rations */ object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION)); - q_ptr->number = (byte)rand_range(3, 7); + q_ptr->number = (ITEM_NUMBER)rand_range(3, 7); add_outfit(q_ptr); } @@ -2313,7 +2313,7 @@ void player_outfit(void) /* Hack -- Give the player scrolls of DARKNESS! */ object_prep(q_ptr, lookup_kind(TV_SCROLL, SV_SCROLL_DARKNESS)); - q_ptr->number = rand_range(2, 5); + q_ptr->number = (ITEM_NUMBER)rand_range(2, 5); add_outfit(q_ptr); } @@ -2321,7 +2321,7 @@ void player_outfit(void) { /* Hack -- Give the player some torches */ object_prep(q_ptr, lookup_kind(TV_LITE, SV_LITE_TORCH)); - q_ptr->number = rand_range(3, 7); + q_ptr->number = (ITEM_NUMBER)rand_range(3, 7); q_ptr->xtra4 = rand_range(3, 7) * 500; add_outfit(q_ptr); @@ -2354,7 +2354,7 @@ void player_outfit(void) { /* Hack -- Give the player some arrows */ object_prep(q_ptr, lookup_kind(TV_ARROW, SV_AMMO_NORMAL)); - q_ptr->number = (byte)rand_range(15, 20); + q_ptr->number = (ITEM_NUMBER)rand_range(15, 20); add_outfit(q_ptr); } @@ -2363,7 +2363,7 @@ void player_outfit(void) /* Hack -- Give the player some arrows */ object_prep(q_ptr, lookup_kind(TV_WAND, SV_WAND_MAGIC_MISSILE)); q_ptr->number = 1; - q_ptr->pval = (byte)rand_range(25, 30); + q_ptr->pval = (PARAMETER_VALUE)rand_range(25, 30); add_outfit(q_ptr); } diff --git a/src/cmd2.c b/src/cmd2.c index cd434a8a0..77e898951 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -272,7 +272,7 @@ void do_cmd_go_down(void) else { - int target_dungeon = 0; + DUNGEON_IDX target_dungeon = 0; if (!dun_level) { @@ -293,7 +293,7 @@ void do_cmd_go_down(void) /* Save old player position */ p_ptr->oldpx = p_ptr->x; p_ptr->oldpy = p_ptr->y; - dungeon_type = (byte)target_dungeon; + dungeon_type = target_dungeon; /* * Clear all saved floors diff --git a/src/xtra2.c b/src/xtra2.c index 373054822..d38a97063 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -202,7 +202,7 @@ void complete_quest(QUEST_IDX quest_num) } q_ptr->status = QUEST_STATUS_COMPLETED; - q_ptr->complev = (byte)p_ptr->lev; + q_ptr->complev = p_ptr->lev; update_playtime(); q_ptr->comptime = playtime;