add Q3A's EF_TELEPORT_BIT (toggle it when teleporting; interpolation gets skipped...

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

diff --git a/cl_parse.c b/cl_parse.c
index c21a25944c54dbcb865ad00e9b8dd79460df6501..45b1890c904ff8248af51b27722d0fd397802694 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1739,6 +1739,28 @@ void CL_MoveLerpEntityStates(entity_t *ent)
                ent->persistent.muzzleflash = 0;
                ent->persistent.trail_allowed = false;
        }
+       else if ((ent->state_previous.effects & EF_TELEPORT_BIT) != (ent->state_current.effects & EF_TELEPORT_BIT))
+       {
+               // don't interpolate the move
+               ent->persistent.lerpdeltatime = 0;
+               ent->persistent.lerpstarttime = cl.mtime[1];
+               VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
+               VectorCopy(ent->state_current.angles, ent->persistent.oldangles);
+               VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+               VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+               ent->persistent.trail_allowed = false;
+
+               if(ent->state_current.frame != ent->state_previous.frame)
+               {
+                       // if we ALSO changed animation frame in the process (but ONLY then!)
+                       // then let's reset the animation interpolation too
+                       ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
+                       ent->render.frame1time = ent->render.frame2time = cl.time;
+                       ent->render.framelerp = 1;
+               }
+
+               // note that this case must do everything the following case does too
+       }
        else if (DotProduct(odelta, odelta) > 1000*1000
                || (cl.fixangle[0] && !cl.fixangle[1])
                || (ent->state_previous.tagindex != ent->state_current.tagindex)

diff --git a/protocol.h b/protocol.h
index 1dd989b0fb51c00fac5b37dbf3fe00bc2d9c2f88..98cd54e8be0a432cce8fa955ac0f9b0ee045b5f7 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -62,7 +62,7 @@ void Protocol_Names(char *buffer, size_t buffersize);
 #define EF_UNUSED18                            262144
 #define EF_UNUSED19                            524288
 #define EF_UNUSED20                            1048576
-#define EF_UNUSED21                            2197152
+#define EF_TELEPORT_BIT                        2197152         // div0: teleport bit (toggled when teleporting, prevents lerping when the bit has changed)
 #define EF_LOWPRECISION                        4194304         // LordHavoc: entity is low precision (integer coordinates) to save network bandwidth  (serverside only)
 #define EF_NOMODELFLAGS                        8388608         // indicates the model's .effects should be ignored (allows overriding them)
 #define EF_ROCKET                              16777216        // leave a trail

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 107c42b1f22a32bf538cb8940c972cc82d7b09bd..9ce38d3b0edf7e6860f715e87ac6871462572ae9 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -31,6 +31,7 @@ char *vm_sv_extensions =
 "DP_EF_NOSHADOW "
 "DP_EF_RED "
 "DP_EF_STARDUST "
+"DP_EF_TELEPORT_BIT "
 "DP_ENT_ALPHA "
 "DP_ENT_COLORMOD "
 "DP_ENT_CUSTOMCOLORMAP "