From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 13 Jan 2005 08:14:54 +0000 (+0000)
Subject: migrated push thinks back to SV_Physics_Pusher to fix a qc crash when touching a... 
X-Git-Tag: xonotic-v0.1.0preview~5218
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f7cd5958c57a3242e016326a215e51e9302e6acb;p=xonotic%2Fdarkplaces.git

migrated push thinks back to SV_Physics_Pusher to fix a qc crash when touching a door


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

diff --git a/sv_phys.c b/sv_phys.c
index 9a9fc359..6145c080 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -767,7 +767,6 @@ void SV_Physics_Pusher (edict_t *ent)
 		// advances ent->v->ltime if not blocked
 		SV_PushMove (ent, movetime);
 
-	/*
 	if (thinktime > oldltime && thinktime <= ent->v->ltime)
 	{
 		ent->v->nextthink = 0;
@@ -776,7 +775,6 @@ void SV_Physics_Pusher (edict_t *ent)
 		pr_global_struct->other = EDICT_TO_PROG(sv.edicts);
 		PR_ExecuteProgram (ent->v->think, "QC function self.think is missing");
 	}
-	*/
 }
 
 
@@ -1439,14 +1437,7 @@ void SV_Physics (void)
 		{
 		case MOVETYPE_PUSH:
 		case MOVETYPE_FAKEPUSH:
-			if (ent->v->nextthink && ent->v->ltime > ent->v->nextthink)
-			{
-				ent->v->nextthink = 0;
-				pr_global_struct->time = sv.time;
-				pr_global_struct->self = EDICT_TO_PROG(ent);
-				pr_global_struct->other = EDICT_TO_PROG(sv.edicts);
-				PR_ExecuteProgram (ent->v->think, "QC function self.think is missing");
-			}
+			// push thinks are called from SV_Physics_Pusher 
 			break;
 		case MOVETYPE_NONE:
 		case MOVETYPE_FOLLOW: