diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-10-22 13:26:51 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-10-22 13:28:12 +0200 |
| commit | 07c3f86aeedb2507af07b2d343cc422cb90ffda7 (patch) | |
| tree | 338fcab48f4933b674f0a0155896d6e18303a4cf /crawl-ref/source/transfor.cc | |
| parent | 49870f2bc48989467ea4f8c847fd1274cec73944 (diff) | |
| download | crawl-ref-07c3f86aeedb2507af07b2d343cc422cb90ffda7.tar.gz crawl-ref-07c3f86aeedb2507af07b2d343cc422cb90ffda7.zip | |
Swap transform_cancellable into transform_uncancellable, since that's the default.
It broken normal transformations...
Diffstat (limited to 'crawl-ref/source/transfor.cc')
| -rw-r--r-- | crawl-ref/source/transfor.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 5f5eb5b950..d43e1ee88e 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -523,10 +523,10 @@ bool transform(int pow, transformation_type which_trans, bool force, if (!force && crawl_state.is_god_acting()) force = true; - if (!force && !you.transform_cancellable) + if (!force && you.transform_uncancellable) { // Jiyva's wrath-induced transformation is blocking the attempt. - // May need to be updated if transform_cancellable is used for + // May need to be updated if transform_uncancellable is used for // other uses. return (false); } @@ -708,6 +708,7 @@ bool transform(int pow, transformation_type which_trans, bool force, colour = RED; dur = pow; msg = "You have been turned into a pig!"; + you.transform_uncancellable = true; break; case TRAN_NONE: @@ -968,8 +969,8 @@ void untransform(bool skip_wielding) handle_interrupted_swap(true, false, true); you.turn_is_over = true; - if (!you.transform_cancellable) - you.transform_cancellable = true; + if (you.transform_uncancellable) + you.transform_uncancellable = false; } // XXX: This whole system is a mess as it still relies on special |