"", // 48
"", // 49
"svc_cgame", // 50 // [short] length [bytes] data
- "svc_fog", // 51 // unfinished and obsolete
+ "svc_unusedlh1", // 51 // unused
"svc_effect", // 52 // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
"svc_effect2", // 53 // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
"svc_sound2", // 54 // short soundindex instead of byte
cvar_t demo_nehahra = {0, "demo_nehahra", "0"};
-void CL_Parse_Init(void)
-{
- // LordHavoc: added demo_nehahra cvar
- Cvar_RegisterVariable (&demo_nehahra);
- if (gamemode == GAME_NEHAHRA)
- Cvar_SetValue("demo_nehahra", 1);
-}
-
qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces
-/*
-===============
-CL_EntityNum
-
-This error checks and tracks the total number of entities
-===============
-*/
-entity_t *CL_EntityNum (int num)
-{
- /*
- if (num >= cl.num_entities)
- {
- if (num >= MAX_EDICTS)
- Host_Error ("CL_EntityNum: %i is an invalid number",num);
- cl.num_entities = num;
-// while (cl.num_entities <= num)
-// {
-// cl_entities[cl.num_entities].colormap = -1; // no special coloring
-// cl.num_entities++;
-// }
- }
- */
- if (num >= MAX_EDICTS)
- Host_Error ("CL_EntityNum: %i is an invalid number",num);
-
- return &cl_entities[num];
-}
-
-
/*
==================
CL_ParseStartSoundPacket
float attenuation;
int i;
- field_mask = MSG_ReadByte();
+ field_mask = MSG_ReadByte();
if (field_mask & SND_VOLUME)
volume = MSG_ReadByte ();
pos[i] = MSG_ReadCoord ();
S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
-}
+}
/*
==================
float time;
static float lastmsg;
int ret;
+ int c;
sizebuf_t old;
qbyte olddata[8192];
switch (ret)
{
default:
- Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
+ Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
case 0:
break; // nothing waiting
case 1:
Host_Error ("CL_KeepaliveMessage: received a message");
break;
case 2:
- if (MSG_ReadByte() != svc_nop)
+ c = MSG_ReadByte();
+ if (c != svc_nop)
Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop");
break;
}
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))
*/
static void CL_SignonReply (void)
{
- char str[8192];
+ //char str[8192];
Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
}
MSG_WriteByte (&cls.message, clc_stringcmd);
- sprintf (str, "spawn %s", cls.spawnparms);
- MSG_WriteString (&cls.message, str);
+ MSG_WriteString (&cls.message, "spawn");
break;
case 3:
break;
case 4:
- SCR_EndLoadingPlaque (); // allow normal screen updates
Con_ClearNotify();
break;
}
CL_ParseServerInfo
==================
*/
+qbyte entlife[MAX_EDICTS];
void CL_ParseServerInfo (void)
{
- char *str;
- int i;
- int nummodels, numsounds;
- char model_precache[MAX_MODELS][MAX_QPATH];
- char sound_precache[MAX_SOUNDS][MAX_QPATH];
+ char *str;
+ int i;
+ int nummodels, numsounds;
+ char model_precache[MAX_MODELS][MAX_QPATH];
+ char sound_precache[MAX_SOUNDS][MAX_QPATH];
+ entity_t *ent;
Con_DPrintf ("Serverinfo packet received.\n");
//
// parse protocol version number
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != 250)
+ if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
{
- Con_Printf ("Server is protocol %i, not %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, PROTOCOL_VERSION);
+ Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
return;
}
Nehahrademcompatibility = false;
if (cls.demoplayback && demo_nehahra.integer)
Nehahrademcompatibility = true;
dpprotocol = i;
- if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2)
+ if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
dpprotocol = 0;
// parse maxclients
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 ();
}
S_BeginPrecaching ();
for (i=1 ; i<numsounds ; i++)
{
- cl.sound_precache[i] = S_PrecacheSound (sound_precache[i]);
+ cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
CL_KeepaliveMessage ();
}
S_EndPrecaching ();
// local state
- cl_entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- cl_entities[0].render.scale = 1;
- cl_entities[0].render.alpha = 1;
+ ent = &cl_entities[0];
+ // entire entity array was cleared, so just fill in a few fields
+ ent->state_current.active = true;
+ ent->render.model = cl.worldmodel = cl.model_precache[1];
+ ent->render.scale = 1;
+ ent->render.alpha = 1;
+ CL_BoundingBoxForEntity(&ent->render);
+ // clear entlife array
+ memset(entlife, 0, MAX_EDICTS);
- R_NewMap ();
+ 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)
Mod_CheckLoaded(model);
if (model && s->frame >= model->numframes)
{
- Con_Printf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
+ Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
s->frame = 0;
}
if (model && s->skin > 0 && s->skin >= model->numskins)
{
- Con_Printf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+ Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
s->skin = 0;
}
}
+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 || cl.mtime[0] - ent->persistent.lerpstarttime >= 0.1)
+ {
+ 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
relinked. Other attributes can change without relinking.
==================
*/
-qbyte entkill[MAX_EDICTS];
-int bitprofile[32], bitprofilecount = 0;
void CL_ParseUpdate (int bits)
{
- int i, num, deltadie;
+ int num;
entity_t *ent;
entity_state_t new;
if (num < 1)
Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num);
- // mark as visible (no kill)
- entkill[num] = 0;
+ ent = cl_entities + num;
- ent = CL_EntityNum (num);
-
- for (i = 0;i < 32;i++)
- if (bits & (1 << i))
- bitprofile[i]++;
- bitprofilecount++;
-
- deltadie = false;
+ // note: this inherits the 'active' state of the baseline chosen
+ // (state_baseline is always active, state_current may not be active if
+ // the entity was missing in the last frame)
if (bits & U_DELTA)
- {
new = ent->state_current;
- if (!new.active)
- deltadie = true; // was not present in previous frame, leave hidden until next full update
- }
else
+ {
new = ent->state_baseline;
+ new.active = true;
+ }
+ new.number = num;
new.time = cl.mtime[0];
-
new.flags = 0;
- new.active = true;
if (bits & U_MODEL) new.modelindex = (new.modelindex & 0xFF00) | MSG_ReadByte();
if (bits & U_FRAME) new.frame = (new.frame & 0xFF00) | MSG_ReadByte();
if (bits & U_COLORMAP) new.colormap = MSG_ReadByte();
if (bits & U_EFFECTS2) new.effects = (new.effects & 0x00FF) | (MSG_ReadByte() << 8);
if (bits & U_GLOWSIZE) new.glowsize = MSG_ReadByte();
if (bits & U_GLOWCOLOR) new.glowcolor = MSG_ReadByte();
-#if 0
- if (bits & U_COLORMOD) {int i = MSG_ReadByte();float r = (((int) i >> 5) & 7) * 1.0 / 7, g = (((int) i >> 2) & 7) * 1.0 / 7, b = ((int) i & 3) * 1.0 / 3;Con_Printf("warning: U_COLORMOD %i (%1.2f %1.2f %1.2f) ignored\n", i, r, g, b);}
-#else
// apparently the dpcrush demo uses this (unintended, and it uses white anyway)
if (bits & U_COLORMOD) MSG_ReadByte();
-#endif
if (bits & U_GLOWTRAIL) new.flags |= RENDER_GLOWTRAIL;
if (bits & U_FRAME2) new.frame = (new.frame & 0x00FF) | (MSG_ReadByte() << 8);
if (bits & U_MODEL2) new.modelindex = (new.modelindex & 0x00FF) | (MSG_ReadByte() << 8);
int j = MSG_ReadFloat() * 255.0f;
if (i == 2)
{
- if (MSG_ReadFloat())
+ i = MSG_ReadFloat();
+ if (i)
new.effects |= EF_FULLBRIGHT;
}
if (j < 0)
new.alpha = j;
}
- if (deltadie)
- {
- // hide the entity
- new.active = false;
- }
- else
+ 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;
+ if (ent->state_current.active)
{
- ent->state_previous = ent->state_current;
- ent->state_current = new;
+ CL_MoveLerpEntityStates(ent);
+ cl_entities_active[ent->state_current.number] = true;
+ // mark as visible (no kill this frame)
+ entlife[ent->state_current.number] = 2;
}
}
void CL_ReadEntityFrame(void)
{
entity_t *ent;
- entity_state_t *s;
entity_frame_t entityframe;
int i;
EntityFrame_Read(&cl.entitydatabase);
EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe);
for (i = 0;i < entityframe.numentities;i++)
{
- s = &entityframe.entitydata[i];
- entkill[s->number] = 0;
- ent = &cl_entities[s->number];
- memcpy(&ent->state_previous, &ent->state_current, sizeof(*s));
- memcpy(&ent->state_current, s, sizeof(*s));
- ent->state_current.time = cl.mtime[0];
+ // copy the states
+ ent = &cl_entities[entityframe.entitydata[i].number];
+ ent->state_previous = ent->state_current;
+ ent->state_current = entityframe.entitydata[i];
+ CL_MoveLerpEntityStates(ent);
+ // the entity lives again...
+ entlife[ent->state_current.number] = 2;
+ cl_entities_active[ent->state_current.number] = true;
}
VectorCopy(cl.viewentoriginnew, cl.viewentoriginold);
VectorCopy(entityframe.eye, cl.viewentoriginnew);
}
-char *bitprofilenames[32] =
-{
- "U_MOREBITS",
- "U_ORIGIN1",
- "U_ORIGIN2",
- "U_ORIGIN3",
- "U_ANGLE2",
- "U_STEP",
- "U_FRAME",
- "U_SIGNAL",
- "U_ANGLE1",
- "U_ANGLE3",
- "U_MODEL",
- "U_COLORMAP",
- "U_SKIN",
- "U_EFFECTS",
- "U_LONGENTITY",
- "U_EXTEND1",
- "U_DELTA",
- "U_ALPHA",
- "U_SCALE",
- "U_EFFECTS2",
- "U_GLOWSIZE",
- "U_GLOWCOLOR",
- "obsolete U_COLORMOD",
- "U_EXTEND2",
- "U_GLOWTRAIL",
- "U_VIEWMODEL",
- "U_FRAME2",
- "U_MODEL2",
- "U_EXTERIORMODEL",
- "U_UNUSED29",
- "U_UNUSED30",
- "U_EXTEND3",
-};
-
-void CL_BitProfile_f(void)
-{
- int i;
- Con_Printf("bitprofile: %i updates\n");
- if (bitprofilecount)
- for (i = 0;i < 32;i++)
-// if (bitprofile[i])
- Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount);
- Con_Printf("\n");
- for (i = 0;i < 32;i++)
- bitprofile[i] = 0;
- bitprofilecount = 0;
-}
-
void CL_EntityUpdateSetup(void)
{
- memset(entkill, 1, MAX_EDICTS);
}
void CL_EntityUpdateEnd(void)
{
int i;
+ // disable entities that disappeared this frame
for (i = 1;i < MAX_EDICTS;i++)
- if (entkill[i])
- cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+ {
+ // clear only the entities that were active last frame but not this
+ // frame, don't waste time clearing all entities (which would cause
+ // cache misses)
+ if (entlife[i])
+ {
+ entlife[i]--;
+ if (!entlife[i])
+ cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+ }
+ }
}
/*
{
entity_t *ent;
- if (cl.num_statics >= MAX_STATIC_ENTITIES)
+ if (cl_num_static_entities >= cl_max_static_entities)
Host_Error ("Too many static entities");
- ent = &cl_static_entities[cl.num_statics++];
+ ent = &cl_static_entities[cl_num_static_entities++];
CL_ParseBaseline (ent, large);
// copy it to the current state
ent->render.alpha = 1;
VectorCopy (ent->state_baseline.origin, ent->render.origin);
- VectorCopy (ent->state_baseline.angles, ent->render.angles);
+ VectorCopy (ent->state_baseline.angles, ent->render.angles);
+
+ CL_BoundingBoxForEntity(&ent->render);
+
+ // This is definitely cheating...
+ if (ent->render.model == NULL)
+ cl_num_static_entities--;
}
/*
CL_Effect(org, modelindex, startframe, framecount, framerate);
}
+model_t *cl_model_bolt = NULL;
+model_t *cl_model_bolt2 = NULL;
+model_t *cl_model_bolt3 = NULL;
+model_t *cl_model_beam = NULL;
+
+sfx_t *cl_sfx_wizhit;
+sfx_t *cl_sfx_knighthit;
+sfx_t *cl_sfx_tink1;
+sfx_t *cl_sfx_ric1;
+sfx_t *cl_sfx_ric2;
+sfx_t *cl_sfx_ric3;
+sfx_t *cl_sfx_r_exp3;
+
+/*
+=================
+CL_ParseTEnt
+=================
+*/
+void CL_InitTEnts (void)
+{
+ cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav", false);
+ cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav", false);
+ cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav", false);
+ cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav", false);
+ cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav", false);
+ cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav", false);
+ cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false);
+}
+
+void CL_ParseBeam (model_t *m)
+{
+ int i, ent;
+ vec3_t start, end;
+ beam_t *b;
+
+ ent = MSG_ReadShort ();
+ MSG_ReadVector(start);
+ MSG_ReadVector(end);
+
+ // override any beam with the same entity
+ for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+ {
+ if (b->entity == ent)
+ {
+ //b->entity = ent;
+ b->model = m;
+ b->endtime = cl.time + 0.2;
+ VectorCopy (start, b->start);
+ VectorCopy (end, b->end);
+ return;
+ }
+ }
+
+ // find a free beam
+ for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+ {
+ if (!b->model || b->endtime < cl.time)
+ {
+ b->entity = ent;
+ b->model = m;
+ b->endtime = cl.time + 0.2;
+ VectorCopy (start, b->start);
+ VectorCopy (end, b->end);
+ return;
+ }
+ }
+ Con_Printf ("beam list overflow!\n");
+}
+
+void CL_ParseTempEntity (void)
+{
+ int type;
+ vec3_t pos;
+ vec3_t dir;
+ vec3_t pos2;
+ vec3_t color;
+ int rnd;
+ int colorStart, colorLength, count;
+ float velspeed, radius;
+ qbyte *tempcolor;
+
+ type = MSG_ReadByte ();
+ switch (type)
+ {
+ case TE_WIZSPIKE:
+ // spike hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_RunParticleEffect (pos, vec3_origin, 20, 30);
+ S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1);
+ break;
+
+ case TE_KNIGHTSPIKE:
+ // spike hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_RunParticleEffect (pos, vec3_origin, 226, 20);
+ S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
+ break;
+
+ case TE_SPIKE:
+ // spike hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ // LordHavoc: changed to spark shower
+ CL_SparkShower(pos, vec3_origin, 15);
+ if ( rand() % 5 )
+ S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+ else
+ {
+ rnd = rand() & 3;
+ if (rnd == 1)
+ S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+ else if (rnd == 2)
+ S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+ else
+ S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+ }
+ break;
+ case TE_SPIKEQUAD:
+ // quad spike hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ // LordHavoc: changed to spark shower
+ CL_SparkShower(pos, vec3_origin, 15);
+ CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ if ( rand() % 5 )
+ S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+ else
+ {
+ rnd = rand() & 3;
+ if (rnd == 1)
+ S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+ else if (rnd == 2)
+ S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+ else
+ S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+ }
+ break;
+ case TE_SUPERSPIKE:
+ // super spike hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ // LordHavoc: changed to dust shower
+ CL_SparkShower(pos, vec3_origin, 30);
+ if ( rand() % 5 )
+ S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+ else
+ {
+ rnd = rand() & 3;
+ if (rnd == 1)
+ S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+ else if (rnd == 2)
+ S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+ else
+ S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+ }
+ break;
+ case TE_SUPERSPIKEQUAD:
+ // quad super spike hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ // LordHavoc: changed to dust shower
+ CL_SparkShower(pos, vec3_origin, 30);
+ CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
+ if ( rand() % 5 )
+ S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+ else
+ {
+ rnd = rand() & 3;
+ if (rnd == 1)
+ S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+ else if (rnd == 2)
+ S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+ else
+ S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+ }
+ break;
+ // LordHavoc: added for improved blood splatters
+ case TE_BLOOD:
+ // blood puff
+ MSG_ReadVector(pos);
+ dir[0] = MSG_ReadChar ();
+ dir[1] = MSG_ReadChar ();
+ dir[2] = MSG_ReadChar ();
+ count = MSG_ReadByte ();
+ CL_BloodPuff(pos, dir, count);
+ break;
+ case TE_BLOOD2:
+ // blood puff
+ MSG_ReadVector(pos);
+ CL_BloodPuff(pos, vec3_origin, 10);
+ break;
+ case TE_SPARK:
+ // spark shower
+ MSG_ReadVector(pos);
+ dir[0] = MSG_ReadChar ();
+ dir[1] = MSG_ReadChar ();
+ dir[2] = MSG_ReadChar ();
+ count = MSG_ReadByte ();
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_SparkShower(pos, dir, count);
+ break;
+ case TE_PLASMABURN:
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
+ CL_PlasmaBurn(pos);
+ break;
+ // LordHavoc: added for improved gore
+ case TE_BLOODSHOWER:
+ // vaporized body
+ MSG_ReadVector(pos); // mins
+ MSG_ReadVector(pos2); // maxs
+ velspeed = MSG_ReadCoord (); // speed
+ count = MSG_ReadShort (); // number of particles
+ CL_BloodShower(pos, pos2, velspeed, count);
+ break;
+ case TE_PARTICLECUBE:
+ // general purpose particle effect
+ MSG_ReadVector(pos); // mins
+ MSG_ReadVector(pos2); // maxs
+ MSG_ReadVector(dir); // dir
+ count = MSG_ReadShort (); // number of particles
+ colorStart = MSG_ReadByte (); // color
+ colorLength = MSG_ReadByte (); // gravity (1 or 0)
+ velspeed = MSG_ReadCoord (); // randomvel
+ CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed);
+ break;
+
+ case TE_PARTICLERAIN:
+ // general purpose particle effect
+ MSG_ReadVector(pos); // mins
+ MSG_ReadVector(pos2); // maxs
+ MSG_ReadVector(dir); // dir
+ count = MSG_ReadShort (); // number of particles
+ colorStart = MSG_ReadByte (); // color
+ CL_ParticleRain(pos, pos2, dir, count, colorStart, 0);
+ break;
+
+ case TE_PARTICLESNOW:
+ // general purpose particle effect
+ MSG_ReadVector(pos); // mins
+ MSG_ReadVector(pos2); // maxs
+ MSG_ReadVector(dir); // dir
+ count = MSG_ReadShort (); // number of particles
+ colorStart = MSG_ReadByte (); // color
+ CL_ParticleRain(pos, pos2, dir, count, colorStart, 1);
+ break;
+
+ case TE_GUNSHOT:
+ // bullet hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ // LordHavoc: changed to dust shower
+ CL_SparkShower(pos, vec3_origin, 15);
+ break;
+
+ case TE_GUNSHOTQUAD:
+ // quad bullet hitting wall
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_SparkShower(pos, vec3_origin, 15);
+ CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
+ break;
+
+ case TE_EXPLOSION:
+ // rocket explosion
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_ParticleExplosion (pos);
+ // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
+ CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_EXPLOSIONQUAD:
+ // quad rocket explosion
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_ParticleExplosion (pos);
+ CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_EXPLOSION3:
+ // Nehahra movie colored lighting explosion
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_ParticleExplosion (pos);
+ CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_EXPLOSIONRGB:
+ // colored lighting explosion
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_ParticleExplosion (pos);
+ color[0] = MSG_ReadByte() * (1.0 / 255.0);
+ color[1] = MSG_ReadByte() * (1.0 / 255.0);
+ color[2] = MSG_ReadByte() * (1.0 / 255.0);
+ CL_AllocDlight (NULL, pos, 350, color[0], color[1], color[2], 700, 0.5);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_TAREXPLOSION:
+ // tarbaby explosion
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_BlobExplosion (pos);
+
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ CL_AllocDlight (NULL, pos, 600, 0.8f, 0.4f, 1.0f, 1200, 0.5);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_SMALLFLASH:
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
+ break;
+
+ case TE_CUSTOMFLASH:
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ radius = MSG_ReadByte() * 8;
+ velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0);
+ color[0] = MSG_ReadByte() * (1.0 / 255.0);
+ color[1] = MSG_ReadByte() * (1.0 / 255.0);
+ color[2] = MSG_ReadByte() * (1.0 / 255.0);
+ CL_AllocDlight (NULL, pos, radius, color[0], color[1], color[2], radius / velspeed, velspeed);
+ break;
+
+ case TE_FLAMEJET:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(dir);
+ count = MSG_ReadByte();
+ CL_Flames(pos, dir, count);
+ break;
+
+ case TE_LIGHTNING1:
+ // lightning bolts
+ if (!cl_model_bolt)
+ cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, false, false);
+ CL_ParseBeam (cl_model_bolt);
+ break;
+
+ case TE_LIGHTNING2:
+ // lightning bolts
+ if (!cl_model_bolt2)
+ cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", true, false, false);
+ CL_ParseBeam (cl_model_bolt2);
+ break;
+
+ case TE_LIGHTNING3:
+ // lightning bolts
+ if (!cl_model_bolt3)
+ cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false);
+ CL_ParseBeam (cl_model_bolt3);
+ break;
+
+// PGM 01/21/97
+ case TE_BEAM:
+ // grappling hook beam
+ if (!cl_model_beam)
+ cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false);
+ CL_ParseBeam (cl_model_beam);
+ break;
+// PGM 01/21/97
+
+// LordHavoc: for compatibility with the Nehahra movie...
+ case TE_LIGHTNING4NEH:
+ CL_ParseBeam (Mod_ForName(MSG_ReadString(), true, false, false));
+ break;
+
+ case TE_LAVASPLASH:
+ pos[0] = MSG_ReadCoord ();
+ pos[1] = MSG_ReadCoord ();
+ pos[2] = MSG_ReadCoord ();
+ CL_LavaSplash (pos);
+ break;
+
+ case TE_TELEPORT:
+ pos[0] = MSG_ReadCoord ();
+ pos[1] = MSG_ReadCoord ();
+ pos[2] = MSG_ReadCoord ();
+ CL_AllocDlight (NULL, pos, 1000, 1.25f, 1.25f, 1.25f, 3000, 99.0f);
+// CL_TeleportSplash (pos);
+ break;
+
+ case TE_EXPLOSION2:
+ // color mapped explosion
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ colorStart = MSG_ReadByte ();
+ colorLength = MSG_ReadByte ();
+ CL_ParticleExplosion2 (pos, colorStart, colorLength);
+ tempcolor = (qbyte *)&d_8to24table[(rand()%colorLength) + colorStart];
+ CL_AllocDlight (NULL, pos, 350, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ default:
+ Host_Error ("CL_ParseTempEntity: bad type %d", type);
+ }
+}
#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
MSG_BeginReading ();
entitiesupdated = false;
- CL_EntityUpdateSetup();
while (1)
{
cmdlogname[cmdindex] = temp;
SHOWNET("fast update");
if (cls.signon == SIGNONS - 1)
- { // first update is the final signon stage
+ {
+ // first update is the final signon stage
cls.signon = SIGNONS;
CL_SignonReply ();
}
break;
case svc_nop:
-// Con_Printf ("svc_nop\n");
break;
case svc_time:
- // handle old protocols which do not have entity update ranges
- entitiesupdated = true;
+ if (!entitiesupdated)
+ {
+ // this is a new frame, we'll be seeing entities,
+ // so prepare for entity updates
+ CL_EntityUpdateSetup();
+ entitiesupdated = true;
+ }
cl.mtime[1] = cl.mtime[0];
cl.mtime[0] = MSG_ReadFloat ();
break;
case svc_version:
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != 250)
- Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, PROTOCOL_VERSION);
+ if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
+ Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
Nehahrademcompatibility = false;
if (i == 250)
Nehahrademcompatibility = true;
if (cls.demoplayback && demo_nehahra.integer)
Nehahrademcompatibility = true;
dpprotocol = i;
- if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2)
+ if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
dpprotocol = 0;
break;
case svc_serverinfo:
CL_ParseServerInfo ();
-// vid.recalc_refdef = true; // leave intermission full screen
break;
case svc_setangle:
case svc_setview:
cl.viewentity = MSG_ReadShort ();
+ // LordHavoc: assume first setview recieved is the real player entity
+ if (!cl.playerentity)
+ cl.playerentity = cl.viewentity;
break;
case svc_lightstyle:
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:
case svc_spawnbaseline:
i = MSG_ReadShort ();
- // must use CL_EntityNum() to force cl.num_entities up
- CL_ParseBaseline (CL_EntityNum(i), false);
+ if (i < 0 || i >= MAX_EDICTS)
+ Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i);
+ CL_ParseBaseline (cl_entities + i, false);
break;
case svc_spawnbaseline2:
i = MSG_ReadShort ();
- // must use CL_EntityNum() to force cl.num_entities up
- CL_ParseBaseline (CL_EntityNum(i), true);
+ if (i < 0 || i >= MAX_EDICTS)
+ Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i);
+ CL_ParseBaseline (cl_entities + i, true);
break;
case svc_spawnstatic:
CL_ParseStatic (false);
CL_ParseStatic (true);
break;
case svc_temp_entity:
- CL_ParseTEnt ();
+ CL_ParseTempEntity ();
break;
case svc_setpause:
case svc_intermission:
cl.intermission = 1;
cl.completed_time = cl.time;
-// vid.recalc_refdef = true; // go to full screen
break;
case svc_finale:
cl.intermission = 2;
cl.completed_time = cl.time;
-// vid.recalc_refdef = true; // go to full screen
SCR_CenterPrint (MSG_ReadString ());
break;
case svc_cutscene:
cl.intermission = 3;
cl.completed_time = cl.time;
-// vid.recalc_refdef = true; // go to full screen
SCR_CenterPrint (MSG_ReadString ());
break;
{
int length;
length = (int) ((unsigned short) MSG_ReadShort());
- /*
- if (cgamenetbuffersize < length)
- {
- cgamenetbuffersize = length;
- if (cgamenetbuffer)
- Mem_Free(cgamenetbuffer);
- cgamenetbuffer = Mem_Alloc(cgamenetbuffersize);
- }
- */
for (i = 0;i < length;i++)
cgamenetbuffer[i] = MSG_ReadByte();
if (!msg_badread)
break;
case svc_entities:
if (cls.signon == SIGNONS - 1)
- { // first update is the final signon stage
+ {
+ // first update is the final signon stage
cls.signon = SIGNONS;
CL_SignonReply ();
}
if (entitiesupdated)
CL_EntityUpdateEnd();
}
+
+void CL_Parse_Init(void)
+{
+ // LordHavoc: added demo_nehahra cvar
+ Cvar_RegisterVariable (&demo_nehahra);
+ if (gamemode == GAME_NEHAHRA)
+ Cvar_SetValue("demo_nehahra", 1);
+}
projects / xonotic / darkplaces.git / blobdiff