diff options
| author | mark <mark@ubuntu.(none)> | 2010-11-10 18:56:05 +0000 |
|---|---|---|
| committer | Mark Mackey <mark@swallowtail.org> | 2010-11-10 21:23:33 +0000 |
| commit | 2eb4bbe48fd1767ff147725d0606d6702076e1eb (patch) | |
| tree | 99974c03ced3ec91810faa96b1e718ba9285e348 /crawl-ref/source/losparam.cc | |
| parent | a2e8e47f6452e66a34595478ae625fdf8f775313 (diff) | |
| parent | 4080d7d1ebf51243d9da41fc2b10790858bb6bc7 (diff) | |
| download | crawl-ref-2eb4bbe48fd1767ff147725d0606d6702076e1eb.tar.gz crawl-ref-2eb4bbe48fd1767ff147725d0606d6702076e1eb.zip | |
Merge branch 'zotdef-0.6' into zotdef-master
Much manual merging, and a few fixes for changes in the code (particularly
monsters->monster and the like). Now compiles and seems to work. Zot Def
added to start menu.
Diffstat (limited to 'crawl-ref/source/losparam.cc')
| -rw-r--r-- | crawl-ref/source/losparam.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/losparam.cc b/crawl-ref/source/losparam.cc index c77cfa9676..005b8753b1 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 monster* mons) if (mons == NULL) return false; + // In Zotdef, plants don't block movement as critters + // will attack them + if (crawl_state.game_is_zotdef()) return (false); + switch (mons->id()) { case MONS_BUSH: |