diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2011-04-16 21:55:28 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-03-29 20:22:11 +0200 |
| commit | b71e458b9a8de777f4861daf91b3b94189247ed5 (patch) | |
| tree | 43c1ae936e9cb9139b78f56c6bce6733b7abb792 /src/birth.c | |
| parent | 08a39076992d367194b6fce9853b1b8898936b24 (diff) | |
Refactor: player_outfit(): Move "forge" closer to usage site.
Diffstat (limited to 'src/birth.c')
| -rw-r--r-- | src/birth.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/birth.c b/src/birth.c index b35cbe70..1705309e 100644 --- a/src/birth.c +++ b/src/birth.c @@ -1091,20 +1091,14 @@ static void player_outfit(void) { int i; - object_type forge; - - object_type *q_ptr; - - /* * Get an adventurer guide describing a bit of the * wilderness(useless for vanilla town) */ if (!vanilla_town) { - /* Get local object */ - q_ptr = &forge; - + object_type forge; + object_type *q_ptr = &forge; /* Hack -- Give the player an adventurer guide */ object_prep(q_ptr, lookup_kind(TV_PARCHMENT, 20)); q_ptr->number = 1; @@ -1115,13 +1109,9 @@ static void player_outfit(void) process_hooks(HOOK_BIRTH_OBJECTS, "()"); - /* Get local object */ - q_ptr = &forge; - - /* Get local object */ - q_ptr = &forge; - { + object_type forge; + object_type *q_ptr = &forge; /* Hack -- Give the player some food */ object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION)); q_ptr->number = (byte)rand_range(3, 7); @@ -1130,10 +1120,9 @@ static void player_outfit(void) (void)inven_carry(q_ptr, FALSE); } - /* Get local object */ - q_ptr = &forge; - { + object_type forge; + object_type *q_ptr = &forge; /* Hack -- Give the player some torches */ object_prep(q_ptr, lookup_kind(TV_LITE, SV_LITE_TORCH)); q_ptr->number = (byte)rand_range(3, 7); @@ -1143,9 +1132,6 @@ static void player_outfit(void) (void)inven_carry(q_ptr, FALSE); } - /* Get local object */ - q_ptr = &forge; - /* Rogues have a better knowledge of traps */ if (has_ability(AB_TRAPPING)) { @@ -1157,6 +1143,8 @@ static void player_outfit(void) t_info[TRAP_OF_FIRE_BOLT].ident = TRUE; /* Hack -- Give the player a some ammo for the traps */ + object_type forge; + object_type *q_ptr = &forge; object_prep(q_ptr, lookup_kind(TV_SHOT, SV_AMMO_NORMAL)); q_ptr->number = (byte)rand_range(5, 15); object_aware(q_ptr); |