diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_variables.h | 1 | ||||
| -rw-r--r-- | src/game/server/gs_server.cpp | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/game/g_variables.h b/src/game/g_variables.h index 6cd2540b..594d5cc5 100644 --- a/src/game/g_variables.h +++ b/src/game/g_variables.h @@ -63,6 +63,7 @@ MACRO_CONFIG_INT(sv_timelimit, 0, 0, 1000) MACRO_CONFIG_STR(sv_gametype, 32, "dm") MACRO_CONFIG_INT(sv_restart, 0, 0, 120) MACRO_CONFIG_INT(sv_kick, -1, 0, 0) +MACRO_CONFIG_INT(sv_tournament_mode, 0, 0, 1) diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index a45e52ab..f2e20441 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -1788,11 +1788,17 @@ void mods_connected(int client_id) //dbg_msg("game", "connected player='%d:%s'", client_id, server_clientname(client_id)); + // Check which team the player should be on - if(gameobj->gametype == GAMETYPE_DM) - players[client_id].team = 0; + if(config.sv_tournament_mode) + players[client_id].team = -1; else - players[client_id].team = gameobj->getteam(client_id); + { + if(gameobj->gametype == GAMETYPE_DM) + players[client_id].team = 0; + else + players[client_id].team = gameobj->getteam(client_id); + } } void mods_client_drop(int client_id) |