Experimental new patch welding code by "someone", fixing the problem with seams when...

[xonotic/darkplaces.git] / csprogs.c

diff --git a/csprogs.c b/csprogs.c
index 1abf913a93fcb667efcc1fa5ee4cc27500341465..f9d5e7d365ea2ccc7b6924050faf007c3e43d40e 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -154,7 +154,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
        if (!model)
                return false;
 
-       entrender = CL_NewTempEntity();
+       entrender = CL_NewTempEntity(0);
        if (!entrender)
                return false;
 
@@ -204,11 +204,12 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
        // self.frame1time is the animation base time for the interpolation target
        // self.frame2 is the interpolation start (previous frame)
        // self.frame2time is the animation base time for the interpolation start
-       entrender->frame1 = entrender->frame2 = ed->fields.client->frame;
-       if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) entrender->frame2 = val->_float;
+       entrender->frame1 = entrender->frame2 = (int) ed->fields.client->frame;
+       if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) entrender->frame2 = (int) val->_float;
        if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) entrender->frame2time = val->_float;
        if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) entrender->frame1time = val->_float;
        if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) entrender->framelerp = val->_float;
+       if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.shadertime))) entrender->shadertime = val->_float;
 
        // concat the matrices to make the entity relative to its tag
        Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
@@ -520,7 +521,7 @@ void CL_VM_UpdateShowingScoresState (int showingscores)
                CSQC_END
        }
 }
-qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos)
+qboolean CL_VM_Event_Sound(int sound_num, float volume, int channel, float attenuation, int ent, vec3_t pos)
 {
        qboolean r = false;
        if(cl.csqc_loaded)
@@ -880,7 +881,7 @@ void CL_VM_Init (void)
                        sizebuf_t sb;
                        unsigned char *demobuf; fs_offset_t demofilesize;
 
-                       sb.data = (void *) buf;
+                       sb.data = (unsigned char *) buf;
                        sb.maxsize = sizeof(buf);
                        i = 0;