From 78c089c0eae503822c7f1025aefcf02529b13723 Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Thu, 14 Aug 2008 18:42:47 +0000
Subject: last of the game server clean up. now it's done

---
 src/game/server/entities/character.cpp  | 6 +++---
 src/game/server/entities/laser.cpp      | 2 +-
 src/game/server/entities/pickup.cpp     | 2 +-
 src/game/server/entities/projectile.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/game/server/entities')

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;
diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp
index cedf7850..226d52a9 100644
--- a/src/game/server/entities/laser.cpp
+++ b/src/game/server/entities/laser.cpp
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_server_interface.h>
 #include <game/generated/g_protocol.hpp>
-#include <game/server/gs_common.hpp>
+#include <game/server/gamecontext.hpp>
 #include "laser.hpp"
 
 //////////////////////////////////////////////////
diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp
index a4a3a2c9..e9997733 100644
--- a/src/game/server/entities/pickup.cpp
+++ b/src/game/server/entities/pickup.cpp
@@ -1,6 +1,6 @@
 #include <engine/e_server_interface.h>
 #include <game/generated/g_protocol.hpp>
-#include <game/server/gs_common.hpp>
+#include <game/server/gamecontext.hpp>
 #include "pickup.hpp"
 
 //////////////////////////////////////////////////
diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp
index d258e69e..adcd8977 100644
--- a/src/game/server/entities/projectile.cpp
+++ b/src/game/server/entities/projectile.cpp
@@ -1,6 +1,6 @@
 #include <engine/e_server_interface.h>
 #include <game/generated/g_protocol.hpp>
-#include <game/server/gs_common.hpp>
+#include <game/server/gamecontext.hpp>
 #include "projectile.hpp"
 
 
-- 
cgit 1.4.1