aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authormaximius <none@none>2009-09-26 02:09:26 -0700
committermaximius <none@none>2009-09-26 02:09:26 -0700
commitf8a6434fc0c2ea7cfd325830bac6a208e171f0ab (patch)
treecb5feaedb834a02cb328525971f59140edb28c3b /src/game/Player.cpp
parent2853aa1cd1bb3026d697672aefb6eace902f90b1 (diff)
*Replace a ton of switches with RAND(), and overload RAND() to support up to 16 parameters.
*Add a safety check to prevent knocking players off of transports, just in case they die while on one. *Fix a couple incorrect spell defines. --HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 5a342306174..ee4acd372d3 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -4461,7 +4461,7 @@ bool Player::FallGround(bool noDeath/* = false*/)
void Player::KillPlayer()
{
- if(IsFlying()) FallGround();
+ if(IsFlying() && !GetTransport()) FallGround();
SetMovement(MOVE_ROOT);