diff options
| author | Stefan O'Rear <stefanor@cox.net> | 2009-11-12 03:52:08 -0800 |
|---|---|---|
| committer | Stefan O'Rear <stefanor@cox.net> | 2009-11-12 03:53:13 -0800 |
| commit | 078019644214628520c8116a9b4a16f30d8fadf2 (patch) | |
| tree | df1fc93d35c6b39455445360e482be5c26e1e2ac /crawl-ref/source/effects.cc | |
| parent | 7f502e207784d2c33ab38079dadfa298ab9fafc6 (diff) | |
| download | crawl-ref-078019644214628520c8116a9b4a16f30d8fadf2.tar.gz crawl-ref-078019644214628520c8116a9b4a16f30d8fadf2.zip | |
Add summoner and non_actor_summoner to mgen_data
Monsters now know who summoned them. This will be important later.
Probably breaks something; saves are not one of them.
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 64bf8dce2b..f74729b323 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -2860,7 +2860,7 @@ static void _hell_effects() if (summon_instead) { create_monster( - mgen_data::hostile_at(which_beastie, + mgen_data::hostile_at(which_beastie, "the effects of Hell", true, 0, 0, you.pos())); } else @@ -2882,6 +2882,7 @@ static void _hell_effects() mgen_data mg; mg.pos = you.pos(); mg.foe = MHITYOU; + mg.non_actor_summoner = "the effects of Hell"; create_monster(mg); for (int i = 0; i < 4; ++i) @@ -3936,8 +3937,9 @@ void handle_time(long time_delta) || monster_at(newpos) || env.cgrid(newpos) != EMPTY_CLOUD); - mgen_data mg(MONS_JELLY, BEH_STRICT_NEUTRAL, 0, 0, newpos, + mgen_data mg(MONS_JELLY, BEH_STRICT_NEUTRAL, 0, 0, 0, newpos, MHITNOT, 0, GOD_JIYVA); + mg.non_actor_summoner = "Jiyva"; if (create_monster(mg) != -1) success = true; @@ -4445,7 +4447,7 @@ static int _mushroom_ring(item_def &corpse, int & seen_count, return (0); mgen_data temp(MONS_TOADSTOOL, - toadstool_behavior, 0, 0, + toadstool_behavior, 0, 0, 0, coord_def(), MHITNOT, MG_FORCE_PLACE, @@ -4541,6 +4543,7 @@ int spawn_corpse_mushrooms(item_def &corpse, toadstool_behavior, 0, 0, + 0, current, MHITNOT, MG_FORCE_PLACE, |