Add a few last Beogh-related cleanups. As part of this, move the check

for an orcish follower into its own function, so that it can eventually 
be used for blessing followers.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3715 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 5 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index f93d3d8016..be7e5602c4 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3779,8 +3779,8 @@ static int affect_monster(bolt &beam, monsters *mon)
                     did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, true, mon );
 
                 if (you.religion == GOD_BEOGH && mons_species(mon->type) == MONS_ORC
-                    && mon->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
-                    && !player_under_penance() && you.piety >= piety_breakpoint(2))
+                    && mon->behaviour == BEH_SLEEP && !player_under_penance()
+                    && you.piety >= piety_breakpoint(2) && mons_near(mon))
                 {
                     hit_woke_orc = true;
                 }
@@ -3949,9 +3949,9 @@ static int affect_monster(bolt &beam, monsters *mon)
         }
 
         if (you.religion == GOD_BEOGH && mons_species(mon->type) == MONS_ORC
-            && mon->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
-            && YOU_KILL(beam.thrower) && !player_under_penance()
-            && you.piety >= piety_breakpoint(2))
+            && mon->behaviour == BEH_SLEEP && YOU_KILL(beam.thrower)
+            && !player_under_penance() && you.piety >= piety_breakpoint(2)
+            && mons_near(mon))
         {
             hit_woke_orc = true;
         }