diff options
| author | Eino Keskitalo <evktalo@users.sourceforge.net> | 2009-10-30 01:06:43 +0200 |
|---|---|---|
| committer | Eino Keskitalo <evktalo@users.sourceforge.net> | 2009-10-30 01:10:25 +0200 |
| commit | 929d367d195931d5d04ac198e45b800289c724c0 (patch) | |
| tree | fccb97bc65679c7ae6c8d256ae7eb4fcea9e2f23 /crawl-ref/source/item_use.cc | |
| parent | 67a0bc6e880f23b2b24e1b232db916e3bc9b8227 (diff) | |
| download | crawl-ref-929d367d195931d5d04ac198e45b800289c724c0.tar.gz crawl-ref-929d367d195931d5d04ac198e45b800289c724c0.zip | |
Rename shadows brand into reaping for unique name.
Signed-off-by: Eino Keskitalo <evktalo@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 700a828473..a873bdbdf9 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -621,7 +621,7 @@ void wield_effects(int item_wield_2, bool showMsgs) you.hand_name(true).c_str()); break; - case SPWPN_SHADOW: + case SPWPN_REAPING: mpr("It is briefly surrounded by shifting shadows."); break; @@ -1732,7 +1732,7 @@ static bool _silver_damages_victim(bolt &beam, actor* victim, int &dmg, return (false); } -static bool _shadow_hit_victim(bolt& beam, actor* victim, int dmg, int corpse) +static bool _reaping_hit_victim(bolt& beam, actor* victim, int dmg, int corpse) { if (beam.is_tracer || victim->alive() || corpse == -1 || corpse == NON_ITEM) @@ -1960,8 +1960,8 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item, || ammo_brand == SPMSL_PENETRATION)); const bool silver = (ammo_brand == SPMSL_SILVER); const bool disperses = (ammo_brand == SPMSL_DISPERSAL); - const bool shadow = (bow_brand == SPWPN_SHADOW - || ammo_brand == SPMSL_SHADOW); + const bool reaping = (bow_brand == SPWPN_REAPING + || ammo_brand == SPMSL_REAPING); ASSERT(!exploding || !is_artefact(item)); @@ -2026,12 +2026,12 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item, beam.hit_funcs.push_back(_poison_hit_victim); if (penetrating) beam.range_funcs.push_back(_item_penetrates_victim); - if (shadow) - beam.hit_funcs.push_back(_shadow_hit_victim); + if (reaping) + beam.hit_funcs.push_back(_reaping_hit_victim); if (disperses) beam.hit_funcs.push_back(_dispersal_hit_victim); - if (shadow && ammo.special != SPMSL_SHADOW) + if (reaping && ammo.special != SPMSL_REAPING) { beam.name = "shadowy " + beam.name; ammo_name = "shadowy " + ammo_name; @@ -2126,7 +2126,7 @@ static bool determines_ammo_brand(int bow_brand, int ammo_brand) return (false); if (bow_brand == SPWPN_PENETRATION && ammo_brand == SPMSL_PENETRATION) return (false); - if (bow_brand == SPWPN_SHADOW && ammo_brand == SPMSL_SHADOW) + if (bow_brand == SPWPN_REAPING && ammo_brand == SPMSL_REAPING) return (false); return (true); @@ -2948,10 +2948,10 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, bow_brand == SPWPN_CHAOS || ammo_brand_known); } - if (ammo_brand == SPMSL_SHADOW || bow_brand == SPWPN_SHADOW) + if (ammo_brand == SPMSL_REAPING || bow_brand == SPWPN_REAPING) { did_god_conduct(DID_NECROMANCY, 2, - bow_brand == SPWPN_SHADOW || ammo_brand_known); + bow_brand == SPWPN_REAPING || ammo_brand_known); } if (did_return) |