Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

diff --combined qcsrc/client/Main.qc
index 29ff3d52c9e2e62756abfa0f89eda970f4dc8e8d,b75fc166e585359c982d319e8bf1de0c168e60d7..30cadd5cf0bdeefeff29af3e9d2a2d9219d12729
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -149,14 -149,12 +149,14 @@@ void CSQC_Init(void
        teams = Sort_Spawn();
        players = Sort_Spawn();
  
 -      GetTeam(COLOR_SPECTATOR, true); // add specs first
 +      GetTeam(FL_SPECTATOR, true); // add specs first
  
        // needs to be done so early because of the constants they create
        CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
 -
 +      CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 +      CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 +      
        WaypointSprite_Load();
  
        // precaches
@@@ -262,16 -260,16 +262,16 @@@ float SetTeam(entity o, float Team
                switch(Team)
                {
                        case -1:
 -                      case COLOR_TEAM1:
 -                      case COLOR_TEAM2:
 -                      case COLOR_TEAM3:
 -                      case COLOR_TEAM4:
 +                      case FL_TEAM_1:
 +                      case FL_TEAM_2:
 +                      case FL_TEAM_3:
 +                      case FL_TEAM_4:
                                break;
                        default:
                                if(GetTeam(Team, false) == world)
                                {
                                        print(sprintf(_("trying to switch to unsupported team %d\n"), Team));
 -                                      Team = COLOR_SPECTATOR;
 +                                      Team = FL_SPECTATOR;
                                }
                                break;
                }
@@@ -287,7 -285,7 +287,7 @@@
                                if(GetTeam(Team, false) == world)
                                {
                                        print(sprintf(_("trying to switch to unsupported team %d\n"), Team));
 -                                      Team = COLOR_SPECTATOR;
 +                                      Team = FL_SPECTATOR;
                                }
                                break;
                }
@@@ -432,6 -430,7 +432,7 @@@ void Ent_ReadEntCS(
                self.origin_x = ReadShort();
                self.origin_y = ReadShort();
                self.origin_z = ReadShort();
+               setorigin(self, self.origin);
        }
        if(sf & 4)
        {
@@@ -1223,10 -1222,6 +1224,10 @@@ float CSQC_Parse_TempEntity(
                case TE_CSQC_SVNOTICE:
                        cl_notice_read();
                        bHandled = true;
 +                      break;
 +              case TE_CSQC_NOTIFICATION:
 +                      Read_Notification();
 +                      bHandled = true;
                        break;
                default:
                        // No special logic for this temporary entity; return 0 so the engine can handle it

diff --combined qcsrc/client/shownames.qc
index 3c0c70cf5d6c0809d3eba0baf365c79ded14fac6,8b4f7a09f6996bbc22c5dcad8e9403e80908fe2e..3bc231c254ffa4991b6d59acd73286880a952aeb
--- 1/qcsrc/client/shownames.qc
--- 2/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@@ -187,7 -187,7 +187,7 @@@ void Draw_ShowNames_All(
        {
                float t;
                t = GetPlayerColor(i);
 -              if(t == COLOR_SPECTATOR)
 +              if(t == FL_SPECTATOR)
                        continue;
  
                entity e;
@@@ -215,7 -215,7 +215,7 @@@
                        e.sameteam = 0;
                }
  
-               e.origin = getplayerorigin(i);
+               setorigin(e, getplayerorigin(i));
                if(e.origin == GETPLAYERORIGIN_ERROR)
                        continue;
                        

diff --combined qcsrc/client/tturrets.qc
index 01553891f15e92b363cdf5d25fe559504118dea9,6f3b030502196171db72a24520b89fb7a9713979..6ac004c7b9e003b7cf445d22f15d4cbd3dcf2747
--- 1/qcsrc/client/tturrets.qc
--- 2/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@@ -163,22 -163,22 +163,22 @@@ void turret_changeteam(
  {     
        switch(self.team - 1)
        {
 -        case COLOR_TEAM1: // Red
 +        case FL_TEAM_1: // Red
              self.glowmod = '2 0 0';
              self.teamradar_color = '1 0 0';
              break;
  
 -        case COLOR_TEAM2: // Blue
 +        case FL_TEAM_2: // Blue
              self.glowmod = '0 0 2';
              self.teamradar_color = '0 0 1';
              break;
  
 -        case COLOR_TEAM3: // Yellow
 +        case FL_TEAM_3: // Yellow
              self.glowmod = '1 1 0';
              self.teamradar_color = '1 1 0';
              break;
  
 -        case COLOR_TEAM4: // Pink
 +        case FL_TEAM_4: // Pink
              self.glowmod = '1 0 1';
              self.teamradar_color = '1 0 1';
              break;
@@@ -542,7 -542,8 +542,8 @@@ entity turret_gibtoss(string _model, ve
      
      gib.gravity         = 1;
        gib.move_movetype   = MOVETYPE_BOUNCE;
-       gib.move_origin     = gib.origin = _from;
+       gib.move_origin     = _from;
+       setorigin(gib,        _from);
        gib.move_velocity   = _to;      
        gib.move_avelocity  = prandomvec() * 32;
        gib.move_time       = time;
@@@ -605,6 -606,7 +606,7 @@@ void ent_turret(
            self.origin_x = ReadCoord();
            self.origin_y = ReadCoord();
            self.origin_z = ReadCoord();
+           setorigin(self, self.origin);
            
            self.angles_x = ReadAngle();
            self.angles_y = ReadAngle();

diff --combined qcsrc/client/waypointsprites.qc
index 9cac6bf6eb0250b246771ed1e0e524dde324bb8c,39b60a66b0c767d1342bec2dcb5e8645d6cd332a..8714383896d18163b0da5f25665b36cda85262c8
--- 1/qcsrc/client/waypointsprites.qc
--- 2/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@@ -423,7 -423,7 +423,7 @@@ void Draw_WaypointSprite(
                                spriteimage = self.netname;
                        break;
                case SPRITERULE_TEAMPLAY:
 -                      if(t == COLOR_SPECTATOR + 1)
 +                      if(t == FL_SPECTATOR + 1)
                                spriteimage = self.netname3;
                        else if(self.team == t)
                                spriteimage = self.netname2;
@@@ -688,6 -688,7 +688,7 @@@ void Ent_WaypointSprite(
                self.origin_x = ReadCoord();
                self.origin_y = ReadCoord();
                self.origin_z = ReadCoord();
+               setorigin(self, self.origin);
        }
  
        if(sendflags & 1)

diff --combined qcsrc/server/bot/bot.qc
index 1030075d38d1468e5d8117c7f29dcb3e9b3e1d31,45107b833a1b16221b8082da7c55c143d7b9244b..b2e20e776435478bf7454d3eadef79ce5e989e5f
--- 1/qcsrc/server/bot/bot.qc
--- 2/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@@ -142,6 -142,8 +142,8 @@@ void bot_setnameandstuff(
                        if(substring(readfile, 0, 1) == "#")
                                continue;
                        tokens = tokenizebyseparator(readfile, "\t");
+                       if(tokens == 0)
+                               continue;
                        s = argv(0);
                        prio = 1;
                        FOR_EACH_CLIENT(p)
@@@ -396,13 -398,13 +398,13 @@@ void bot_clientconnect(
                bot_setnameandstuff();
  
        if(self.bot_forced_team==1)
 -              self.team = COLOR_TEAM1;
 +              self.team = FL_TEAM_1;
        else if(self.bot_forced_team==2)
 -              self.team = COLOR_TEAM2;
 +              self.team = FL_TEAM_2;
        else if(self.bot_forced_team==3)
 -              self.team = COLOR_TEAM3;
 +              self.team = FL_TEAM_3;
        else if(self.bot_forced_team==4)
 -              self.team = COLOR_TEAM4;
 +              self.team = FL_TEAM_4;
        else
                JoinBestTeam(self, FALSE, TRUE);
  
@@@ -423,13 -425,13 +425,13 @@@ void bot_removefromlargestteam(
        bestcount = 0;
        while (head)
        {
 -              if(head.team == COLOR_TEAM1)
 +              if(head.team == FL_TEAM_1)
                        thiscount = c1;
 -              else if(head.team == COLOR_TEAM2)
 +              else if(head.team == FL_TEAM_2)
                        thiscount = c2;
 -              else if(head.team == COLOR_TEAM3)
 +              else if(head.team == FL_TEAM_3)
                        thiscount = c3;
 -              else if(head.team == COLOR_TEAM4)
 +              else if(head.team == FL_TEAM_4)
                        thiscount = c4;
                else
                        thiscount = 0;

diff --combined qcsrc/server/scores.qc
index 1104b6f901da3e7eba594b2993048c4fa268f66d,c2307ad3756208e08b7329ce90e7c2c8712a004a..2465cbc89859c4fb811a9cc691542eadcc860b36
--- 1/qcsrc/server/scores.qc
--- 2/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@@ -204,13 -204,13 +204,13 @@@ void ScoreInfo_Init(float teams
                Net_LinkEntity(scores_initialized, FALSE, 0, ScoreInfo_SendEntity);
        }
        if(teams >= 1)
 -              TeamScore_Spawn(COLOR_TEAM1, "Red");
 +              TeamScore_Spawn(FL_TEAM_1, "Red");
        if(teams >= 2)
 -              TeamScore_Spawn(COLOR_TEAM2, "Blue");
 +              TeamScore_Spawn(FL_TEAM_2, "Blue");
        if(teams >= 3)
 -              TeamScore_Spawn(COLOR_TEAM3, "Yellow");
 +              TeamScore_Spawn(FL_TEAM_3, "Yellow");
        if(teams >= 4)
 -              TeamScore_Spawn(COLOR_TEAM4, "Pink");
 +              TeamScore_Spawn(FL_TEAM_4, "Pink");
  }
  
  /*
@@@ -725,7 -725,7 +725,7 @@@ entity PlayerScore_Sort(.float field, f
                if(!plast || PlayerTeamScore_Compare(plast, pbest, 0))
                        j = i;
  
-               pbest.field = ++i;
+               pbest.field = j;
  
                if not(pfirst)
                        pfirst = pbest;
@@@ -785,7 -785,7 +785,7 @@@ void Score_NicePrint_Team(entity to, fl
        sk = teamscorekeepers[t - 1];
        if(sk)
        {
 -              s = strcat(s, ColoredTeamName(t));
 +              s = strcat(s, Team_ColoredFullName(t));
                for(i = 0; i < MAX_TEAMSCORE; ++i)
                        if(teamscores_label[i] != "")
                        {