From fa5231f2c2745ba8d02e674781628dbc3d6a8c16 Mon Sep 17 00:00:00 2001 From: Alfred Eriksson Date: Tue, 2 Sep 2008 17:36:50 +0000 Subject: merge from 0.4.3: versionserver and red team score-use in dm --- src/game/server/gamecontroller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/game/server/gamecontroller.cpp') diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index ab24b7d4..7ff69880 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -390,7 +390,7 @@ void GAMECONTROLLER::snap(int snapping_client) gameobj->warmup = warmup; - gameobj->teamscore_red = teamscore[0]; + gameobj->teamscore_red = is_teamplay() ? teamscore[0] : game.players[snapping_client].score; gameobj->teamscore_blue = teamscore[1]; } -- cgit 1.4.1