summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-25 18:49:20 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-25 18:49:20 +0000
commit3729bb7d83361ee5032dcc513e5740da08798be6 (patch)
tree1b676ae44cd3385717f16b2601016b3083feea2f /crawl-ref
parent56fb5e29c0232b3f7263f80a7e4075c286216efc (diff)
downloadcrawl-ref-3729bb7d83361ee5032dcc513e5740da08798be6.tar.gz
crawl-ref-3729bb7d83361ee5032dcc513e5740da08798be6.zip
Removed oklob nonbrandability, since we visibly distinguish them anyway.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1369 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/makeitem.cc7
-rw-r--r--crawl-ref/source/makeitem.h7
-rw-r--r--crawl-ref/source/mon-util.cc4
3 files changed, 14 insertions, 4 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 7137a31c70..e0ea2b9e14 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1,3 +1,10 @@
+/*
+ * File: makeitem.cc
+ * Summary: Item creation routines.
+ *
+ * Modified for Crawl Reference by $Author: haranp $ on $Date: 2007-03-15T20:10:20.648083Z $
+ */
+
#include "AppHdr.h"
#include "enum.h"
diff --git a/crawl-ref/source/makeitem.h b/crawl-ref/source/makeitem.h
index e672f8f262..d0f1236034 100644
--- a/crawl-ref/source/makeitem.h
+++ b/crawl-ref/source/makeitem.h
@@ -1,3 +1,10 @@
+/*
+ * File: makeitem.h
+ * Summary: Item creation routines.
+ *
+ * Modified for Crawl Reference by $Author: haranp $ on $Date: 2007-03-15T20:10:20.648083Z $
+ */
+
#ifndef MAKEITEM_H
#define MAKEITEM_H
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 35d968eb6e..9335ab5e1d 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1773,10 +1773,7 @@ bool mons_is_known_mimic(const monsters *m)
bool mons_looks_stabbable(const monsters *m)
{
- // Make sure oklob plants are never highlighted. That'll defeat the
- // point of making them look like normal plants.
return (!mons_class_flag(m->type, M_NO_EXP_GAIN)
- && m->type != MONS_OKLOB_PLANT
&& !mons_is_mimic(m->type)
&& !mons_is_statue(m->type)
&& !mons_friendly(m)
@@ -1786,7 +1783,6 @@ bool mons_looks_stabbable(const monsters *m)
bool mons_looks_distracted(const monsters *m)
{
return (!mons_class_flag(m->type, M_NO_EXP_GAIN)
- && m->type != MONS_OKLOB_PLANT
&& !mons_is_mimic(m->type)
&& !mons_is_statue(m->type)
&& !mons_friendly(m)