DP_EF_RESTARTANIM_BIT

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

diff --git a/cl_parse.c b/cl_parse.c
index 44991042fc33fc9fbdbe6db876cc5b91db0f3ded..e924b18776551cdaa3b859640f6b1307fc35b405 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1899,6 +1899,14 @@ void CL_MoveLerpEntityStates(entity_t *ent)
 
                // note that this case must do everything the following case does too
        }
+       else if ((ent->state_previous.effects & EF_RESTARTANIM_BIT) != (ent->state_current.effects & EF_RESTARTANIM_BIT))
+       {
+               ent->render.framegroupblend[1] = ent->render.framegroupblend[0];
+               ent->render.framegroupblend[1].lerp = 1;
+               ent->render.framegroupblend[0].frame = ent->state_current.frame;
+               ent->render.framegroupblend[0].start = cl.time;
+               ent->render.framegroupblend[0].lerp = 0;
+       }
        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 21c856611780791e008e3819e040cd88b999626a..1335a3a1d5c4de393a2ae935975765fb8312b667 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -61,7 +61,7 @@ void Protocol_Names(char *buffer, size_t buffersize);
 #define EF_UNUSED17                            131072
 #define EF_UNUSED18                            262144
 #define EF_UNUSED19                            524288
-#define EF_UNUSED20                            1048576
+#define EF_RESTARTANIM_BIT             1048576     // div0: restart animation bit (like teleport bit, but lerps between end and start of the anim, and doesn't stop player lerping)
 #define EF_TELEPORT_BIT                        2097152         // 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)

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 879f797493aa1d1d1421692330237315f378f8d7..f282df49c3dc6766aa7cef61999e989a074ebc5f 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -34,6 +34,7 @@ char *vm_sv_extensions =
 "DP_EF_NOSELFSHADOW "
 "DP_EF_NOSHADOW "
 "DP_EF_RED "
+"DP_EF_RESTARTANIM_BIT "
 "DP_EF_STARDUST "
 "DP_EF_TELEPORT_BIT "
 "DP_ENT_ALPHA "