void CL_ParseEntityLump(char *entdata)
{
- char *data;
+ const char *data;
char key[128], value[4096];
FOG_clear(); // LordHavoc: no fog until set
R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set
data = entdata;
if (!data)
return;
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data))
return; // error
if (com_token[0] != '{')
return; // error
while (1)
{
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data))
return; // error
if (com_token[0] == '}')
break; // end of worldspawn
strcpy(key, com_token);
while (key[strlen(key)-1] == ' ') // remove trailing spaces
key[strlen(key)-1] = 0;
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data))
return; // error
strcpy(value, com_token);
if (!strcmp("sky", key))
Mod_ClearUsed();
+ // disable until we get textures for it
+ R_ResetSkyBox();
+
// precache models
memset (cl.model_precache, 0, sizeof(cl.model_precache));
for (nummodels=1 ; ; nummodels++)
{
// LordHavoc: i == 1 means the first model is the world model
cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, i == 1);
-
if (cl.model_precache[i] == NULL)
{
- Host_Error("Model %s not found\n", model_precache[i]);
- return;
+ Con_Printf("Model %s not found\n", model_precache[i]);
+ //return;
}
CL_KeepaliveMessage ();
}
ent->render.model = cl.worldmodel = cl.model_precache[1];
ent->render.scale = 1;
ent->render.alpha = 1;
- VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
- VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
+ CL_BoundingBoxForEntity(&ent->render);
// clear entlife array
memset(entlife, 0, MAX_EDICTS);
cl_num_entities = 1;
R_NewMap ();
-
CL_CGVM_Start();
+ noclip_anglehack = false; // noclip is turned off at start
+
Mem_CheckSentinelsGlobal();
- noclip_anglehack = false; // noclip is turned off at start
}
void CL_ValidateState(entity_state_t *s)
}
}
+void CL_MoveLerpEntityStates(entity_t *ent)
+{
+ float odelta[3], adelta[3];
+ VectorSubtract(ent->state_current.origin, ent->persistent.neworigin, odelta);
+ VectorSubtract(ent->state_current.angles, ent->persistent.newangles, adelta);
+ if (!ent->state_previous.active || cls.timedemo || DotProduct(odelta, odelta) > 1000*1000 || cl_nolerp.integer)
+ {
+ // we definitely shouldn't lerp
+ 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);
+ }
+ else// if (ent->state_current.flags & RENDER_STEP)
+ {
+ // monster interpolation
+ if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01)
+ {
+ ent->persistent.lerpdeltatime = cl.time - ent->persistent.lerpstarttime;
+ ent->persistent.lerpstarttime = cl.mtime[1];
+ VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
+ VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
+ VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+ VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+ }
+ }
+ /*
+ else
+ {
+ // not a monster
+ ent->persistent.lerpstarttime = cl.mtime[1];
+ // no lerp if it's singleplayer
+ //if (sv.active && svs.maxclients == 1 && !ent->state_current.flags & RENDER_STEP)
+ // ent->persistent.lerpdeltatime = 0;
+ //else
+ ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
+ VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
+ VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
+ VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+ VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+ }
+ */
+}
+
/*
==================
CL_ParseUpdate
if (bits & U_DELTA)
new = ent->state_current;
else
+ {
new = ent->state_baseline;
+ new.active = true;
+ }
new.number = num;
new.time = cl.mtime[0];
if (new.active)
CL_ValidateState(&new);
- if (new.flags & RENDER_STEP) // FIXME: rename this flag?
- {
- // make time identical for memcmp
- new.time = ent->state_current.time;
- if (memcmp(&new, &ent->state_current, sizeof(entity_state_t)))
- {
- // set it back to what it should be
- new.time = cl.mtime[0] + 0.1;
- // state has changed
- ent->state_previous = ent->state_current;
- ent->state_current = new;
- // assume 10fps animation
- //ent->state_previous.time = cl.mtime[0] - 0.1;
- }
- }
- else
- {
- ent->state_previous = ent->state_current;
- ent->state_current = new;
- }
+ ent->state_previous = ent->state_current;
+ ent->state_current = new;
if (ent->state_current.active)
{
+ CL_MoveLerpEntityStates(ent);
cl_entities_active[ent->state_current.number] = true;
// mark as visible (no kill this frame)
entlife[ent->state_current.number] = 2;
ent = &cl_entities[entityframe.entitydata[i].number];
ent->state_previous = ent->state_current;
ent->state_current = entityframe.entitydata[i];
- ent->state_current.time = cl.mtime[0];
+ CL_MoveLerpEntityStates(ent);
// the entity lives again...
entlife[ent->state_current.number] = 2;
cl_entities_active[ent->state_current.number] = true;
VectorCopy (ent->state_baseline.origin, ent->render.origin);
VectorCopy (ent->state_baseline.angles, ent->render.angles);
- if (ent->render.angles[0] || ent->render.angles[2])
- {
- // pitch or roll
- VectorAdd(ent->render.origin, ent->render.model->rotatedmins, ent->render.mins);
- VectorAdd(ent->render.origin, ent->render.model->rotatedmaxs, ent->render.maxs);
- }
- else if (ent->render.angles[1])
- {
- // yaw
- VectorAdd(ent->render.origin, ent->render.model->yawmins, ent->render.mins);
- VectorAdd(ent->render.origin, ent->render.model->yawmaxs, ent->render.maxs);
- }
- else
- {
- VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
- VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
- }
+ CL_BoundingBoxForEntity(&ent->render);
// This is definitely cheating...
if (ent->render.model == NULL)
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients");
cl.scores[i].colors = MSG_ReadByte ();
+ // update our color cvar if our color changed
+ if (i == cl.playerentity - 1)
+ Cvar_SetValue ("_cl_color", cl.scores[i].colors);
break;
case svc_particle:
projects / xonotic / darkplaces.git / blobdiff