diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
| commit | 1d0f57cbceb778139ca215cc4fcfd1584951f6dd (patch) | |
| tree | cafd60c944c51fcce778aa5d6912bc548c518339 /crawl-ref/source/monspeak.cc | |
| parent | 6f5e187a9e5cd348296dba2fd89d2e206e775a01 (diff) | |
| download | crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.tar.gz crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.zip | |
Merged stone_soup r15:451 into trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monspeak.cc')
| -rw-r--r-- | crawl-ref/source/monspeak.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index 09b348867d..c8899f0528 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -2,6 +2,8 @@ * File: monspeak.cc * Summary: Functions to handle speaking monsters * + * Modified for Crawl Reference by $Author$ on $Date$ + * * Change History (most recent first): * * <1> 01/09/00 BWR Created @@ -114,7 +116,7 @@ bool mons_speaks(struct monsters *monster) if (mons_has_ench(monster, ENCH_CONFUSION)) { - if (mons_holiness( monster->type ) == MH_DEMONIC + if (mons_holiness( monster ) == MH_DEMONIC && monster->type != MONS_IMP) { return (false); @@ -259,7 +261,7 @@ bool mons_speaks(struct monsters *monster) } else if (monster->behaviour == BEH_FLEE) { - if (mons_holiness( monster->type ) == MH_DEMONIC + if (mons_holiness( monster ) == MH_DEMONIC && monster->type != MONS_IMP) { return (false); @@ -378,7 +380,7 @@ bool mons_speaks(struct monsters *monster) } else if (mons_friendly(monster)) { - if (mons_holiness( monster->type ) == MH_DEMONIC + if (mons_holiness( monster ) == MH_DEMONIC && monster->type != MONS_IMP) { return (false); @@ -1289,7 +1291,7 @@ bool mons_speaks(struct monsters *monster) break; case 11: strcat(info, - " says, \"I love to fight, but killing is better.\""); + " says, \"I love to fight, but killing is better.\""); break; } break; // end Erica @@ -2115,7 +2117,7 @@ bool mons_speaks(struct monsters *monster) switch (random2(13)) { case 0: - strcat(info, " roars, \"DIE, PUNY ONE!\""); + strcat(info, " roars, \"DIE, PUNY ONE!\""); break; case 1: strcat(info, " growls, \"YOU BORE ME SO.\""); |