summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-13 20:40:39 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-13 20:40:39 +0000
commit9fecb788095cc5315ef5f1485e0b736563a21460 (patch)
tree4dd717741b428607d8b91ce4a5dd05044c2e0d2f /crawl-ref/source/fight.cc
parentcab797009b47f77520b8db9f8b427ba9ea14f63c (diff)
downloadcrawl-ref-9fecb788095cc5315ef5f1485e0b736563a21460.tar.gz
crawl-ref-9fecb788095cc5315ef5f1485e0b736563a21460.zip
* Add stair repelling as a bad Xom effect.
* Experimentally make tension increase the odds for good effects. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9600 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index f673ba2435..0bbd1a3158 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -66,6 +66,7 @@ REVISION("$Rev$");
#define NOTE_DEBUG_CHAOS_EFFECTS
#endif
+#define NOTE_DEBUG_CHAOS_EFFECTS
#ifdef NOTE_DEBUG_CHAOS_EFFECTS
#include "notes.h"
#endif
@@ -2934,8 +2935,8 @@ int melee_attack::random_chaos_brand()
}
break;
case SPWPN_CONFUSE:
- if (defender->holiness() != MH_NONLIVING
- && defender->holiness() != MH_PLANT)
+ if (defender->holiness() == MH_NONLIVING
+ || defender->holiness() == MH_PLANT)
{
susceptible = false;
}