From dbb2bb34d4fe962a65e3019663947ac59902093a Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 8 May 2014 04:53:16 +1000 Subject: [PATCH] Player colored hooks, also show hook coming from player in 3rd person mode --- particles/hook_green.tga | Bin 13307 -> 0 bytes particles/hook_white.tga | Bin 0 -> 65580 bytes qcsrc/client/hook.qc | 35 ++++++++++------------------------ qcsrc/client/miscfunctions.qc | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 particles/hook_green.tga create mode 100644 particles/hook_white.tga diff --git a/particles/hook_green.tga b/particles/hook_green.tga deleted file mode 100644 index e01eb47e80fbe7ae8130a5a0bdbe1d7e4f98a794..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13307 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 diff --git a/particles/hook_white.tga b/particles/hook_white.tga new file mode 100644 index 0000000000000000000000000000000000000000..c60f07028bcb85afa97b8d94bcd1451e9ce2cb72 GIT binary patch literal 65580 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 literal 0 HcmV?d00001 diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc index 196730a72..889e75d26 100644 --- a/qcsrc/client/hook.qc +++ b/qcsrc/client/hook.qc @@ -83,7 +83,7 @@ void Draw_GrapplingHook() break; } - if((self.owner.sv_entnum == player_localentnum - 1)) + if((self.owner.sv_entnum == player_localentnum - 1) && autocvar_chase_active <= 0) { switch(self.HookType) { @@ -129,30 +129,13 @@ void Draw_GrapplingHook() case ENT_CLIENT_HOOK: intensity = 1; offset = 0; - if(t == NUM_TEAM_1) + switch(t) { - tex = "particles/hook_red"; - rgb = '1 .3 .3'; - } - else if(t == NUM_TEAM_2) - { - tex = "particles/hook_blue"; - rgb = '.3 .3 1'; - } - else if(t == NUM_TEAM_3) - { - tex = "particles/hook_yellow"; - rgb = '1 1 .3'; - } - else if(t == NUM_TEAM_4) - { - tex = "particles/hook_pink"; - rgb = '1 .3 1'; - } - else - { - tex = "particles/hook_green"; - rgb = '.3 1 .3'; + case NUM_TEAM_1: tex = "particles/hook_red"; rgb = '1 0.3 0.3'; break; + case NUM_TEAM_2: tex = "particles/hook_blue"; rgb = '0.3 0.3 1'; break; + case NUM_TEAM_3: tex = "particles/hook_yellow"; rgb = '1 1 0.3'; break; + case NUM_TEAM_4: tex = "particles/hook_pink"; rgb = '1 0.3 1'; break; + default: tex = "particles/hook_white"; rgb = getcsqcplayercolor(self.sv_entnum); break; } break; case ENT_CLIENT_LGBEAM: @@ -232,7 +215,9 @@ void Ent_ReadHook(float bIsNew, float type) if(sf & 1) { - self.owner = playerslots[ReadByte() - 1]; + float myowner = ReadByte(); + self.owner = playerslots[myowner - 1]; + self.sv_entnum = myowner; switch(self.HookType) { default: diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index fbdbc45f3..8b674e782 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -589,6 +589,20 @@ float getplayeralpha(float pl) return 1; } +vector getcsqcplayercolor(float pl) +{ + entity e; + + e = CSQCModel_server2csqc(pl); + if(e) + { + if(e.colormap > 0) + return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, TRUE); + } + + return '1 1 1'; +} + float getplayerisdead(float pl) { entity e; -- 2.39.2