diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-04-05 23:35:12 -0700 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-04-06 03:00:09 -0400 |
| commit | aa0591cf3b99717c157d8b0258557108476352f9 (patch) | |
| tree | d7bd747b6540b4444ec6a22e68796a202794688f /crawl-ref/source/transform.cc | |
| parent | 456bd4e601bee76cf7d4728fa6ca4d5a159e9f82 (diff) | |
| download | crawl-ref-aa0591cf3b99717c157d8b0258557108476352f9.tar.gz crawl-ref-aa0591cf3b99717c157d8b0258557108476352f9.zip | |
Fix lava orc form check code
The code in player_likes_lava() was subtly wrong, with the result that
transformed lava orcs were always able to enter lava. This restores what
appears to have been the intended behavior.
Diffstat (limited to 'crawl-ref/source/transform.cc')
| -rw-r--r-- | crawl-ref/source/transform.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc index 62633876db..33f6b48172 100644 --- a/crawl-ref/source/transform.cc +++ b/crawl-ref/source/transform.cc @@ -134,8 +134,11 @@ bool form_likes_water(transformation_type form) bool form_likes_lava(transformation_type form) { // Lava orcs can only swim in non-phys-change forms. + // However, ice beast & statue form will melt back to lava, so they're OK return you.species == SP_LAVA_ORC - && !form_changed_physiology(form); + && (!form_changed_physiology(form) + || form == TRAN_ICE_BEAST + || form == TRAN_STATUE); } bool form_can_butcher(transformation_type form) |