[Scummvm-git-logs] scummvm master -> b0913fcab3f5530eed375a36619c2e5e78caa9e2

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b0913fcab3 XEEN: Fix giving lava damage after combat ends


Commit: b0913fcab3f5530eed375a36619c2e5e78caa9e2
    https://github.com/scummvm/scummvm/commit/b0913fcab3f5530eed375a36619c2e5e78caa9e2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-22T19:37:24-07:00

Commit Message:
XEEN: Fix giving lava damage after combat ends

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 0bf9363..29dcce4 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;