Always send the player model / skin to the client, not those of the stomach mesh...

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index 71c0a815359de364feb1948c019eff5c59a76500..4b304b89eb8fcc4b7da34d84ccd720786b503432 100644 (file)
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -383,8 +383,8 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                        centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were eaten by ^7", a, GetAdvancedDeathReports(attacker)));\r
                                                }\r
                                                SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
-                                               portrait(attacker, targ);\r
                                        }\r
+                                       portrait(attacker, targ);\r
                                }\r
                                else\r
                                {\r
@@ -400,8 +400,8 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                        centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were killed by ^7", a, GetAdvancedDeathReports(attacker)));\r
                                                }\r
                                                SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
-                                               portrait(attacker, targ);\r
                                        }\r
+                                       portrait(attacker, targ);\r
                                }\r
 \r
                                if(sv_gentle) {\r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index d5be06ccc7cd88045263fe89b410eef5f7733845..d2e3942fe5d36a45777bb0a1972a958caef70031 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -2468,8 +2468,8 @@ float portrait_SendEntity(entity to, float sf)
 \r
        WriteByte(MSG_ENTITY, ENT_CLIENT_PORTRAIT);\r
 \r
-       WriteString(MSG_ENTITY, self.owner.model);\r
-       WriteByte(MSG_ENTITY, self.owner.skin);\r
+       WriteString(MSG_ENTITY, self.owner.playermodel);\r
+       WriteByte(MSG_ENTITY, stof(self.owner.playerskin));\r
        WriteString(MSG_ENTITY, self.owner.netname);\r
 \r
        return TRUE;\r
@@ -2483,7 +2483,7 @@ void portrait(entity pl, entity targ)
        e.owner = pl;\r
        e.enemy = targ;\r
 \r
-       Net_LinkEntity(e, FALSE, 0.1, portrait_SendEntity);\r
+       Net_LinkEntity(e, FALSE, 0, portrait_SendEntity);\r
 }\r
 \r
 void shockwave_spawn(string m, vector org, float sz, float t1, float t2)\r