diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-27 14:42:51 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-27 14:42:51 +0000 |
| commit | 0170380fc1cb73405bc5825a29b044c0ae841057 (patch) | |
| tree | c4a4eb0e2195f1af54ddc12ac4f88e9b4cee1997 /crawl-ref/source/xom.cc | |
| parent | 5468cabfd9554065e7548c277bff43f3af5128d8 (diff) | |
| download | crawl-ref-0170380fc1cb73405bc5825a29b044c0ae841057.tar.gz crawl-ref-0170380fc1cb73405bc5825a29b044c0ae841057.zip | |
Clean up handling of Xom's mixed-group hostilities.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3899 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 962e612d02..f1061bc8de 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -517,11 +517,11 @@ static bool xom_is_good(int sever) you.pet_target, MONS_PROGRAM_BUG); } - if (numdifferent != numdemons && numdifferent > 0) + if (numdifferent != numdemons && numdifferent > 0 && hostiletype != 0) { for (int i = 0; i < numdemons; ++i) { - if (summons[i] != -1 && hostiletype != 0) + if (summons[i] != -1) { monsters *mon = &menv[i]; const bool is_demonic = (mons_holiness(mon) == MH_DEMONIC); |