summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-07 13:41:42 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-07 13:41:42 +0000
commit3baafdfd73195fe83b6d9a1d6669ce61faefbe2f (patch)
tree33f9c8984111e0f6b0abd2dd39847ae1ebdd4449 /crawl-ref
parentf5f3f0566070ae3f5ff1d6155025f847fb2dec03 (diff)
downloadcrawl-ref-3baafdfd73195fe83b6d9a1d6669ce61faefbe2f.tar.gz
crawl-ref-3baafdfd73195fe83b6d9a1d6669ce61faefbe2f.zip
[1808631] PCs in statue-form should not be able to scramble out of deep water.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2357 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/misc.cc2
-rw-r--r--crawl-ref/source/terrain.cc6
2 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index b5321d13a1..f965824c36 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1416,6 +1416,8 @@ std::string weird_writing()
bool scramble(void)
{
+ if (you.attribute[ATTR_TRANSFORMATION] == TRAN_STATUE)
+ return (false);
int max_carry = carrying_capacity();
if ((max_carry / 2) + random2(max_carry / 2) <= you.burden)
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 7611b3af25..f28062d5e2 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -29,6 +29,7 @@
#include "religion.h"
#include "spells3.h"
#include "stuff.h"
+#include "transfor.h"
#include "view.h"
bool grid_is_wall( dungeon_feature_type grid )
@@ -513,7 +514,10 @@ bool fall_into_a_pool( int entry_x, int entry_y, bool allow_shift,
}
else
{
- mpr("You try to escape, but your burden drags you down!");
+ if (you.attribute[ATTR_TRANSFORMATION] == TRAN_STATUE)
+ mpr("You sink like a stone!");
+ else
+ mpr("You try to escape, but your burden drags you down!");
}
if (escape)