diff options
| author | maximius <none@none> | 2009-10-02 05:45:08 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-10-02 05:45:08 -0700 |
| commit | 3dc4df381fc8ece854766294fcf7f1a28d8b33ca (patch) | |
| tree | 2fb5306e1982dc753aa7deb9ba8a08254c32ee6f /src/game/Unit.cpp | |
| parent | 18995c8785859c810151456bd856aac161780103 (diff) | |
*Temporary fix to permadeath issue.. still uncertain why this was happening at all...
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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(); |