diff options
author | Luca Barbieri <luca@luca-barbieri.com> | 2010-06-07 21:42:03 +0200 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2010-06-14 11:15:39 +0200 |
commit | 30a025b99c54b9cd2dbdecd9c5f24aee4999a132 (patch) | |
tree | 6fcfd6843416f18182fb484c1c9fb299f69226c6 /crawl-ref/source/mgen_data.h | |
parent | cc1af4b350d76034283889ec7816558170c15868 (diff) | |
download | crawl-ref-30a025b99c54b9cd2dbdecd9c5f24aee4999a132.tar.gz crawl-ref-30a025b99c54b9cd2dbdecd9c5f24aee4999a132.zip |
shut up some clang warnings
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/mgen_data.h')
-rw-r--r-- | crawl-ref/source/mgen_data.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h index 064a3e5595..fa08c8069b 100644 --- a/crawl-ref/source/mgen_data.h +++ b/crawl-ref/source/mgen_data.h @@ -155,26 +155,26 @@ struct mgen_data static mgen_data sleeper_at(monster_type what, const coord_def &where, - unsigned flags = 0) + unsigned nflags = 0) { - return mgen_data(what, BEH_SLEEP, 0, 0, 0, where, MHITNOT, flags); + return mgen_data(what, BEH_SLEEP, 0, 0, 0, where, MHITNOT, nflags); } static mgen_data hostile_at(monster_type mt, - std::string summoner, + std::string nsummoner, bool alert = false, int abj = 0, int st = 0, const coord_def &p = coord_def(-1, -1), unsigned monflags = 0, - god_type god = GOD_NO_GOD, + god_type ngod = GOD_NO_GOD, monster_type base = MONS_NO_MONSTER) { return mgen_data(mt, BEH_HOSTILE, 0, abj, st, p, alert ? MHITYOU : MHITNOT, - monflags, god, base, 0, BLACK, you.absdepth0, - PROX_ANYWHERE, you.level_type, 0, 0, 0, "", summoner); + monflags, ngod, base, 0, BLACK, you.absdepth0, + PROX_ANYWHERE, you.level_type, 0, 0, 0, "", nsummoner); } }; |