Merge branch 'master' into terencehill/vehicles_fixes

diff --combined qcsrc/server/cl_client.qc
index bafe506accef64eb38d16785126285d34e777925,baf696f6ef60804bbce60aa81aeaf8dffc173cd0..fab6f400adc1fb31616936618e07e72fc11ce4c1
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -170,7 -170,7 +170,7 @@@ void PutObserverInServer (void
        
        if(self.alivetime)
        {
-               if(!inWarmupStage)
+               if(!warmup_stage)
                        PlayerStats_Event(self, PLAYERSTATS_ALIVETIME, time - self.alivetime);
                self.alivetime = 0;
        }
@@@ -394,9 -394,6 +394,9 @@@ void PutClientInServer (void
  
                RemoveGrapplingHook(self); // Wazat's Grappling Hook
  
 +              if(self.vehicle)
 +                      vehicles_exit(VHEF_RELESE);
 +
                self.classname = "player";
                self.wasplayer = TRUE;
                self.iscreature = TRUE;
@@@ -427,7 -424,7 +427,7 @@@
                        self.nex_charge = autocvar_g_balance_nex_charge_start;
                }
  
-               if(inWarmupStage)
+               if(warmup_stage)
                {
                        self.ammo_shells = warmup_start_ammo_shells;
                        self.ammo_nails = warmup_start_ammo_nails;
@@@ -596,7 -593,7 +596,7 @@@
                self.weaponname = "";
                self.switchingweapon = 0;
  
-               if(!inWarmupStage)
+               if(!warmup_stage)
                        if(!self.alivetime)
                                self.alivetime = time;
  
@@@ -814,7 -811,7 +814,7 @@@ void KillIndicator_Think(
                if(IS_REAL_CLIENT(self.owner))
                {
                        if(self.cnt <= 10)
-                               { Send_Notification(NOTIF_ONE, self.owner, MSG_ANNCE, Announcer_PickNumber(self.cnt)); }
+                               { Send_Notification(NOTIF_ONE, self.owner, MSG_ANNCE, Announcer_PickNumber(CNT_KILL, self.cnt)); }
                }
                self.nextthink = time + 1;
                self.cnt -= 1;
@@@ -1913,7 -1910,7 +1913,7 @@@ void ShowRespawnCountdown(
                {
                        self.respawn_countdown = number - 1;
                        if(ceil(self.respawn_time - (time + 0.5)) == number) // only say it if it is the same number even in 0.5s; to prevent overlapping sounds
-                               Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(number)); 
+                               { Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(CNT_RESPAWN, number)); }
                }
        }
  }
@@@ -2544,7 -2541,7 +2544,7 @@@ void PlayerPostThink (void
                        else if(timeleft <= 10)
                        {
                                if(timeleft != self.idlekick_lasttimeleft)
-                                       Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(timeleft));
+                                       { Send_Notification(NOTIF_ONE, self, MSG_ANNCE, Announcer_PickNumber(CNT_IDLE, timeleft)); }
                                self.idlekick_lasttimeleft = timeleft;
                        }
                }