diff options
| author | Alfred Eriksson <somerunce@gmail.com> | 2008-09-02 17:36:50 +0000 |
|---|---|---|
| committer | Alfred Eriksson <somerunce@gmail.com> | 2008-09-02 17:36:50 +0000 |
| commit | fa5231f2c2745ba8d02e674781628dbc3d6a8c16 (patch) | |
| tree | 578da6a3a56b58b7e1f17421fbe0ac2ab55929bd /src/game/server | |
| parent | c597887b91bebcf2cf2ec303bbc23ca45631ccde (diff) | |
| download | zcatch-fa5231f2c2745ba8d02e674781628dbc3d6a8c16.tar.gz zcatch-fa5231f2c2745ba8d02e674781628dbc3d6a8c16.zip | |
merge from 0.4.3: versionserver and red team score-use in dm
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/gamecontroller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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]; } |