nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-22 20:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Server: Add melee weapons to weapon2model blacklist

Browse source 
Fixes issue where left weapon in dual wields would stay visible
This commit is contained in:
Steam Deck User 2022-12-20 01:46:16 -05:00
parent a53ad310f4
commit d964e9afb2
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/server/weapons/frames_core.qc
View file

@ -164,6 +164,21 @@ void () W_Frame_Update =
} }
}; };
float(string path) model_should_hide_weapon2 =
{
switch(path) {
case "progs/VModels/v_nade.mdl":
case "progs/VModels/v_betty.mdl":
case "models/weapons/bk/v_bk.mdl":
case "models/weapons/knife/v_bowie.mdl":
case "models/weapons/knife/v_knife.mdl":
return true;
break;
}
return false;
}
void Set_W_Frame (float startframe, float endframe, float duration, float funccalledin, float animtype, void(optional float t) endanimfunc, string set_model, float dontstartnew, float side) = void Set_W_Frame (float startframe, float endframe, float duration, float funccalledin, float animtype, void(optional float t) endanimfunc, string set_model, float dontstartnew, float side) =
{ {
float math, reversed; float math, reversed;
@ -217,8 +232,7 @@ void Set_W_Frame (float startframe, float endframe, float duration, float funcca
else else
UpdateVmodel(self.weaponmodel, self.weaponskin); UpdateVmodel(self.weaponmodel, self.weaponskin);
if (model_should_hide_weapon2(set_model) == true) {
if (set_model == "progs/VModels/v_nade.mdl" || set_model == "progs/VModels/v_betty.mdl") {
self.weapon2model = ""; self.weapon2model = "";
UpdateV2model(self.weapon2model, 0); UpdateV2model(self.weapon2model, 0);
} else if (self.weapon == W_KAR_SCOPE) { } else if (self.weapon == W_KAR_SCOPE) {