nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-03-24 19:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/nzp-team/quakec

Browse source
This commit is contained in:
cypress 2023-10-15 11:30:26 -04:00
commit 4b78cfeb05
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/server/entities/lights.qc
View file

@ -96,6 +96,8 @@ void() light_torch_large_yellow = // Light with larger flame & fire sound
{ L_Setup(); self.frame = 1; makestatic(self); }
void() light_flame_small_white = // Light with small flame & fire sound
{ L_Setup(); makestatic(self); }
void() light_spot = // Spotlight
{ L_Setup(); }
//
// --------------------

4
source/shared/weapon_defines.qc
View file

@ -1346,7 +1346,7 @@ float(float wep, float delaytype) getWeaponDelay =
else if (delaytype == FIRE)
return 0.35;
else if (delaytype == PUTOUT)
return 0.6;
return 1.0;
else if (delaytype == TAKEOUT)
return 0.3;
case W_SAWNOFF:
@ -4617,4 +4617,4 @@ float(string weapon) WepDef_GetWeaponIDFromName =
default: return W_NOWEP;
}
return W_COLT;
}
}