Merge branch 'master' into terencehill/start_ammo

diff --combined qcsrc/server/miscfunctions.qc
index 3a12eb8c57a036405bbd6edc2b76c47158995de2,dcbe7f183cb035595fab380ae8c22229806609d5..71294f1942affd51f53f1c37183a580a63d8122f
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -526,7 -526,7 +526,7 @@@ void GetCvars(float f
                if (s == "cl_weaponpriority")
                        self.switchweapon = w_getbestweapon(self);
                if (s == "cl_allow_uidtracking")
-                       PlayerStats_AddPlayer(self);
+                       PlayerStats_GameReport_AddPlayer(self);
        }
  }
  
@@@ -797,11 -797,11 +797,11 @@@ void readplayerstartcvars(
  
        if(start_items & IT_UNLIMITED_WEAPON_AMMO)
        {
 -              start_ammo_rockets = 999;
                start_ammo_shells = 999;
 +              start_ammo_nails = 999;
 +              start_ammo_rockets = 999;
                start_ammo_cells = 999;
                start_ammo_plasma = 999;
 -              start_ammo_nails = 999;
                start_ammo_fuel = 999;
        }
        else
@@@ -820,7 -820,6 +820,7 @@@
                warmup_start_ammo_nails = start_ammo_nails;
                warmup_start_ammo_rockets = start_ammo_rockets;
                warmup_start_ammo_cells = start_ammo_cells;
 +              warmup_start_ammo_plasma = start_ammo_plasma;
                warmup_start_ammo_fuel = start_ammo_fuel;
                warmup_start_health = start_health;
                warmup_start_armorvalue = start_armorvalue;
@@@ -831,10 -830,9 +831,10 @@@
                if (!g_weaponarena && !g_ca)
                {
                        warmup_start_ammo_shells = cvar("g_warmup_start_ammo_shells");
 -                      warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
                        warmup_start_ammo_nails = cvar("g_warmup_start_ammo_nails");
                        warmup_start_ammo_rockets = cvar("g_warmup_start_ammo_rockets");
 +                      warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
 +                      warmup_start_ammo_plasma = cvar("g_warmup_start_ammo_plasma");
                        warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
                        warmup_start_health = cvar("g_warmup_start_health");
                        warmup_start_armorvalue = cvar("g_warmup_start_armor");
@@@ -880,16 -878,16 +880,16 @@@
  
        start_ammo_shells = max(0, start_ammo_shells);
        start_ammo_nails = max(0, start_ammo_nails);
 +      start_ammo_rockets = max(0, start_ammo_rockets);
        start_ammo_cells = max(0, start_ammo_cells);
        start_ammo_plasma = max(0, start_ammo_plasma);
 -      start_ammo_rockets = max(0, start_ammo_rockets);
        start_ammo_fuel = max(0, start_ammo_fuel);
  
        warmup_start_ammo_shells = max(0, warmup_start_ammo_shells);
        warmup_start_ammo_nails = max(0, warmup_start_ammo_nails);
 +      warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
        warmup_start_ammo_cells = max(0, warmup_start_ammo_cells);
        warmup_start_ammo_plasma = max(0, warmup_start_ammo_plasma);
 -      warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
        warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel);
  }