Do skin updates on next prethink

Author: drzel

ssqc/client.qc

@@ -73,6 +73,8 @@ void StopAssCan();
 void Predict_InitPlayer(entity player);
 void Predict_Destroy(entity player);
 
+void SetSkinInfoFor(entity pov, entity target);
+
 void () info_intermission =
 {
     if (CheckExistence() == 0) {
@@ -2768,9 +2770,31 @@ static void ConcUpdate() {
     }
 }
 
+// If a forceinfokey and a SVC_SETINFO are both set in the same frame, they
+// will clobber each other. Thus we do skin setinfos like normal, and then
+// per-player custom skin infos are immediately applied for those who need to
+// update on the next frame.
+void () UpdateAllSkins = {
+    local entity target = find(world, classname, "player");
+    local entity pov;
+
+    while (target != world) {
+        if (target.needs_skin_update) {
+            pov = find(world, classname, "player");
+            while (pov != world) {
+                SetSkinInfoFor(pov, target);
+                pov = find(pov, classname, "player");
+            }
+            target.needs_skin_update = 0;
+        }
+        target = find(target, classname, "player");
+    }
+}
+
 void () PlayerPreThink = {
     FO_UpdateClientTime();
     ConcUpdate();
+    UpdateAllSkins();
 
     if (self.impulse) {
         if (self.impulse == TF_VOTENEXT) {
@@ -3147,21 +3171,37 @@ void () UpdateAllClientsTeamScores = {
     }
 }
 
-void (entity pov, entity target) SetSkinInfoFor = {
+void (entity pov, entity target) SetBottomColorInfoFor = {
     local float target_idx = target.colormap - 1;
     local string color = TeamFortress_TeamGetColorFor(pov, target.team_no);
 
+    bprint(PRINT_HIGH, sprintf("Setting bottomcolor %s on %s for %s\n", color, target.netname, pov.netname));
+
     msg_entity = pov;
     WriteByte(MSG_ONE, SVC_SETINFO);
     WriteByte(MSG_ONE, target_idx);
-    WriteString(MSG_ONE, "topcolor");
+    WriteString(MSG_ONE, "bottomcolor");
     WriteString(MSG_ONE, color);
+}
+
+void (entity pov, entity target) SetTopColorInfoFor = {
+    local float target_idx = target.colormap - 1;
+    local string color = TeamFortress_TeamGetColorFor(pov, target.team_no);
+
+    bprint(PRINT_HIGH, sprintf("Setting topcolor %s on %s for %s\n", color, target.netname, pov.netname));
+
+    msg_entity = pov;
     WriteByte(MSG_ONE, SVC_SETINFO);
     WriteByte(MSG_ONE, target_idx);
-    WriteString(MSG_ONE, "bottomcolor");
+    WriteString(MSG_ONE, "topcolor");
     WriteString(MSG_ONE, color);
 }
 
+void (entity pov, entity target) SetSkinInfoFor = {
+    SetTopColorInfoFor(pov, target);
+    SetBottomColorInfoFor(pov, target);
+}
+
 void () ClientConnect = {
     if (!infokeyf(self,INFOKEY_P_CSQCACTIVE)) {
         sprint(self, PRINT_HIGH, "FTE/CSQC is required for this server, please download the latest client package at www.fortressone.org\n");
@@ -3221,13 +3261,7 @@ void () ClientConnect = {
     UpdateClientTeamScores(self);
     UpdateClientPrematch(self, !cb_prematch);
     UpdateClient_VoteMap_AddAll(self);
-
-    // Set skin colours
-    local entity te = find(world, classname, "player");
-    while (te != world) {
-        SetSkinInfoFor(self, te);
-        te = find(te, classname, "player");
-    }
+    TeamFortress_SetSkin(self);
 
     if (cb_prematch)
         sprint(self, PRINT_HIGH, "Currently in \sprematch\s time\n");

ssqc/commands.qc

@@ -316,11 +316,10 @@ void (entity pl) PrintWho = {
 void (entity pov, string command, string color) UpdateTeamColor = {
     forceinfokey(pov, command, color);
 
-    local entity te = find(world, classname, "player");
-    while (te != world) {
-        TeamFortress_SetSkin(te);
-
-        te = find(te, classname, "player");
+    local entity target = find(world, classname, "player");
+    while (target != world) {
+        SetSkinInfoFor(pov, target);
+        target = find(target, classname, "player");
     }
 }
 
@@ -363,12 +362,6 @@ float (string arg1, string arg2, string arg3) ParseCmds = {
         case "setinfo":
             if (arg2) {
                 switch(arg2) {
-                    /* case "topcolor": */
-                    /* case "bottomcolor": */
-                    /* case "color": */
-                    /*     TeamFortress_SetSkin(self); */
-                    /*     processedCmd = TRUE; */
-                    /*     break; */
                     case "team1color":
                     case "team2color":
                     case "team3color":

ssqc/qw.qc

@@ -100,6 +100,7 @@ float remote_client_time();
 .float building_percentage;     // The building percentage shown in status bar
 .float fragstreak;              // Frag streak
 .float caps;                    // Caps during this game
+.float needs_skin_update;       // Set true when per-player skins need updating
 
 .entity nopickup;               // Don't pick up this backpack/ammobox because it doesn't contain any of your ammo types
 

ssqc/tfort.qc

@@ -1171,48 +1171,34 @@ string(float pc) TeamFortress_GetSkin = {
     return skin;
 };
 
-void (entity player) TeamFortress_SetSkinInfos = {
-    local string sk = TeamFortress_GetSkin(player.playerclass);
-    forceinfokey(player, "skin",  sk);
-    stuffcmd(player, sprintf("skin %s\n", sk));
-
-    local string col = TeamFortress_TeamGetColor(player.team_no);
-    forceinfokey(player, "bottomcolor", col);
-    /* stuffcmd(player, sprintf("setinfo bottomcolor %s\n", col)); */
-    forceinfokey(player, "topcolor", col);
-    /* stuffcmd(player, sprintf("setinfo topcolor %s\n", col)); */
-
-    local entity te = find(world, classname, "player");
-    while (te != world) {
-        SetSkinInfoFor(te, player);
-        te = find(te, classname, "player");
-    }
-}
-
-void (entity p) TeamFortress_SetSkin = {
-    p.immune_to_check = time + 10;
-
-    if (p.playerclass == PC_SPY || p.last_playerclass == PC_SPY) {
-        if (!p.is_undercover) {
-            TeamFortress_SetSkinInfos(p);
-        } else {
-            Spy_SetClientSkins(p);
-        }
+void (entity player) TeamFortress_SetSkin = {
+    player.immune_to_check = time + 10;
 
+    if (player.playerclass == PC_SPY && player.is_undercover) {
+        Spy_SetClientSkins(player);
         return;
     }
 
-    p.skin = p.playerclass;
+    player.skin = player.playerclass;
+
+    if (player.skin != 0) {
+        player.needs_skin_update = 1;
+        local string sk = TeamFortress_GetSkin(player.playerclass);
+        forceinfokey(player, "skin",  sk);
+        stuffcmd(player, sprintf("skin %s\n", sk));
 
-    if (p.skin != 0) {
-        TeamFortress_SetSkinInfos(p);
+        local string col = TeamFortress_TeamGetColor(player.team_no);
+        forceinfokey(player, "bottomcolor", col);
+        stuffcmd(player, sprintf("setinfo bottomcolor %s\n", col));
+        forceinfokey(player, "topcolor", col);
+        stuffcmd(player, sprintf("setinfo topcolor %s\n", col));
     } else {
-        forceinfokey(p, "skin", "base");
-        stuffcmd(p, sprintf("skin %s\n", "base"));
-        forceinfokey(p, "bottomcolor", NOTEAMCOLOR);
-        stuffcmd(p, sprintf("bottomcolor %s\n", NOTEAMCOLOR));
-        forceinfokey(p, "topcolor", NOTEAMCOLOR);
-        stuffcmd(p, sprintf("topcolor %s\n", NOTEAMCOLOR));
+        forceinfokey(player, "skin", "base");
+        stuffcmd(player, sprintf("skin %s\n", "base"));
+        forceinfokey(player, "bottomcolor", NOTEAMCOLOR);
+        stuffcmd(player, sprintf("bottomcolor %s\n", NOTEAMCOLOR));
+        forceinfokey(player, "topcolor", NOTEAMCOLOR);
+        stuffcmd(player, sprintf("topcolor %s\n", NOTEAMCOLOR));
     }
 };
 

ssqc/tforttm.qc

@@ -339,6 +339,9 @@ void (entity player) TeamFortress_CheckTeamCheats = {
     if ((player.team_no > 0) && (teamplay > 0)) {
         st = infokey(player, "bottomcolor");
         if (st != TeamFortress_TeamGetColor(player.team_no)) {
+            bprint(PRINT_HIGH, sprintf("%s's bottomcolor is wrong\n", player.netname));
+            bprint(PRINT_HIGH, sprintf("setinfo: %s\n", st));
+            bprint(PRINT_HIGH, sprintf("TF_TGC: %s\n", TeamFortress_TeamGetColor(player.team_no)));
             TeamFortress_SetSkin(player);
         }
         if (player.playerclass != 0) {