diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/mon-clone.cc | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-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/mon-clone.cc')
| -rw-r--r-- | crawl-ref/source/mon-clone.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-clone.cc b/crawl-ref/source/mon-clone.cc index 5ca4445a50..7ed7f30a45 100644 --- a/crawl-ref/source/mon-clone.cc +++ b/crawl-ref/source/mon-clone.cc @@ -27,10 +27,10 @@ #include "transform.h" #include "view.h" -const std::string clone_master_key = "mcloneorig"; -const std::string clone_slave_key = "mclonedupe"; +const string clone_master_key = "mcloneorig"; +const string clone_slave_key = "mclonedupe"; -static std::string _monster_clone_id_for(monster* mons) +static string _monster_clone_id_for(monster* mons) { return make_stringf("%s%d", mons->name(DESC_PLAIN, true).c_str(), @@ -42,7 +42,7 @@ static bool _monster_clone_exists(monster* mons) if (!mons->props.exists(clone_master_key)) return false; - const std::string clone_id = mons->props[clone_master_key].get_string(); + const string clone_id = mons->props[clone_master_key].get_string(); for (monster_iterator mi; mi; ++mi) { monster* thing(*mi); @@ -102,7 +102,7 @@ static void _mons_summon_monster_illusion(monster* caster, bool cloning_visible = false; if (monster *clone = clone_mons(foe, true, &cloning_visible)) { - const std::string clone_id = _monster_clone_id_for(foe); + const string clone_id = _monster_clone_id_for(foe); clone->props[clone_slave_key] = clone_id; foe->props[clone_master_key] = clone_id; mons_add_blame(clone, |