diff options
| author | Machiavelli <none@none> | 2009-10-06 17:12:06 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-10-06 17:12:06 +0200 |
| commit | 3bbc0d3324fe5b3101fea689d71e266433bae169 (patch) | |
| tree | baf264b7f4c239910afd53e5c5aa0c10119ca104 /src/game | |
| parent | 2cd66e90c24e85b110c70f3563cf2c7e03fa9e6f (diff) | |
| parent | 5722d5c402c8fc8a340d1f6f81d34f2162ef8f1a (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5f0f1fd27b3..e577e2006e6 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -11972,8 +11972,8 @@ void Unit::SetHealth(uint32 val) if(getDeathState() == JUST_DIED) val = 0; // causes instant permadeath if you exit game while in combat?! :-| - //else if((getDeathState() & (DEAD | DEAD_FALLING)) != 0) - // val = 1; + else if((GetTypeId() == TYPEID_PLAYER) && (getDeathState() & (DEAD | DEAD_FALLING)) != 0) + val = 1; else { uint32 maxHealth = GetMaxHealth(); |