]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fixed bug with falling (not on ground) MOVETYPE_STEP entities not touching triggers
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 28 Dec 2003 06:21:36 +0000 (06:21 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 28 Dec 2003 06:21:36 +0000 (06:21 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3762 d7cf8633-e32d-0410-b094-e92efae38249

sv_phys.c

index 8198a60e2ef1b57e25bf3679147cb40a1652c2db..e6eb2459134e34cb66990a36cf91a6c62130ad5e 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1277,7 +1277,7 @@ void SV_Physics_Step (edict_t *ent)
                SV_AddGravity(ent);
                SV_CheckVelocity(ent);
                SV_FlyMove(ent, sv.frametime, NULL);
-               SV_LinkEdict(ent, false);
+               SV_LinkEdict(ent, true);
 
                // just hit ground
                if (hitsound && (int)ent->v->flags & FL_ONGROUND)
@@ -1369,7 +1369,9 @@ void SV_Physics (void)
                                        SV_AddGravity (ent);
                                SV_CheckStuck (ent);
                                SV_WalkMove (ent);
-                               SV_LinkEdict (ent, true);
+                               // relink normal entities here, players always get relinked so don't relink twice
+                               if (!(i > 0 && i <= svs.maxclients))
+                                       SV_LinkEdict (ent, true);
                        }
                        break;
                case MOVETYPE_TOSS: