Merge branch 'master' into terencehill/ca_fixes_and_more

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 6490073d5f78d8785e1f1d523979db7acaac0e20..578e8707e026796ce227b5724d201a637554b3d2 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -138,6 +138,8 @@ void PutObserverInServer (void)
        entity  spot;
     self.hud = HUD_NORMAL;
 
+       if(IS_PLAYER(self)) { pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); }
+
        spot = SelectSpawnPoint (TRUE);
        if(!spot)
                error("No spawnpoints for observers?!?\n");
@@ -502,6 +504,8 @@ void PutClientInServer (void)
                self.angles = spot.angles;
 
                self.angles_z = 0; // never spawn tilted even if the spot says to
+               if(IS_BOT_CLIENT(self))
+                       self.v_angle = self.angles;
                self.fixangle = TRUE; // turn this way immediately
                self.velocity = '0 0 0';
                self.avelocity = '0 0 0';
@@ -1235,6 +1239,8 @@ void ClientDisconnect (void)
                return;
        }
 
+       if(IS_PLAYER(self)) { pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); }
+
        PlayerStats_AddGlobalInfo(self);
 
        CheatShutdownClient();
@@ -1412,7 +1418,7 @@ void player_powerups (void)
        Fire_ApplyDamage(self);
        Fire_ApplyEffect(self);
 
-       if (!g_minstagib)
+       if (!g_instagib)
        {
                if (self.items & IT_STRENGTH)
                {