diff options
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/spells4.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 1b7ad4635c..4e770949ab 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -5359,9 +5359,10 @@ int monsters::hurt(const actor *agent, int amount, beam_type flavour, else { monster_die(this, KILL_MON, - monster_index( dynamic_cast<const monsters*>(agent) )); + monster_index(dynamic_cast<const monsters*>(agent))); } } + return (amount); } diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 4c498f0def..c727e0ce6c 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -6893,7 +6893,7 @@ static void _handle_monster_move(int i, monsters *monster) } if (monster->type != -1 && monster->hit_points < 1) - monster_die(monster, KILL_MISC, NON_MONSTER); + monster_die(monster, KILL_MISC, NON_MONSTER); } //--------------------------------------------------------------- @@ -7317,6 +7317,7 @@ void mons_check_pool(monsters *mons, const coord_def &oldpos, killer = KILL_MON; killnum = monster_index(mons); } + monster_die(mons, killer, killnum, true); } } diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index f53ee2db66..95404a97bf 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -2013,7 +2013,8 @@ bool cast_fragmentation(int pow, const dist& spd) // If damage dice are zero we assume that nothing happened at all. canned_msg(MSG_SPELL_FIZZLES); } - return true; + + return (true); } void cast_twist(int pow) |