nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-29 15:22:29 +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-17 09:14:59 -04:00
commit 2ab61575f1
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/client/hud.qc
View file

@ -1156,7 +1156,7 @@ void() Draw_Crosshair =
} }
float crosshair_value = cvar("crosshair"); float crosshair_value = cvar("crosshair");
if (!crosshair_value) if (!crosshair_value || getstatf(STAT_WEAPONZOOM) == 1)
return; return;
if (!crosshair_opacity) if (!crosshair_opacity)

13
source/server/ai/zombie_core.qc
View file

@ -1553,7 +1553,18 @@ void() spawnAllZombEnts =
local float i; local float i;
i = 0; i = 0;
while(i < MAX_ZOMB) // cypress -- let host engine dictate
// max ai at once.
#ifdef FTE
while(i < 24)
#else
while(i < nzp_maxai())
#endif // FTE
{ {
spawnSingleZombEnt(i); spawnSingleZombEnt(i);
i++; i++;

11
source/server/defs/custom.qc
View file

@ -248,17 +248,6 @@ void() SUB_Null2 = {};
#define VEC_VIEW_OFS '0 0 32' #define VEC_VIEW_OFS '0 0 32'
// FIXME: Limits Quakespasm to 12 zombies lol
#ifdef FTE
#define MAX_ZOMB 24
#else
#define MAX_ZOMB 12
#endif // FTE
vector trace_plane_normal; vector trace_plane_normal;
// //

1
source/server/defs/standard.qc
View file

@ -267,6 +267,7 @@ string(float num)
void (string trackname) songegg = #500; void (string trackname) songegg = #500;
void () nzp_maxammo = #501; void () nzp_maxammo = #501;
void (entity who) grenade_pulse = #502; void (entity who) grenade_pulse = #502;
float () nzp_maxai = #503;
// //
// constants // constants