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/mgen_data.h | |
| 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/mgen_data.h')
| -rw-r--r-- | crawl-ref/source/mgen_data.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h index 3120a4d2c2..44ffae6fa4 100644 --- a/crawl-ref/source/mgen_data.h +++ b/crawl-ref/source/mgen_data.h @@ -105,11 +105,11 @@ struct mgen_data // These flags are MF_XXX, rather than MG_XXX flags. uint64_t extra_flags; - std::string mname; + string mname; // This is used to account for non-actor summoners. Blasted by an Ice // Fiend ... summoned by the effects of Hell. - std::string non_actor_summoner; + string non_actor_summoner; // This simply stores the initial shape-shifter type. monster_type initial_shifter; @@ -134,8 +134,8 @@ struct mgen_data level_id _place = level_id::current(), int mhd = 0, int mhp = 0, uint64_t extflags = 0, - std::string monname = "", - std::string nas = "", + string monname = "", + string nas = "", monster_type is = RANDOM_MONSTER) : cls(mt), base_type(base), behaviour(beh), summoner(sner), @@ -171,7 +171,7 @@ struct mgen_data } static mgen_data hostile_at(monster_type mt, - std::string nsummoner, + string nsummoner, bool alert = false, int abj = 0, int st = 0, |