diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-29 19:16:59 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-29 19:19:00 -0500 |
commit | 3ee3c36bb7013cfe25662410b075afafd229d019 (patch) | |
tree | 42523b3d8e488ca8f7568f41dd2c3e4fce71173f /crawl-ref/source/fight.cc | |
parent | 0b6632423e2e7abd23cf84aae60812648c586016 (diff) | |
download | crawl-ref-3ee3c36bb7013cfe25662410b075afafd229d019.tar.gz crawl-ref-3ee3c36bb7013cfe25662410b075afafd229d019.zip |
When using items that can directly turn monsters to zombies (weapons of
shadows or chaos) as a good god worshipper, ensure that the "turns into
a zombie" message always comes before the "enraged by your holy aura"
message.
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r-- | crawl-ref/source/fight.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index f6399bd8a7..ee0d6cb880 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2770,7 +2770,7 @@ static bool _make_zombie(monsters* mon, int corpse_class, int corpse_index, mitm[last_item].link = idx; animate_remains(mon->pos(), CORPSE_BODY, mon->behaviour, - mon->foe, mon->god, true, true, &zombie_index); + mon->foe, mon->god, true, true, true, &zombie_index); } // No equipment to get, or couldn't get it for some reason. @@ -2781,7 +2781,7 @@ static bool _make_zombie(monsters* mon, int corpse_class, int corpse_index, zombie_index = create_monster( mgen_data(type, mon->behaviour, 0, 0, mon->pos(), mon->foe, MG_FORCE_PLACE, mon->god, - (monster_type) mon->type, mon->number)); + mon->type, mon->number)); } if (zombie_index == -1) @@ -2809,6 +2809,8 @@ static bool _make_zombie(monsters* mon, int corpse_class, int corpse_index, autotoggle_autopickup(false); } + player_angers_monster(zombie); + return (true); } |