From 1c25a3d2b30e68b4faa4c33ff8f7d5e11de637ca Mon Sep 17 00:00:00 2001 From: esteel Date: Fri, 9 Jan 2009 16:45:04 +0000 Subject: [PATCH] rip out the server side teamsize comlaining (bprint/centerprint) as the clientside hint should be enough now git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5473 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/cvars.txt | 1 - data/defaultNexuiz.cfg | 1 - data/qcsrc/server/miscfunctions.qc | 1 - data/qcsrc/server/teamplay.qc | 38 +++--------------------------- 4 files changed, 3 insertions(+), 38 deletions(-) diff --git a/data/cvars.txt b/data/cvars.txt index 491d4831d..9f9cec43e 100644 --- a/data/cvars.txt +++ b/data/cvars.txt @@ -441,7 +441,6 @@ "g_balance_shotgun_secondary_refire" "TODO: describe me" "g_balance_shotgun_secondary_spread" "TODO: describe me" "g_balance_teams" "TODO: describe me" -"g_balance_teams_complain" "TODO: describe me" "g_balance_teams_force" "TODO: describe me" "g_balance_teams_prevent_imbalance" "TODO: describe me" "g_balance_uzi_first_ammo" "TODO: describe me" diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index ebb6a49d8..a57467774 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -390,7 +390,6 @@ seta g_teamdamage_resetspeed 30 // for teamplay 4: how fast player's teamda set deathmatch_force_teamplay 0 // always play TDM on dm maps seta g_balance_teams 0 // automatically balance out players entering instead of asking them for their preferred team seta g_balance_teams_force 0 // automatically balance out teams when players move or disconnect -seta g_balance_teams_complain 0 // when 1, complain when team balance is off seta g_balance_teams_prevent_imbalance 0 // prevent players from changing to larger teams seta g_tdm_teams 2 // how many teams are in team deathmatch set g_changeteam_banned 0 // not allowed to change team diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 5ff83a96a..b670757a0 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -627,7 +627,6 @@ string Team_ColorNameLowerCase(float t) #define CENTERPRIO_POINT 1 #define CENTERPRIO_SPAM 2 -#define CENTERPRIO_REBALANCE 2 #define CENTERPRIO_VOTE 4 #define CENTERPRIO_NORMAL 5 #define CENTERPRIO_SHIELDING 7 diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index e7efa7c3a..1f3a1d781 100644 --- a/data/qcsrc/server/teamplay.qc +++ b/data/qcsrc/server/teamplay.qc @@ -165,7 +165,7 @@ void InitGameplayMode() float fraglimit_override, timelimit_override; VoteReset(); - + teams_matter = 0; cvar_set("teamplay", "0"); @@ -179,7 +179,7 @@ void InitGameplayMode() world.maxs = mi_max; MapInfo_LoadMapSettings(mapname); - + if not(cvar_value_issafe(world.fog)) { print("The current map contains a potentially harmful fog setting, ignored\n"); @@ -482,7 +482,7 @@ void PrintWelcomeMessage(entity pl) if (cache_mutatormsg != "") { s = strcat(s, "\n\n^8special gameplay tips: ^7", cache_mutatormsg); } - + if(cache_lastmotd != cvar_string("sv_motd")) { if(cache_lastmotd) @@ -1203,43 +1203,13 @@ void ShufflePlayerOutOfTeam (float source_team) centerprint(selected, strcat("You have been moved into a different team to improve team balance\nYou are now on: ", ColoredTeamName(selected.team))); } -float lastRebalanceInfo; void CauseRebalance(float source_team, float howmany_toomany) { - float steam; - entity head; - if(IsTeamBalanceForced() == 1) { bprint("Rebalancing Teams\n"); ShufflePlayerOutOfTeam(source_team); } - else - { - if(cvar("g_balance_teams_complain")) - if(howmany_toomany < cvar("g_balance_teams_complain")) - return; - if(time < lastRebalanceInfo + 90) - return; - lastRebalanceInfo = time; - if(source_team == 1) - steam = COLOR_TEAM1; - else if(source_team == 2) - steam = COLOR_TEAM2; - else if(source_team == 3) - steam = COLOR_TEAM3; - else if(source_team == 4) - steam = COLOR_TEAM4; - print("Team ", ftos(source_team), " too large, complaining.\n"); - FOR_EACH_REALPLAYER(head) - { - if(head.team == steam) - { - sprint(head, "\{1}\{13}^3SERVER NOTICE:^7 One of you please change teams!\n"); - centerprint_atprio(head, CENTERPRIO_REBALANCE, "^3SERVER NOTICE:\n\n^7Someone of you please change teams!"); - } - } - } } // part of g_balance_teams_force @@ -1314,8 +1284,6 @@ void AuditTeams() audit_teams_time = time + 0.7 + random()*0.3; } - - // code from here on is just to support maps that don't have team entities void tdm_spawnteam (string teamname, float teamcolor) { -- 2.39.2