diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-31 16:13:29 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-31 16:13:29 +0000 |
| commit | c41c9b094a552b13d12d40241dc230ac9083bac2 (patch) | |
| tree | c45731e24699dfe574823d9effefe5727c9ba293 /crawl-ref/source/transfor.cc | |
| parent | 6bc76233dd44862268b48596d0c8fe5a17eb5a89 (diff) | |
| download | crawl-ref-c41c9b094a552b13d12d40241dc230ac9083bac2.tar.gz crawl-ref-c41c9b094a552b13d12d40241dc230ac9083bac2.zip | |
Apply the recent commits to branch, update the version and change log to
0.4.3.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6740 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/transfor.cc')
| -rw-r--r-- | crawl-ref/source/transfor.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 77a578a875..af37ccf225 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -328,8 +328,13 @@ bool transform(int pow, transformation_type which_trans, bool quiet) 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[] = { |