summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-30 11:09:14 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-30 11:09:14 +0000
commit92953e0b1151ee987d012c4cd6ba5066f50c9259 (patch)
tree6e16bc88df75b9307d2041d7128dc6906d44c552
parenteb4256db695f6930f160b5bf6cedfaaff712963f (diff)
downloadcrawl-ref-92953e0b1151ee987d012c4cd6ba5066f50c9259.tar.gz
crawl-ref-92953e0b1151ee987d012c4cd6ba5066f50c9259.zip
[1859013] Fixed swamp worms being able to move over dry land.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3151 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/mon-data.h2
-rw-r--r--crawl-ref/source/monstuff.cc5
2 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 19007d3ec5..68df84444f 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3886,7 +3886,7 @@
{
MONS_SWAMP_WORM, 'w', BROWN, "swamp worm",
- M_AMPHIBIOUS,
+ M_NO_FLAGS,
MR_NO_FLAGS,
0, 10, MONS_WORM, MONS_SWAMP_WORM, MH_NATURAL, -3,
{ {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 8f23cf1e8e..528ccfb0c7 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -5093,9 +5093,8 @@ bool mon_can_move_to_pos(const monsters *monster, const int count_x,
if (targ_x < 0 || targ_x >= GXM || targ_y < 0 || targ_y >= GYM)
return false;
- dungeon_feature_type target_grid = grd[targ_x][targ_y];
-
- const int habitat = monster_habitat( monster->type );
+ const dungeon_feature_type target_grid = grd[targ_x][targ_y];
+ const dungeon_feature_type habitat = monster_habitat( monster->type );
// effectively slows down monster movement across water.
// Fire elementals can't cross at all.