diff options
| author | Paul Gilbert | 2019-08-22 19:37:17 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-08-22 19:37:24 -0700 |
| commit | b0913fcab3f5530eed375a36619c2e5e78caa9e2 (patch) | |
| tree | fa1965e94c5908f034517ce64f7081e104b92e2d /engines | |
| parent | 0e691072bb352d8cfd16bd17874ca5befe3092f0 (diff) | |
| download | scummvm-rg350-b0913fcab3f5530eed375a36619c2e5e78caa9e2.tar.gz scummvm-rg350-b0913fcab3f5530eed375a36619c2e5e78caa9e2.tar.bz2 scummvm-rg350-b0913fcab3f5530eed375a36619c2e5e78caa9e2.zip | |
XEEN: Fix giving lava damage after combat ends
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/interface.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp index 0bf9363e87..29dcce4ed0 100644 --- a/engines/xeen/interface.cpp +++ b/engines/xeen/interface.cpp @@ -680,6 +680,9 @@ void Interface::doStepCode() { int oldTarget = combat._combatTarget; combat._combatTarget = 0; + + // WORKAROUND: Stepping into combat whilst on lava results in damageType being lost + combat._damageType = (surfaceId == SURFTYPE_LAVA) ? DT_FIRE : DT_PHYSICAL; combat.giveCharDamage(damage, combat._damageType, 0); combat._combatTarget = oldTarget; |