diff options
| author | Charles Otto <ottochar@gmail.com> | 2009-11-13 01:12:37 -0500 |
|---|---|---|
| committer | Charles Otto <ottochar@gmail.com> | 2009-11-13 01:12:37 -0500 |
| commit | ca7c789cfc9b71a331e06891c084e254c749d9be (patch) | |
| tree | 2ad4f2de1e82c0179a715563095f04a9911c0e7c | |
| parent | e7d888537c4d178a98e2ef1727a84d5132655d6c (diff) | |
| download | crawl-ref-ca7c789cfc9b71a331e06891c084e254c749d9be.tar.gz crawl-ref-ca7c789cfc9b71a331e06891c084e254c749d9be.zip | |
Fix a couple compile errors caused by the merge.
| -rw-r--r-- | crawl-ref/source/mon-abil.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 8 |
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. |