From 83a479470ff467ced73ee97e2d5ed7203071050a Mon Sep 17 00:00:00 2001
From: Paul Gilbert <dreammaster@scummvm.org>
Date: Tue, 20 Aug 2019 22:17:26 -0700
Subject: [PATCH] XEEN: Fix applying characters' fire resistance when walking
 on lava

---
 engines/xeen/interface.cpp | 6 +++---
 engines/xeen/party.cpp     | 1 -
 engines/xeen/party.h       | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 5b5b4972501..0bf9363e873 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -639,12 +639,12 @@ void Interface::doStepCode() {
 	case SURFTYPE_LAVA:
 		// It burns, it burns!
 		damage = 100;
-		party._damageType = DT_FIRE;
+		combat._damageType = DT_FIRE;
 		break;
 	case SURFTYPE_SKY:
 		// We can fly, we can.. oh wait, we can't!
 		damage = 100;
-		party._damageType = DT_PHYSICAL;
+		combat._damageType = DT_PHYSICAL;
 		_falling = FALL_IN_PROGRESS;
 		break;
 	case SURFTYPE_DESERT:
@@ -654,7 +654,7 @@ void Interface::doStepCode() {
 		break;
 	case SURFTYPE_CLOUD:
 		if (!party._levitateCount) {
-			party._damageType = DT_PHYSICAL;
+			combat._damageType = DT_PHYSICAL;
 			_falling = FALL_IN_PROGRESS;
 			damage = 100;
 		}
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index e8c69fdf923..6f9868b2828 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -254,7 +254,6 @@ Party::Party(XeenEngine *vm) {
 	_newDay = false;
 	_isNight = false;
 	_stepped = false;
-	_damageType = DT_PHYSICAL;
 	_fallMaze = 0;
 	_fallDamage = 0;
 	_dead = false;
diff --git a/engines/xeen/party.h b/engines/xeen/party.h
index fde6defeee1..fbe628f097e 100644
--- a/engines/xeen/party.h
+++ b/engines/xeen/party.h
@@ -233,7 +233,6 @@ public:
 	Common::Point _fallPosition;
 	int _fallMaze;
 	int _fallDamage;
-	DamageType _damageType;
 	bool _dead;
 	Treasure _treasure;
 	Treasure _savedTreasure;