nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-03-28 13:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: fix player <-> zombie collisions in FTE

Browse source
This commit is contained in:
erysdren 2024-12-22 11:28:08 -06:00
parent 54502a54c8
commit f1321d241f
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1719,8 +1719,11 @@ void(entity szombie) SetUpHitBoxes =
#ifdef FTE
szombie.head.dimension_solid = HITBOX_DIM_LIMBS;
szombie.head.dimension_hit = HITBOX_DIM_LIMBS;
szombie.larm.dimension_solid = HITBOX_DIM_LIMBS;
szombie.larm.dimension_hit = HITBOX_DIM_LIMBS;
szombie.rarm.dimension_solid = HITBOX_DIM_LIMBS;
szombie.rarm.dimension_hit = HITBOX_DIM_LIMBS;
#endif // FTE
@ -1824,13 +1827,13 @@ void(entity where) spawn_a_zombieB =
updateLimb (szombie, 2, szombie.rarm);
#endif // FTE
szombie.solid = SOLID_CORPSE;
szombie.solid = SOLID_SLIDEBOX;
#ifdef FTE
szombie.dimension_solid = HITBOX_DIM_ZOMBIES;
szombie.dimension_hit &= ~HITBOX_DIM_ZOMBIES;
#endif // FTE

9
source/server/player/player_core.qc
View file

@ -743,7 +743,7 @@ void() PlayerPostThink =
#ifdef FTE
self.dimension_hit = HITBOX_DIM_LIMBS | HITBOX_DIM_ZOMBIES;
self.dimension_hit |= HITBOX_DIM_LIMBS;
#endif // FTE
@ -751,7 +751,7 @@ void() PlayerPostThink =
#ifdef FTE
self.dimension_hit = HITBOX_DIM_ZOMBIES;
self.dimension_hit &= ~HITBOX_DIM_LIMBS;
#endif // FTE
@ -867,7 +867,10 @@ void() PlayerSpawn =
#ifdef FTE
self.dimension_hit = HITBOX_DIM_ZOMBIES;
self.dimension_hit |= HITBOX_DIM_ZOMBIES;
self.dimension_solid |= HITBOX_DIM_ZOMBIES;
self.dimension_hit &= ~HITBOX_DIM_LIMBS;
#endif // FTE