From 093c50fd47a9c6aa985342140faa2d0d85933ccb Mon Sep 17 00:00:00 2001
From: Olle Rosenquist <phobos99@gmail.com>
Date: Sat, 21 Jul 2007 21:47:21 +0000
Subject: Updated stuff

---
 src/game/server/game_server.cpp | 5 ++++-
 src/game/server/game_server.h   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/game/server')

diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 559fa1bd..ecb57716 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -343,7 +343,7 @@ game_world world;
 gameobject::gameobject()
 : entity(OBJTYPE_GAME)
 {
-	gametype = GAMETYPE_DM;
+	gametype = GAMETYPE_TDM;
 	game_over_tick = -1;
 	sudden_death = 0;
 	round_start_tick = server_tick();
@@ -431,6 +431,7 @@ void gameobject::snap(int snapping_client)
 	game->score_limit = config.scorelimit;
 	game->time_limit = config.timelimit;
 	game->round_start_tick = round_start_tick;
+	game->gametype = gametype;
 }
 
 gameobject gameobj;
@@ -596,6 +597,7 @@ void player::reset()
 	vel = vec2(0.0f, 0.0f);
 	direction = vec2(0.0f, 1.0f);
 	score = 0;
+	team = 0;
 	dead = true;
 	die_tick = 0;
 }
@@ -1244,6 +1246,7 @@ void player::snap(int snaping_client)
 	player->angle = (int)(a*256.0f);
 	
 	player->score = score;
+	player->team = team;
 }
 
 player players[MAX_CLIENTS];
diff --git a/src/game/server/game_server.h b/src/game/server/game_server.h
index 46b451e1..7babfdc8 100644
--- a/src/game/server/game_server.h
+++ b/src/game/server/game_server.h
@@ -239,6 +239,7 @@ public:
 	int currentmovetime;
 
 	int score;
+	int team;
 	
 	bool dead;
 	int die_tick;
-- 
cgit 1.4.1