diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-06 18:13:14 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-06 18:13:14 +0000 |
| commit | c5887300c0f938671c78fc4a59f74ea98ac5bd04 (patch) | |
| tree | 0aa4af54b9bf23b76fbba657c8d04633ac71118e /crawl-ref/source/transfor.h | |
| parent | acd89a148d572cedafcf498496df2d3ce42a6980 (diff) | |
| download | crawl-ref-c5887300c0f938671c78fc4a59f74ea98ac5bd04.tar.gz crawl-ref-c5887300c0f938671c78fc4a59f74ea98ac5bd04.zip | |
Fix 2726622: untransforming not prompting for safe-inscribed equipment
Also, when transforming voluntarily (i.e. not via Xom or by drawing a
card) you get prompted for the loss of safe-inscribed equipment. If you
opt out, it costs neither turn nor mana.
There's an edge case when you change from one transformation to another
one: if that fails for whatever reason you lose the turn (due to
untransforming) and the spell fizzles (including mana loss).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9588 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/transfor.h')
| -rw-r--r-- | crawl-ref/source/transfor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/transfor.h b/crawl-ref/source/transfor.h index d9cc16f1bc..e037b0d5c8 100644 --- a/crawl-ref/source/transfor.h +++ b/crawl-ref/source/transfor.h @@ -30,7 +30,7 @@ enum transformation_type bool transform_can_butcher_barehanded(transformation_type tt); -void untransform(void); +void untransform(bool skip_wielding = false); bool can_equip(equipment_type use_which, bool ignore_temporary); bool check_transformation_stat_loss(const std::set<equipment_type> &remove, @@ -38,7 +38,7 @@ bool check_transformation_stat_loss(const std::set<equipment_type> &remove, int dex_loss = 0, int int_loss = 0); size_type transform_size(int psize = PSIZE_BODY); -bool transform(int pow, transformation_type which_trans, bool quiet = false, +bool transform(int pow, transformation_type which_trans, bool force = false, bool just_check = false); void remove_one_equip(equipment_type eq, bool meld = true); |