From 9d632dd826c8a312095de0f56df66b2580d336cb Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sun, 6 Jul 2008 11:21:21 +0000 Subject: major update. server clean up and much added documentation --- src/game/server/gs_game_ctf.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/game/server/gs_game_ctf.hpp') diff --git a/src/game/server/gs_game_ctf.hpp b/src/game/server/gs_game_ctf.hpp index 6d512815..bf6282e7 100644 --- a/src/game/server/gs_game_ctf.hpp +++ b/src/game/server/gs_game_ctf.hpp @@ -10,9 +10,7 @@ public: virtual void tick(); virtual bool on_entity(int index, vec2 pos); - - virtual void on_player_spawn(class PLAYER *p); - virtual int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon); + virtual int on_character_death(class CHARACTER *victim, class PLAYER *killer, int weapon); }; // TODO: move to seperate file @@ -20,7 +18,7 @@ class FLAG : public ENTITY { public: static const int phys_size = 14; - PLAYER *carrying_player; + CHARACTER *carrying_character; vec2 vel; vec2 stand_pos; -- cgit 1.4.1