diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-19 02:32:59 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-19 02:32:59 +0000 |
| commit | 6b01578aea5d2f44172181e9aacd65d068e21a58 (patch) | |
| tree | 9113de232a208eba5b86e82b3874060203ffd118 /crawl-ref/source/mon-util.cc | |
| parent | a0946957cc584681cae95fa525b0a965893b1404 (diff) | |
| download | crawl-ref-6b01578aea5d2f44172181e9aacd65d068e21a58.tar.gz crawl-ref-6b01578aea5d2f44172181e9aacd65d068e21a58.zip | |
Add various god gift-related cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5966 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 57e71996b2..620b0e30ec 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -497,14 +497,6 @@ bool mons_is_native_in_branch(const monsters *monster, } } -bool mons_is_god_gift(const monsters *mon, god_type god) -{ - if (god == GOD_NO_GOD) - return (false); - - return (mon->god == god); -} - bool mons_is_chaotic(const monsters *mon) { if (mon->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER)) @@ -5281,11 +5273,10 @@ void monsters::remove_enchantment_effect(const mon_enchant &me, bool quiet) case ENCH_SHORT_LIVED: add_ench(mon_enchant(ENCH_ABJ)); - // Just for flavour. - if (mons_is_god_gift(this) && this->has_ench(ENCH_BERSERK)) + if (this->has_ench(ENCH_BERSERK)) simple_monster_message(this, " is no longer berserk."); - monster_die( this, quiet ? KILL_DISMISSED : KILL_RESET, 0 ); + monster_die(this, quiet ? KILL_DISMISSED : KILL_RESET, 0); break; case ENCH_SUBMERGED: |