fixed the complaints about missing sounds (no longer complains after the initial...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 37b1ae5ffaafbb877b2fe352b07855f3aed1cfc3..e6eb2459134e34cb66990a36cf91a6c62130ad5e 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -248,15 +248,17 @@ int SV_FlyMove (edict_t *ent, float time, float *stepnormal)
                        trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
                        //Con_Printf("trace %f %f %f : %f : %f %f %f\n", trace.endpos[0], trace.endpos[1], trace.endpos[2], trace.fraction, trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]);
 
-                       if (trace.allsolid)
+                       /*
+                       if (trace.startsolid)
                        {
                                // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
                                // entity is trapped in another solid
                                VectorClear(ent->v->velocity);
                                return 3;
                        }
+                       */
 
-                       if (trace.fraction > 0)
+                       if (trace.fraction >= 0.001)
                        {
                                // actually covered some distance
                                VectorCopy (trace.endpos, ent->v->origin);
@@ -341,13 +343,15 @@ int SV_FlyMove (edict_t *ent, float time, float *stepnormal)
 
                        trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
 
-                       if (trace.allsolid)
+                       /*
+                       if (trace.startsolid)
                        {
                                // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
                                // entity is trapped in another solid
                                VectorClear(ent->v->velocity);
                                return 3;
                        }
+                       */
 
                        if (trace.fraction > 0)
                        {
@@ -521,7 +525,7 @@ trace_t SV_PushEntity (edict_t *ent, vec3_t push, vec3_t pushangles)
        ent->v->angles[1] += trace.fraction * pushangles[1];
        SV_LinkEdict (ent, true);
 
-       if (trace.fraction < 1 && trace.ent && (!((int)ent->v->flags & FL_ONGROUND) || ent->v->groundentity != EDICT_TO_PROG(trace.ent)))
+       if (trace.ent && (!((int)ent->v->flags & FL_ONGROUND) || ent->v->groundentity != EDICT_TO_PROG(trace.ent)))
                SV_Impact (ent, trace.ent);
        return trace;
 }
@@ -542,7 +546,6 @@ void SV_PushMove (edict_t *pusher, float movetime)
        vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org, org2;
        int num_moved;
        model_t *pushermodel;
-       trace_t trace;
 
        switch ((int) pusher->v->solid)
        {
@@ -665,12 +668,11 @@ void SV_PushMove (edict_t *pusher, float movetime)
                         || check->v->absmax[2] <= mins[2])
                                continue;
 
-                       trace = SV_ClipMoveToEntity (pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin);
-                       if (!trace.startsolid)
+                       if (!SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid)
                                continue;
                }
 
-               if (forward[0] < 0.999f) // quick way to check if any rotation is used
+               if (forward[0] != 1) // quick way to check if any rotation is used
                {
                        VectorSubtract (check->v->origin, pusher->v->origin, org);
                        org2[0] = DotProduct (org, forward);
@@ -692,18 +694,18 @@ void SV_PushMove (edict_t *pusher, float movetime)
 
                // try moving the contacted entity
                pusher->v->solid = SOLID_NOT;
-               trace = SV_PushEntity (check, move, moveangle);
+               SV_PushEntity (check, move, moveangle);
                pusher->v->solid = savesolid; // was SOLID_BSP
 
                // if it is still inside the pusher, block
-               if (SV_TestEntityPosition (check))
+               if (SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid)
                {
                        // try moving the contacted entity a tiny bit further to account for precision errors
                        pusher->v->solid = SOLID_NOT;
                        VectorScale(move, 0.1, move);
-                       trace = SV_PushEntity (check, move, vec3_origin);
+                       SV_PushEntity (check, move, vec3_origin);
                        pusher->v->solid = savesolid;
-                       if (SV_TestEntityPosition (check))
+                       if (SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid)
                        {
                                // still inside pusher, so it's really blocked
 
@@ -942,7 +944,10 @@ int SV_TryUnstick (edict_t *ent, vec3_t oldvel)
 
                if (fabs(oldorg[1] - ent->v->origin[1]) > 4
                 || fabs(oldorg[0] - ent->v->origin[0]) > 4)
+               {
+                       Con_DPrintf("TryUnstick - success.\n");
                        return clip;
+               }
 
                // go back to the original pos and try again
                VectorCopy (oldorg, ent->v->origin);
@@ -950,6 +955,7 @@ int SV_TryUnstick (edict_t *ent, vec3_t oldvel)
 
        // still not moving
        VectorClear (ent->v->velocity);
+       Con_DPrintf("TryUnstick - failure.\n");
        return 7;
 }
 
@@ -1271,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)
@@ -1363,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: