summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/melee_attack.h
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/melee_attack.h
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz
crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts with the STL function to compare 2 iterators. Not a bad change given how it returns the square of the distance anyway. I also had to rename the message global variable (in message.cc) to buffer. I tried to fix and improve the coding style has much as I could, but I probably missed a few given how huge and tedious it is. I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
-rw-r--r--crawl-ref/source/melee_attack.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h
index 879e686868..020cf7011f 100644
--- a/crawl-ref/source/melee_attack.h
+++ b/crawl-ref/source/melee_attack.h
@@ -130,8 +130,8 @@ private:
private:
// Monster-attack specific stuff
void mons_apply_attack_flavour();
- std::string mons_attack_verb();
- std::string mons_attack_desc();
+ string mons_attack_verb();
+ string mons_attack_desc();
// TODO: Unify do_poison and poison_monster
void mons_do_poison();
void mons_do_napalm();
@@ -165,7 +165,7 @@ private:
random_var player_weapon_speed();
random_var player_unarmed_speed();
void player_announce_aux_hit();
- std::string player_why_missed();
+ string player_why_missed();
void player_warn_miss();
void player_weapon_upsets_god();
void _defender_die();