summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/losparam.cc
diff options
context:
space:
mode:
authorMark Mackey <atomjack@users.sourceforge.net>2010-05-05 13:38:55 +0100
committerMark Mackey <atomjack@users.sourceforge.net>2010-05-05 13:38:55 +0100
commit6b5ecca7665ce73888ea0650e6ea5ab0b6a472a6 (patch)
treeb883ed587fe0a16da6a839f8d7f98cd9c9897ddc /crawl-ref/source/losparam.cc
parenta1123dc70059adb0f59ec2ce444355246d46d2a3 (diff)
downloadcrawl-ref-6b5ecca7665ce73888ea0650e6ea5ab0b6a472a6.tar.gz
crawl-ref-6b5ecca7665ce73888ea0650e6ea5ab0b6a472a6.zip
Merge of the original myzotdef branch into the Crawl 0.6
release branch. Quite a few edits required...
Diffstat (limited to 'crawl-ref/source/losparam.cc')
-rw-r--r--crawl-ref/source/losparam.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/losparam.cc b/crawl-ref/source/losparam.cc
index dd60a26ae8..ae41bb6233 100644
--- a/crawl-ref/source/losparam.cc
+++ b/crawl-ref/source/losparam.cc
@@ -11,6 +11,7 @@
#include "env.h"
#include "externs.h"
#include "mon-util.h"
+#include "state.h"
#include "terrain.h"
opacity_type opacity_default::operator()(const coord_def& p) const
@@ -54,6 +55,10 @@ static bool mons_block_immob(const monsters* mons)
if (mons == NULL)
return false;
+ // In Zotdef, plants don't block movement as critters
+ // will attack them
+ if (game_is_zotdef()) return (false);
+
switch (mons->id())
{
case MONS_BUSH: