diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 17:18:19 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 17:18:19 +0100 |
| commit | 2d0488338ac2a0388167c9e8b73766ae8af1e8d4 (patch) | |
| tree | c92aa786daa5e2f0782de9234d70fcb0fdfaf700 /crawl-ref/source/mgen_data.h | |
| parent | 177cfa8d1158dd7c2ed8c995cf1ee706f1492f80 (diff) | |
| parent | 59910180e554e796fe4a8b1f095f88dccbe0ac89 (diff) | |
| download | crawl-ref-2d0488338ac2a0388167c9e8b73766ae8af1e8d4.tar.gz crawl-ref-2d0488338ac2a0388167c9e8b73766ae8af1e8d4.zip | |
Merge branch 'master' into mon-pick
Merge commits instead of rerere suck, but not being able to comfortably use
the test rig sucks even more.
Diffstat (limited to 'crawl-ref/source/mgen_data.h')
| -rw-r--r-- | crawl-ref/source/mgen_data.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h index f5cef88942..e7ca20bf42 100644 --- a/crawl-ref/source/mgen_data.h +++ b/crawl-ref/source/mgen_data.h @@ -3,7 +3,6 @@ #include "coord.h" #include "mgen_enum.h" -#include "player.h" // Hash key for passing a weapon to be given to // a dancing weapon. @@ -101,11 +100,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; @@ -129,8 +128,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), @@ -166,7 +165,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, |