From b0913fcab3f5530eed375a36619c2e5e78caa9e2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 22 Aug 2019 19:37:17 -0700
Subject: XEEN: Fix giving lava damage after combat ends

---
 engines/xeen/interface.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

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;
-- 
cgit v1.2.3