From: Mario Date: Fri, 14 Nov 2014 02:44:00 +0000 (+1100) Subject: Remove some missed TDM junk X-Git-Tag: xonotic-v0.8.0~153^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f49fed497a421e5dd31b76898023c5b4eb656578;p=xonotic%2Fxonotic-data.pk3dir.git Remove some missed TDM junk --- diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index a89c4b84b..ee91a9dcc 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -1002,44 +1002,3 @@ void ShufflePlayerOutOfTeam (float source_team) Damage(selected, selected, selected, 100000, DEATH_AUTOTEAMCHANGE, selected.origin, '0 0 0'); centerprint(selected, strcat("You have been moved into a different team to improve team balance\nYou are now on: ", Team_ColoredFullName(selected.team))); } - -// code from here on is just to support maps that don't have team entities -void tdm_spawnteam (string teamname, float teamcolor) -{ - entity e; - e = spawn(); - e.classname = "tdm_team"; - e.netname = teamname; - e.cnt = teamcolor; - e.team = e.cnt + 1; -} - -// spawn some default teams if the map is not set up for tdm -void tdm_spawnteams() -{ - float numteams; - - numteams = autocvar_g_tdm_teams_override; - if(numteams < 2) - numteams = autocvar_g_tdm_teams; - numteams = bound(2, numteams, 4); - - tdm_spawnteam("Red", NUM_TEAM_1-1); - tdm_spawnteam("Blue", NUM_TEAM_2-1); - if(numteams >= 3) - tdm_spawnteam("Yellow", NUM_TEAM_3-1); - if(numteams >= 4) - tdm_spawnteam("Pink", NUM_TEAM_4-1); -} - -void tdm_delayedinit() -{ - // if no teams are found, spawn defaults - if (find(world, classname, "tdm_team") == world) - tdm_spawnteams(); -} - -void tdm_init() -{ - InitializeEntity(world, tdm_delayedinit, INITPRIO_GAMETYPE); -}