Merge branch 'fo-skins' into staging

Author: drzel

ssqc/client.qc

@@ -2258,16 +2258,6 @@ void () PutClientInServer = {
     TeamFortress_SetHealth();
     TeamFortress_SetSpeed(self);
     TeamFortress_SetSkin(self);
-
-    te = find(world, classname, "player");
-    while (te != world) {
-        if (te != self) {
-            TeamFortress_SetSkin(te);
-        }
-
-        te = find(te, classname, "player");
-    }
-
     TeamFortress_StartTimers();
 
     if(quadmode && quad_roles) {
@@ -3157,6 +3147,21 @@ void () UpdateAllClientsTeamScores = {
     }
 }
 
+void (entity pov, entity target) SetSkinInfoFor = {
+    local float target_idx = target.colormap - 1;
+    local string color = TeamFortress_TeamGetColorFor(pov, target.team_no);
+
+    msg_entity = pov;
+    WriteByte(MSG_ONE, SVC_SETINFO);
+    WriteByte(MSG_ONE, target_idx);
+    WriteString(MSG_ONE, "topcolor");
+    WriteString(MSG_ONE, color);
+    WriteByte(MSG_ONE, SVC_SETINFO);
+    WriteByte(MSG_ONE, target_idx);
+    WriteString(MSG_ONE, "bottomcolor");
+    WriteString(MSG_ONE, color);
+}
+
 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");
@@ -3217,6 +3222,16 @@ void () ClientConnect = {
     UpdateClientPrematch(self, !cb_prematch);
     UpdateClient_VoteMap_AddAll(self);
 
+    // Set skin colours
+    local entity te = find(world, classname, "player");
+    while (te != world) {
+        if (te != self) {
+            SetSkinInfoFor(self, te);
+        }
+
+        te = find(te, classname, "player");
+    }
+
     if (cb_prematch)
         sprint(self, PRINT_HIGH, "Currently in \sprematch\s time\n");
 };

ssqc/engineer.qc

@@ -1040,6 +1040,7 @@ void () TeamFortress_FinishedBuilding = {
         newmis.th_die = Sentry_Die;
         newmis.th_pain = Sentry_Pain;
         newmis.mdl = "progs/turrgun.mdl";
+        newmis.colormod = '0.5 0.5 0.5';
         self.sentry_ent = newmis;
         FO_Sound(oldself, CHAN_ITEM, "weapons/turrset.wav", 1, 1);
         newmis.solid = SOLID_BBOX;

ssqc/tfort.qc

@@ -1173,28 +1173,16 @@ string(float pc) TeamFortress_GetSkin =
     return skin;
 };
 
-
 void (entity player) TeamFortress_SetSkinInfos = {
     local string st = TeamFortress_GetSkin(player.playerclass);
     local string command = sprintf("skin %s\n", st);
     stuffcmd(player, command);
     forceinfokey(player, "skin", st); // please fix mvd recording
 
-    local string color;
     local entity te = find(world, classname, "player");
     while (te != world) {
         if (te != player) {
-            msg_entity = te;
-            color = TeamFortress_TeamGetColorFor(te, player.team_no);
-
-            WriteByte(MSG_ONE, SVC_SETINFO);
-            WriteByte(MSG_ONE, player.colormap-1); // ???? Copied from spy.qc
-            WriteString(MSG_ONE, "topcolor");
-            WriteString(MSG_ONE, color);
-            WriteByte(MSG_ONE, SVC_SETINFO);
-            WriteByte(MSG_ONE, player.colormap-1); // ???? Copied from spy.qc
-            WriteString(MSG_ONE, "bottomcolor");
-            WriteString(MSG_ONE, color);
+            SetSkinInfoFor(te, player);
         }
 
         te = find(te, classname, "player");