about summary refs log tree commit diff
path: root/src/game/server/gs_game_tdm.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-06-12 10:51:48 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-06-12 10:51:48 +0000
commitf6c67c29cd10d41b877ee1319801edc01b625e72 (patch)
tree6ca26c44ac0218a57d078a6f72034f2924b44104 /src/game/server/gs_game_tdm.cpp
parent0d3b988c1aed8f6b91879a801253db81a251a532 (diff)
downloadzcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.tar.gz
zcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.zip
large commit with loads of clean up. more is comming
Diffstat (limited to 'src/game/server/gs_game_tdm.cpp')
-rw-r--r--src/game/server/gs_game_tdm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/server/gs_game_tdm.cpp b/src/game/server/gs_game_tdm.cpp
index fb2f569b..10c5a7dc 100644
--- a/src/game/server/gs_game_tdm.cpp
+++ b/src/game/server/gs_game_tdm.cpp
@@ -3,14 +3,14 @@
 #include "gs_common.h"
 #include "gs_game_tdm.h"
 
-gameobject_tdm::gameobject_tdm()
+GAMECONTROLLER_TDM::GAMECONTROLLER_TDM()
 {
 	is_teamplay = true;
 }
 
-int gameobject_tdm::on_player_death(class player *victim, class player *killer, int weapon)
+int GAMECONTROLLER_TDM::on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon)
 {
-	gameobject::on_player_death(victim, killer, weapon);
+	GAMECONTROLLER::on_player_death(victim, killer, weapon);
 	
 	if(weapon >= 0)
 	{
@@ -23,8 +23,8 @@ int gameobject_tdm::on_player_death(class player *victim, class player *killer,
 	return 0;
 }
 
-void gameobject_tdm::tick()
+void GAMECONTROLLER_TDM::tick()
 {
 	do_team_score_wincheck();
-	gameobject::tick();
+	GAMECONTROLLER::tick();
 }