From 7c6a6a996ec1d6dcbc8d8b65cb639044c865b7cd Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 30 Jan 2012 22:02:20 +0200 Subject: [PATCH] Always send the player model / skin to the client, not those of the stomach mesh. Also fix a few other things with the portraits. --- data/qcsrc/server/g_damage.qc | 4 ++-- data/qcsrc/server/miscfunctions.qc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 71c0a815..4b304b89 100644 --- 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))); } SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH); - portrait(attacker, targ); } + portrait(attacker, targ); } else { @@ -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))); } SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH); - portrait(attacker, targ); } + portrait(attacker, targ); } if(sv_gentle) { diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index d5be06cc..d2e3942f 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -2468,8 +2468,8 @@ float portrait_SendEntity(entity to, float sf) WriteByte(MSG_ENTITY, ENT_CLIENT_PORTRAIT); - WriteString(MSG_ENTITY, self.owner.model); - WriteByte(MSG_ENTITY, self.owner.skin); + WriteString(MSG_ENTITY, self.owner.playermodel); + WriteByte(MSG_ENTITY, stof(self.owner.playerskin)); WriteString(MSG_ENTITY, self.owner.netname); return TRUE; @@ -2483,7 +2483,7 @@ void portrait(entity pl, entity targ) e.owner = pl; e.enemy = targ; - Net_LinkEntity(e, FALSE, 0.1, portrait_SendEntity); + Net_LinkEntity(e, FALSE, 0, portrait_SendEntity); } void shockwave_spawn(string m, vector org, float sz, float t1, float t2) -- 2.39.2