diff options
| author | Kahrl <kahrl@gmx.net> | 2012-01-24 00:00:26 +0100 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-02-05 12:06:55 +0200 |
| commit | 88cdd3a363668cfb2fd07b5381cce29738aed0bf (patch) | |
| tree | 445cfa71f50e87045b44c7674dc3f3eacf9b2e15 /src/server.h | |
| parent | e15de8b70dc13e24aefca7fdd2a17be5f150ae49 (diff) | |
| download | dragonfireclient-88cdd3a363668cfb2fd07b5381cce29738aed0bf.tar.xz | |
Players stay in environment even when dead, damage flash and fall damage fixes
Don't set m_removed on dead players (dead players are indicated by hp == 0). Local
damage flash is shown whatever the cause was (even from Lua set_hp). PlayerCAO
damage flash matches duration of local damage flash. Fall damage is dealt much more consistently (this is done by disallowing jumping when speed.Y is very negative, up to now jumping could sometimes negate fall damage)
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server.h b/src/server.h index 4fdb60065..40f0fe582 100644 --- a/src/server.h +++ b/src/server.h @@ -592,7 +592,7 @@ private: Something random */ - void HandlePlayerHP(Player *player, s16 damage); + void DiePlayer(Player *player); void RespawnPlayer(Player *player); void UpdateCrafting(u16 peer_id); |
