summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/mon-abil.cc3
-rw-r--r--crawl-ref/source/view.cc8
2 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 9d53edc726..391a48acb4 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -1404,8 +1404,9 @@ void ballisto_on_move(monsters * monster, const coord_def & position)
{
attitude = BEH_GOOD_NEUTRAL;
}
- int rc = create_monster(mgen_data(MONS_BALLISTOMYCETE,
+ int rc = create_monster(mgen_data(MONS_BALLISTOMYCETE,
attitude,
+ monster,
0,
0,
position,
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 648141b7a3..7e64aeaf30 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -133,13 +133,13 @@ void monster_grid_updates()
handle_monster_shouts(*mi);
}
- fedhas_neutralise(monster);
+ fedhas_neutralise(*mi);
if (!mi->visible_to(&you))
continue;
- good_god_follower_attitude_change(monster);
- beogh_follower_convert(monster);
- slime_convert(monster);
+ good_god_follower_attitude_change(*mi);
+ beogh_follower_convert(*mi);
+ slime_convert(*mi);
// XXX: Probably quite hackish. Allows for monsters going berserk when
// they see the player. Currently only used for Duvessa, see the
// function _elven_twin_dies in mon-stuff.cc.