diff --git a/source/cl_parse.c b/source/cl_parse.c index c65b857..06b0dd5 100644 --- a/source/cl_parse.c +++ b/source/cl_parse.c @@ -580,7 +580,7 @@ void CL_ParseUpdate (int bits) } if (bits & U_FRAME) - ent->frame = MSG_ReadShort (); + ent->frame = MSG_ReadByte (); else ent->frame = ent->baseline.frame; @@ -601,11 +601,6 @@ void CL_ParseUpdate (int bits) else ent->skinnum = ent->baseline.skin; - if (bits & U_FRAMETIME) - ent->iframetime = MSG_ReadFloat(); - else - ent->iframetime = 0.1; - if (bits & U_EFFECTS) ent->effects = MSG_ReadShort(); else diff --git a/source/progdefs.h b/source/progdefs.h index 740221a..14fa242 100644 --- a/source/progdefs.h +++ b/source/progdefs.h @@ -79,7 +79,6 @@ typedef struct string_t model; float frame; float skin; - float iframetime; float effects; vec3_t mins; vec3_t maxs; diff --git a/source/protocol.h b/source/protocol.h index 70c742a..607484d 100644 --- a/source/protocol.h +++ b/source/protocol.h @@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define U_RENDERCOLOR2 (1<<19) #define U_RENDERCOLOR3 (1<<20) #define U_EXTEND2 (1<<21) // another byte to follow -#define U_FRAMETIME (1<<22) // another byte to follow // Tomaz - QC Alpha Scale Glow Control End #define U_SCALE (1<<23) diff --git a/source/psp/video_hardware_main.cpp b/source/psp/video_hardware_main.cpp index c1fe4b4..ac60366 100644 --- a/source/psp/video_hardware_main.cpp +++ b/source/psp/video_hardware_main.cpp @@ -1246,10 +1246,6 @@ void R_SetupAliasBlendedFrame (int frame, aliashdr_t *paliashdr, entity_t* e) if (numposes > 1) { - //Con_Printf("numposes (%i) > 1: %s, %i\n", numposes, e->model->name, frame); FIXME-Jukkiwashere (not sure if this was something you were working on blubs) - //if (e->iframetime) - // e->frame_interval = e->iframetime; - //else e->frame_interval = paliashdr->frames[frame].interval; pose += (int)(cl.time / e->frame_interval) % numposes; } @@ -1261,11 +1257,7 @@ void R_SetupAliasBlendedFrame (int frame, aliashdr_t *paliashdr, entity_t* e) shorter then things will still be smoothed partly, and the jumps will be less noticable because of the shorter time. So, this is probably a good assumption. */ - //Jukki, except that this is not good for us. We need to control it better - //if (e->iframetime) - // e->frame_interval = e->iframetime; - //else - e->frame_interval = 0.1; + e->frame_interval = 0.1; } if (e->pose2 != pose) diff --git a/source/render.h b/source/render.h index 8150ad0..8b83fa5 100644 --- a/source/render.h +++ b/source/render.h @@ -71,7 +71,6 @@ typedef struct entity_s int examp; // for Alias models int effects; // light, particals, etc int skinnum; // for Alias models - int iframetime; // for Alias models int visframe; // last frame this entity was // fenix@io.com: model transform interpolation diff --git a/source/sv_main.c b/source/sv_main.c index 14efbbc..5451540 100644 --- a/source/sv_main.c +++ b/source/sv_main.c @@ -262,8 +262,14 @@ void SV_ConnectClient (int clientnum) // set up the client_t netconnection = client->netconnection; - if (sv.loadgame) + if (sv.loadgame) { +#ifdef PSP_VFPU memcpy_vfpu(spawn_parms, client->spawn_parms, sizeof(spawn_parms)); +#else + memcpy(spawn_parms, client->spawn_parms, sizeof(spawn_parms)); +#endif // PSP_VFPU + } + memset (client, 0, sizeof(*client)); client->netconnection = netconnection; @@ -277,8 +283,13 @@ void SV_ConnectClient (int clientnum) client->privileged = false; - if (sv.loadgame) + if (sv.loadgame) { +#ifdef PSP_VFPU memcpy_vfpu(client->spawn_parms, spawn_parms, sizeof(spawn_parms)); +#else + memcpy(client->spawn_parms, spawn_parms, sizeof(spawn_parms)); +#endif // PSP_VFPU + } else { // call the progs to get default spawn parms for the new client @@ -503,9 +514,6 @@ void SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg, qboolean nomap) if (ent->baseline.skin != ent->v.skin) bits |= U_SKIN; - if (ent->v.iframetime != 0.1) - bits |= U_FRAMETIME; - if (ent->baseline.frame != ent->v.frame) bits |= U_FRAME; @@ -594,13 +602,11 @@ void SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg, qboolean nomap) if (bits & U_MODEL) MSG_WriteShort (msg, ent->v.modelindex); if (bits & U_FRAME) - MSG_WriteShort (msg, ent->v.frame); + MSG_WriteByte (msg, ent->v.frame); if (bits & U_COLORMAP) MSG_WriteByte (msg, ent->v.colormap); if (bits & U_SKIN) MSG_WriteByte (msg, ent->v.skin); - if (bits & U_FRAMETIME) - MSG_WriteFloat (msg, ent->v.iframetime); if (bits & U_EFFECTS) MSG_WriteShort (msg, ent->v.effects); if (bits & U_ORIGIN1)