libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Fix giving lava damage after combat ends

Browse Source
This commit is contained in:
Paul Gilbert 2019-08-22 19:37:17 -07:00
parent 0e691072bb
commit b0913fcab3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/xeen/interface.cpp
View File

@ -680,6 +680,9 @@ void Interface::doStepCode() {
int oldTarget = combat._combatTarget; int oldTarget = combat._combatTarget;
combat._combatTarget = 0; 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.giveCharDamage(damage, combat._damageType, 0);
combat._combatTarget = oldTarget; combat._combatTarget = oldTarget;