diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-28 03:22:47 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-28 03:22:47 +0000 |
| commit | e4aa14aed90758b647b415d5b4eae7eb5238c244 (patch) | |
| tree | 6a884592b34a6004f0f5161b23f827d110c0e502 /crawl-ref | |
| parent | 7c63df66a7271a34cb7b69729892273d833f40fb (diff) | |
| download | crawl-ref-e4aa14aed90758b647b415d5b4eae7eb5238c244.tar.gz crawl-ref-e4aa14aed90758b647b415d5b4eae7eb5238c244.zip | |
Fix the summoning used by the reinforcement blessing, so that collateral
kills are properly accepted from such reinforcements (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3906 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 557cc8ec6b..0f7eedeaae 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -1689,7 +1689,7 @@ int create_monster( int cls, int dur, beh_type beha, int cr_x, int cr_y, if (!force_behaviour && player_angers_monster(creation)) beha = BEH_HOSTILE; - + if (beha == BEH_CHARMED) { creation->attitude = ATT_HOSTILE; diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 63211593b6..c29be500bc 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -776,7 +776,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) monster->x, monster->y, 1 + random2(3), monster->kill_alignment() ); } - + switch (killer) { case KILL_YOU: /* You kill in combat. */ diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index bc4558ecc7..f4c94c9371 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -770,7 +770,7 @@ static bool blessing_reinforcements(void) followers[random2(ARRAYSIZE(followers))]; return (create_monster(follower_type, 0, BEH_GOD_GIFT, you.x_pos, - you.y_pos, you.pet_target, MONS_PROGRAM_BUG, true) != -1); + you.y_pos, you.pet_target, MONS_PROGRAM_BUG) != -1); } static bool blessing_priesthood(monsters* mon) |