diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2010-02-26 11:19:50 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2010-02-26 11:19:50 +0100 |
| commit | a46073e40fd957c5eea60fe38fd4f42f11cfa089 (patch) | |
| tree | 1d272b0d0ea9b9ad042005fc9babe787a28834c1 /crawl-ref/source/transform.h | |
| parent | 8e0425b22924e4497a174654676f5131aeda20de (diff) | |
| download | crawl-ref-a46073e40fd957c5eea60fe38fd4f42f11cfa089.tar.gz crawl-ref-a46073e40fd957c5eea60fe38fd4f42f11cfa089.zip | |
Fix merfolk entering water twice from ice form.
This was melding their boots twice, causing permanent stat change.
Of course, it shouldn't really be possible to meld a piece of
equipment twice -- a duplicate call should either fail or
do nothing.
Fixes issue #868.
Diffstat (limited to 'crawl-ref/source/transform.h')
| -rw-r--r-- | crawl-ref/source/transform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/transform.h b/crawl-ref/source/transform.h index 9af348b64b..02913c7c80 100644 --- a/crawl-ref/source/transform.h +++ b/crawl-ref/source/transform.h @@ -29,7 +29,8 @@ enum transformation_type bool transformation_can_wield(transformation_type trans); bool transform_can_butcher_barehanded(transformation_type tt); -void untransform(bool skip_wielding = false); +// skip_move: don't make player re-enter current cell +void untransform(bool skip_wielding = false, bool skip_move = false); bool can_equip(equipment_type use_which, bool ignore_temporary); bool check_transformation_stat_loss(const std::set<equipment_type> &remove, |