From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 16 Aug 2011 11:34:12 +0000 (+0000)
Subject: fix MOVETYPE_FAKEPUSH (tenebrae movetype 13) implementation
X-Git-Tag: xonotic-v0.6.0~163^2~276
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=dd9b6a7eef6a97ea184a54ededf6cc610164138d

fix MOVETYPE_FAKEPUSH (tenebrae movetype 13) implementation


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11276 d7cf8633-e32d-0410-b094-e92efae38249
---

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;