diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2011-08-07 19:01:21 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2011-08-07 19:33:13 -0500 |
| commit | 9eac88396738d476f21a5ca89a00443b1052d9d9 (patch) | |
| tree | 67b596cebcedbb186031314f4d9eed4550fd5e85 /crawl-ref/source/spl-wpnench.cc | |
| parent | 9210185d7efa84723f91df15af5a09f79fbaf075 (diff) | |
| download | crawl-ref-9eac88396738d476f21a5ca89a00443b1052d9d9.tar.gz crawl-ref-9eac88396738d476f21a5ca89a00443b1052d9d9.zip | |
Consolidate your_hand() into player::hand_name().
This avoids two interfaces for the same function, and is consistent with
player::arm_name() and the like.
Also, fix some inconsistencies with player transformations and
player::foot_name().
Diffstat (limited to 'crawl-ref/source/spl-wpnench.cc')
| -rw-r--r-- | crawl-ref/source/spl-wpnench.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-wpnench.cc b/crawl-ref/source/spl-wpnench.cc index 361a9d1822..63c2c0bb59 100644 --- a/crawl-ref/source/spl-wpnench.cc +++ b/crawl-ref/source/spl-wpnench.cc @@ -13,7 +13,6 @@ #include "itemprop.h" #include "makeitem.h" #include "message.h" -#include "misc.h" #include "shout.h" #include "skills2.h" @@ -220,7 +219,7 @@ spret_type brand_weapon(brand_type which_brand, int power, bool fail) break; case SPWPN_RETURNING: - msg += " wiggles in your " + your_hand(false) + "."; + msg += " wiggles in your " + you.hand_name(false) + "."; duration_affected = 5; break; @@ -250,7 +249,7 @@ spret_type brand_weapon(brand_type which_brand, int power, bool fail) spret_type cast_confusing_touch(int power, bool fail) { fail_check(); - msg::stream << "Your " << your_hand(true) << " begin to glow " + msg::stream << "Your " << you.hand_name(true) << " begin to glow " << (you.duration[DUR_CONFUSING_TOUCH] ? "brighter" : "red") << "." << std::endl; |