]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/cl_client.qc
Merge remote-tracking branch 'origin/diabolik/newanims'
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc
index 1406e13b8fc528f359611a7b11823c2a6783d94c..3d6adb688214d1866f46f504620796ea246bc512 100644 (file)
@@ -735,9 +735,6 @@ void PutObserverInServer (void)
        }
        else
                self.frags = FRAGS_SPECTATOR;
-
-    if(self.shownames)
-        remove(self.shownames);
 }
 
 void FixPlayermodel()
@@ -1103,15 +1100,6 @@ void PutClientInServer (void)
                PutObserverInServer ();
        }
 
-    if(!self.shownames)
-    {
-        self.shownames = spawn();
-        self.shownames.owner = self;
-        self.shownames.think = shownames_think;
-        self.shownames.nextthink = time;
-        Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
-    }
-
        //if(g_ctf)
        //      ctf_playerchanged();
 }
@@ -1651,6 +1639,9 @@ void ClientConnect (void)
 
        self.playerid = (playerid_last = playerid_last + 1);
 
+    if(clienttype(self) == CLIENTTYPE_BOT)
+        PlayerStats_AddPlayer(self);
+
        if(autocvar_sv_eventlog)
                GameLogEcho(strcat(":join:", ftos(self.playerid), ":", ftos(num_for_edict(self)), ":", ((clienttype(self) == CLIENTTYPE_REAL) ? self.netaddress : "bot"), ":", self.netname));
 
@@ -1713,8 +1704,7 @@ void ClientConnect (void)
                ctf_clientconnect();
        }*/
 
-       if(teams_matter || radar_showennemies)
-               attach_entcs();
+       attach_entcs();
 
        bot_relinkplayerlist();
 
@@ -1783,8 +1773,6 @@ void ClientConnect (void)
                set_dom_state(self);
 
        CheatInitClient();
-
-       PlayerStats_AddPlayer(self);
 }
 
 /*
@@ -1880,8 +1868,6 @@ void ClientDisconnect (void)
        self.playerid = 0;
        ReadyCount();
 
-    remove(self.shownames);
-
        // free cvars
        GetCvars(-1);
 }