summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 19:27:45 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 19:27:45 +0000
commitb3d8365da8efb695a18b85146a4e50ee0e9d7698 (patch)
tree5d26c889e5b71a6d14199170fcb7399573976cf3 /crawl-ref/source/delay.cc
parentf61a531950d1396bfd209007c5f53b399830ff39 (diff)
downloadcrawl-ref-b3d8365da8efb695a18b85146a4e50ee0e9d7698.tar.gz
crawl-ref-b3d8365da8efb695a18b85146a4e50ee0e9d7698.zip
Clean up and consolidate most of the monster pacification routines.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5885 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 81f8aba5ca..eb8268df08 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -198,23 +198,15 @@ static int _recite_to_monsters(int x, int y, int pow, int unused)
}
else
{
- // permanently neutral
- mons->attitude = ATT_NEUTRAL;
- mons->flags |= MF_WAS_NEUTRAL;
-
- // give half of the monster's xp
- unsigned int exp_gain = 0, avail_gain = 0;
- gain_exp( exper_value(mons) / 2 + 1, &exp_gain, &avail_gain );
- mons->flags |= MF_GOT_HALF_XP;
-
simple_monster_message(mons, " seems fully impressed!");
+ mons_pacify(mons);
}
}
break;
}
return (1);
-} // end recite_to_monsters()
+}
static const char* _get_recite_speech(const std::string key, int weight)
{