From f23e717e9297d2653e933c41a478d281f5091f85 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 16 Aug 2011 11:34:12 +0000 Subject: [PATCH] fix MOVETYPE_FAKEPUSH (tenebrae movetype 13) implementation git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11276 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=dd9b6a7eef6a97ea184a54ededf6cc610164138d --- sv_phys.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sv_phys.c b/sv_phys.c index a28d178b..24276208 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -1771,7 +1771,10 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime) // see if any solid entities are inside the final position num_moved = 0; - numcheckentities = World_EntitiesInBox(&sv.world, mins, maxs, MAX_EDICTS, checkentities); + if (PRVM_serveredictfloat(pusher, movetype) == MOVETYPE_FAKEPUSH) // Tenebrae's MOVETYPE_PUSH variant that doesn't push... + numcheckentities = 0; + else // MOVETYPE_PUSH + numcheckentities = World_EntitiesInBox(&sv.world, mins, maxs, MAX_EDICTS, checkentities); for (e = 0;e < numcheckentities;e++) { prvm_edict_t *check = checkentities[e]; @@ -1782,7 +1785,6 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime) case MOVETYPE_PUSH: case MOVETYPE_FOLLOW: case MOVETYPE_NOCLIP: - case MOVETYPE_FAKEPUSH: continue; default: break; -- 2.39.2