about summary refs log tree commit diff
path: root/src/game/server/entities/character.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-08-14 18:42:47 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-08-14 18:42:47 +0000
commit78c089c0eae503822c7f1025aefcf02529b13723 (patch)
tree10c8767ef1006a09c9ca228770f1ce86b45cbccb /src/game/server/entities/character.cpp
parenta420eb543f8206730aebb80e60a625f7204694e4 (diff)
downloadzcatch-78c089c0eae503822c7f1025aefcf02529b13723.tar.gz
zcatch-78c089c0eae503822c7f1025aefcf02529b13723.zip
last of the game server clean up. now it's done
Diffstat (limited to 'src/game/server/entities/character.cpp')
-rw-r--r--src/game/server/entities/character.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index 160e080a..ee6dcb17 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -1,7 +1,7 @@
 #include <new>
 #include <engine/e_server_interface.h>
 #include <engine/e_config.h>
-#include <game/server/gs_common.hpp>
+#include <game/server/gamecontext.hpp>
 
 #include "character.hpp"
 #include "laser.hpp"
@@ -892,7 +892,7 @@ void PLAYER::on_disconnect()
 		
 	char buf[512];
 	str_format(buf, sizeof(buf),  "%s has left the game", server_clientname(client_id));
-	game.send_chat(-1, CHAT_ALL, buf);
+	game.send_chat(-1, GAMECONTEXT::CHAT_ALL, buf);
 
 	dbg_msg("game", "leave player='%d:%s'", client_id, server_clientname(client_id));
 
@@ -952,7 +952,7 @@ void PLAYER::set_team(int new_team)
 		
 	char buf[512];
 	str_format(buf, sizeof(buf), "%s joined the %s", server_clientname(client_id), game.controller->get_team_name(new_team));
-	game.send_chat(-1, CHAT_ALL, buf); 
+	game.send_chat(-1, GAMECONTEXT::CHAT_ALL, buf); 
 	
 	kill_character();
 	team = new_team;