[crawl-ref-commits] SF.net SVN: crawl-ref:[6736] trunk/crawl-ref/source/transfor.cc

[<ha...@us...>]

Revision: 6736
          http://crawl-ref.svn.sourceforge.net/crawl-ref/?rev=6736&view=rev
Author:   haranp
Date:     2008-07-30 23:31:48 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
Don't discard Stoneskin when using non-conflicting transformations. [2031392]

Modified Paths:
--------------
    trunk/crawl-ref/source/transfor.cc

Modified: trunk/crawl-ref/source/transfor.cc
===================================================================
--- trunk/crawl-ref/source/transfor.cc	2008-07-30 23:12:21 UTC (rev 6735)
+++ trunk/crawl-ref/source/transfor.cc	2008-07-30 23:31:48 UTC (rev 6736)
@@ -328,8 +328,13 @@
         return (false);
     }
 
-    //jmf: Silently discard this enchantment
-    you.duration[DUR_STONESKIN] = 0;
+    // Most transformations conflict with stone skin.
+    if (which_trans != TRAN_NONE
+        && which_trans != TRAN_BLADE_HANDS
+        && which_trans != TRAN_STATUE)
+    {
+        you.duration[DUR_STONESKIN] = 0;
+    }
 
     // We drop everything except jewellery by default.
     equipment_type default_rem[] = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.