diff options
author | Chris Campbell <chriscampbell89@gmail.com> | 2014-03-28 07:16:03 +0000 |
---|---|---|
committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-03-28 07:16:03 +0000 |
commit | 2682ccd044a9bd98ba31f1903408e281b54d64f0 (patch) | |
tree | 6f0e9ba2760f433b43444cec61742f3389608d82 /crawl-ref/source/transform.cc | |
parent | 21463cad35aa657b33c466cc8e0d3ee9e51e7a96 (diff) | |
download | crawl-ref-2682ccd044a9bd98ba31f1903408e281b54d64f0.tar.gz crawl-ref-2682ccd044a9bd98ba31f1903408e281b54d64f0.zip |
Fix some transformations aborting silently on failure
Willing transformations should display the failure messages to explain
why they're failing. Removes an unnecessary message from lignification.
Diffstat (limited to 'crawl-ref/source/transform.cc')
-rw-r--r-- | crawl-ref/source/transform.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc index c399b22f60..aabe0fdf72 100644 --- a/crawl-ref/source/transform.cc +++ b/crawl-ref/source/transform.cc @@ -758,16 +758,13 @@ bool transform(int pow, transformation_type which_trans, bool involuntary, if (you.transform_uncancellable) { - // Jiyva's wrath-induced transformation is blocking the attempt. - // May need to be updated if transform_uncancellable is used for - // other uses. - if (!just_check) + if (!involuntary) mpr("You are stuck in your current form!"); return false; } if (!_transformation_is_safe(which_trans, env.grid(you.pos()), - involuntary || just_check)) + involuntary)) { return false; } |