# HG changeset patch # User terom # Date 1228761176 0 # Node ID 36a502a0023f4f8fd9c24be1511014e895772b27 # Parent e734d8e9bbb5192a07e9a954f11c6fdf970515c8 just ignore NetworkClientPlayerBase::die diff -r e734d8e9bbb5 -r 36a502a0023f src/Network/Client.cc --- a/src/Network/Client.cc Mon Dec 08 18:31:08 2008 +0000 +++ b/src/Network/Client.cc Mon Dec 08 18:32:56 2008 +0000 @@ -169,18 +169,18 @@ throw Error("NetworkClientPlayerBase::spawn called"); } -void NetworkClientPlayerBase::die (bool start_timer) { - (void) start_timer; - - throw Error("NetworkClientPlayerBase::die called"); -} - void NetworkClientPlayerBase::respawn (TimeMS dt) { (void) dt; throw Error("NetworkClientPlayerBase::respawn called"); } +void NetworkClientPlayerBase::die (bool start_timer) { + (void) start_timer; + + // ignore :> +} + void NetworkClientPlayerBase::on_position (NetworkPacketInput &pkt) { Vector position = pkt.read_vector(); Vector velocity = pkt.read_vector(); diff -r e734d8e9bbb5 -r 36a502a0023f src/Network/Client.hh --- a/src/Network/Client.hh Mon Dec 08 18:31:08 2008 +0000 +++ b/src/Network/Client.hh Mon Dec 08 18:32:56 2008 +0000 @@ -151,9 +151,13 @@ * These should never be called directly, always via the network */ virtual void spawn (Vector position); - virtual void die (bool start_timer = true); virtual void respawn (TimeMS dt); // @} + + /** + * Ignore, the servers tells us this + */ + virtual void die (bool start_timer = true); private: /**