Revert holy beings' being enraged by players worshipping neutral gods,

and Xom's forcing their behavior, as the latter also holds for demons, 
and that's inconsistent with the spells Xom can make you cast.  I guess 
that, in the former case, the holy beings you summon can also be fallen 
or exiled?


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

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 6267c7d4f1..b18f38e739 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -526,7 +526,7 @@ static bool xom_is_good(int sever)
             summons[i] =
                 create_monster(
                     mgen_data(mon, BEH_GOD_GIFT, 3,
-                              you.pos(), you.pet_target, MG_FORCE_BEH));
+                              you.pos(), you.pet_target));
 
             if (summons[i] != -1)
                 success = true;
@@ -615,7 +615,7 @@ static bool xom_is_good(int sever)
 
         if (create_monster(
                 mgen_data(mon, beha, 6,
-                          you.pos(), hitting, MG_FORCE_BEH)) != -1)
+                          you.pos(), hitting)) != -1)
         {
             if (different)
                 god_speaks(GOD_XOM, _get_xom_speech("single holy summon"));
@@ -702,7 +702,7 @@ static bool xom_is_good(int sever)
 
         if (create_monster(
                 mgen_data(xom_random_demon(sever, one_chance_in(8)), beha, 0,
-                          you.pos(), hitting, MG_FORCE_BEH)) != -1)
+                          you.pos(), hitting)) != -1)
         {
             if (different)
                 god_speaks(GOD_XOM, _get_xom_speech("single major holy summon"));