From f1321d241f2f0ffafc90f248e9848b80bd1e8dc5 Mon Sep 17 00:00:00 2001 From: erysdren Date: Sun, 22 Dec 2024 11:28:08 -0600 Subject: [PATCH] SERVER: fix player <-> zombie collisions in FTE --- source/server/ai/zombie_core.qc | 9 ++++++--- source/server/player/player_core.qc | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/source/server/ai/zombie_core.qc b/source/server/ai/zombie_core.qc index c04a29f..1d4b26e 100644 --- a/source/server/ai/zombie_core.qc +++ b/source/server/ai/zombie_core.qc @@ -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 diff --git a/source/server/player/player_core.qc b/source/server/player/player_core.qc index 9d24c36..b5cb072 100644 --- a/source/server/player/player_core.qc +++ b/source/server/player/player_core.qc @@ -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