diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-29 01:32:50 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-29 01:32:50 +0000 |
| commit | 7045b35216ec4878d2b8e63c05fed606167ee58b (patch) | |
| tree | 3f6c220471a405bcafce9a3995b5586551b168bd /crawl-ref/source/monstuff.cc | |
| parent | ceb1c2e2b5c916de83891236f0a8e0b4fe6c985d (diff) | |
| download | crawl-ref-7045b35216ec4878d2b8e63c05fed606167ee58b.tar.gz crawl-ref-7045b35216ec4878d2b8e63c05fed606167ee58b.zip | |
Fix [1917601]: Make sure that daevas (as well as other holy beings)
always take their gear with them when they die, instead of dropping it.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3931 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index d19d84e943..c67df32f00 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -658,7 +658,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) !silent && mons_near(monster) && player_monster_visible(monster); bool in_transit = false; const bool hard_reset = testbits(monster->flags, MF_HARD_RESET); - const bool drop_items = !hard_reset; + bool drop_items = !hard_reset; const bool gives_xp = !monster->has_ench(ENCH_ABJ); #ifdef DGL_MILESTONES @@ -839,9 +839,13 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) did_god_conduct(DID_KILL_PRIEST, monster->hit_dice, true, monster); + // Holy beings take their gear with them when they die. if (mons_is_holy(monster)) + { did_god_conduct(DID_KILL_HOLY, monster->hit_dice, true, monster); + drop_items = false; + } if (was_neutral) did_god_conduct(DID_KILL_NEUTRAL, monster->hit_dice, |