Merge remote-tracking branch 'origin/Mario/misc_fixes'

diff --cc qcsrc/server/teamplay.qc
index ee91a9dcceac97b094d7da6b385c0faf60c247e3,5f2f278e71b355ba93dce46f44d59e9dfec7c6c7..90302bc45b36c3f23bf68f083b25c56d59d50a6b
--- 1/qcsrc/server/teamplay.qc
--- 2/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -1000,5 -990,46 +992,5 @@@ void ShufflePlayerOutOfTeam (float sour
  
        if(selected.deadflag == DEAD_NO)
                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)));
+       Send_Notification(NOTIF_ONE, selected, MSG_CENTER, CENTER_DEATH_SELF_AUTOTEAMCHANGE, 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);
 -}