some work on SV_TestEntityPosition and entity unsticking, now only checks against...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 1e58ea8b8b0b97b76d8080cca7f9d8c8ac09a149..4e17bc92d5907a43bc7f4660aab542b3d8a98df9 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -72,6 +72,18 @@ void SV_Phys_Init (void)
        Cvar_RegisterVariable(&sv_sound_land);
 }
 
+/*
+============
+SV_TestEntityPosition
+
+returns true if the entity is in solid currently
+============
+*/
+static int SV_TestEntityPosition (prvm_edict_t *ent, int movemode)
+{
+       return SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, movemode, ent).startsolid;
+}
+
 /*
 ================
 SV_CheckAllEnts
@@ -94,7 +106,7 @@ void SV_CheckAllEnts (void)
                 || check->fields.server->movetype == MOVETYPE_NOCLIP)
                        continue;
 
-               if (SV_TestEntityPosition (check))
+               if (SV_TestEntityPosition (check, MOVE_NORMAL))
                        Con_Print("entity in invalid position\n");
        }
 }
@@ -819,7 +831,7 @@ void SV_CheckStuck (prvm_edict_t *ent)
        int i, j, z;
        vec3_t org;
 
-       if (!SV_TestEntityPosition(ent))
+       if (!SV_TestEntityPosition(ent, MOVE_NORMAL))
        {
                VectorCopy (ent->fields.server->origin, ent->fields.server->oldorigin);
                return;
@@ -827,7 +839,7 @@ void SV_CheckStuck (prvm_edict_t *ent)
 
        VectorCopy (ent->fields.server->origin, org);
        VectorCopy (ent->fields.server->oldorigin, ent->fields.server->origin);
-       if (!SV_TestEntityPosition(ent))
+       if (!SV_TestEntityPosition(ent, MOVE_NORMAL))
        {
                Con_DPrintf("Unstuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
                SV_LinkEdict (ent, true);
@@ -841,7 +853,7 @@ void SV_CheckStuck (prvm_edict_t *ent)
                                ent->fields.server->origin[0] = org[0] + i;
                                ent->fields.server->origin[1] = org[1] + j;
                                ent->fields.server->origin[2] = org[2] + z;
-                               if (!SV_TestEntityPosition(ent))
+                               if (!SV_TestEntityPosition(ent, MOVE_NORMAL))
                                {
                                        Con_DPrintf("Unstuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
                                        SV_LinkEdict (ent, true);
@@ -853,11 +865,15 @@ void SV_CheckStuck (prvm_edict_t *ent)
        Con_DPrintf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
 }
 
-void SV_UnstickEntity (prvm_edict_t *ent)
+static void SV_UnstickEntity (prvm_edict_t *ent)
 {
        int i, j, z;
        vec3_t org;
 
+       // if not stuck in a bmodel, just return
+       if (!SV_TestEntityPosition(ent, MOVE_NOMONSTERS))
+               return;
+
        VectorCopy (ent->fields.server->origin, org);
 
        for (z=0 ; z< 18 ; z += 6)
@@ -867,7 +883,7 @@ void SV_UnstickEntity (prvm_edict_t *ent)
                                ent->fields.server->origin[0] = org[0] + i;
                                ent->fields.server->origin[1] = org[1] + j;
                                ent->fields.server->origin[2] = org[2] + z;
-                               if (!SV_TestEntityPosition(ent))
+                               if (!SV_TestEntityPosition(ent, MOVE_NOMONSTERS))
                                {
                                        Con_DPrintf("Unstuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
                                        SV_LinkEdict (ent, true);