]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
migrated push thinks back to SV_Physics_Pusher to fix a qc crash when touching a...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 13 Jan 2005 08:14:54 +0000 (08:14 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 13 Jan 2005 08:14:54 +0000 (08:14 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4931 d7cf8633-e32d-0410-b094-e92efae38249

sv_phys.c

index 9a9fc359898faef0e5c33ebe7e65fd30750beab7..6145c080e597bda0fee4638670368b64237a0823 100644 (file)
--- 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: