From 3dc4df381fc8ece854766294fcf7f1a28d8b33ca Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Fri, 2 Oct 2009 05:45:08 -0700
Subject: *Temporary fix to permadeath issue.. still uncertain why this was
 happening at all...

--HG--
branch : trunk
---
 src/game/Unit.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 79440a8e016..e0069e99259 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11958,10 +11958,11 @@ void Unit::SetLevel(uint32 lvl)
 
 void Unit::SetHealth(uint32 val)
 {
-    if((getDeathState() & JUST_DIED) != 0)
+    if(getDeathState() == JUST_DIED)
         val = 0;
-    else if((getDeathState() & (DEAD | DEAD_FALLING)) != 0)
-        val = 1;
+    // causes instant permadeath if you exit game while in combat?! :-|
+    //else if((getDeathState() & (DEAD | DEAD_FALLING)) != 0)
+    //    val = 1;
     else
     {
         uint32 maxHealth = GetMaxHealth();
-- 
cgit v1.2.3