summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mgen_data.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-01-09 05:18:45 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-01-09 05:34:45 +0100
commit65ebe5074a80b306431a4aeb327786dd67a4f571 (patch)
treed5d72cae333543f3d8d525fc090a8ba87b936e1c /crawl-ref/source/mgen_data.h
parent42b86009589fb96235b2d4c93b96c2d9b7fc81c9 (diff)
parent7338b153fd2a51dd9e60053311723573329c39e2 (diff)
downloadcrawl-ref-65ebe5074a80b306431a4aeb327786dd67a4f571.tar.gz
crawl-ref-65ebe5074a80b306431a4aeb327786dd67a4f571.zip
Merge branch 'master' into mon-pick
Diffstat (limited to 'crawl-ref/source/mgen_data.h')
-rw-r--r--crawl-ref/source/mgen_data.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h
index e7ca20bf42..c16145452e 100644
--- a/crawl-ref/source/mgen_data.h
+++ b/crawl-ref/source/mgen_data.h
@@ -28,7 +28,7 @@ struct mgen_data
// Who summoned this monster? Important to know for death accounting
// and the summon cap, if and when it goes in. NULL is no summoner.
- actor* summoner;
+ const actor* summoner;
// For summoned monsters, this is a measure of how long the summon will
// hang around, on a scale of 1-6, 6 being longest. Use 0 for monsters
@@ -114,7 +114,7 @@ struct mgen_data
mgen_data(monster_type mt = RANDOM_MONSTER,
beh_type beh = BEH_HOSTILE,
- actor* sner = 0,
+ const actor* sner = 0,
int abj = 0,
int st = 0,
const coord_def &p = coord_def(-1, -1),