// cl_parse.c -- parse a message received from the server
#include "quakedef.h"
+#include "cl_collision.h"
char *svc_strings[128] =
{
//=============================================================================
cvar_t demo_nehahra = {0, "demo_nehahra", "0"};
+cvar_t developer_networkentities = {0, "developer_networkentities", "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 >= MAX_EDICTS)
- Host_Error ("CL_EntityNum: %i is an invalid number",num);
-
- return &cl_entities[num];
-}
-
+mempool_t *cl_scores_mempool;
/*
==================
*/
void CL_ParseStartSoundPacket(int largesoundindex)
{
- vec3_t pos;
- int channel, ent;
- int sound_num;
- int volume;
- int field_mask;
- float attenuation;
- int i;
-
- field_mask = MSG_ReadByte();
-
- if (field_mask & SND_VOLUME)
+ vec3_t pos;
+ int channel, ent;
+ int sound_num;
+ int volume;
+ int field_mask;
+ float attenuation;
+
+ field_mask = MSG_ReadByte();
+
+ if (field_mask & SND_VOLUME)
volume = MSG_ReadByte ();
else
volume = DEFAULT_SOUND_PACKET_VOLUME;
-
- if (field_mask & SND_ATTENUATION)
+
+ if (field_mask & SND_ATTENUATION)
attenuation = MSG_ReadByte () / 64.0;
else
attenuation = DEFAULT_SOUND_PACKET_ATTENUATION;
-
- channel = MSG_ReadShort ();
- if (largesoundindex)
+
+ if (field_mask & SND_LARGEENTITY)
+ {
+ ent = (unsigned short) MSG_ReadShort ();
+ channel = MSG_ReadByte ();
+ }
+ else
+ {
+ channel = (unsigned short) MSG_ReadShort ();
+ ent = channel >> 3;
+ channel &= 7;
+ }
+
+ if (largesoundindex || field_mask & SND_LARGESOUND)
sound_num = (unsigned short) MSG_ReadShort ();
else
sound_num = MSG_ReadByte ();
if (sound_num >= MAX_SOUNDS)
Host_Error("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS);
- ent = channel >> 3;
- channel &= 7;
- if (ent > MAX_EDICTS)
+ if (ent >= MAX_EDICTS)
Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent);
-
- for (i=0 ; i<3 ; i++)
- pos[i] = MSG_ReadCoord ();
- S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
+ MSG_ReadVector(pos);
+
+ S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
}
/*
so the server doesn't disconnect.
==================
*/
+
+static qbyte olddata[NET_MAXMESSAGE];
void CL_KeepaliveMessage (void)
{
- float time;
+ float time;
static float lastmsg;
- int ret;
- int c;
- sizebuf_t old;
- qbyte olddata[8192];
-
- if (sv.active)
- return; // no need if server is local
- if (cls.demoplayback)
+ int oldreadcount;
+ qboolean oldbadread;
+ sizebuf_t old;
+
+ // no need if server is local and definitely not if this is a demo
+ if (sv.active || cls.demoplayback)
return;
// read messages from server, should just be nops
+ oldreadcount = msg_readcount;
+ oldbadread = msg_badread;
old = net_message;
- memcpy (olddata, net_message.data, net_message.cursize);
-
- do
- {
- ret = CL_GetMessage ();
- switch (ret)
- {
- default:
- Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
- case 0:
- break; // nothing waiting
- case 1:
- Host_Error ("CL_KeepaliveMessage: received a message");
- break;
- case 2:
- c = MSG_ReadByte();
- if (c != svc_nop)
- Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop");
- break;
- }
- } while (ret);
-
- net_message = old;
- memcpy (net_message.data, olddata, net_message.cursize);
+ memcpy(olddata, net_message.data, net_message.cursize);
-// check time
- time = Sys_DoubleTime ();
- if (time - lastmsg < 5)
- return;
- lastmsg = time;
+ NetConn_ClientFrame();
-// write out a nop
- Con_Printf ("--> client to server keepalive\n");
+ msg_readcount = oldreadcount;
+ msg_badread = oldbadread;
+ net_message = old;
+ memcpy(net_message.data, olddata, net_message.cursize);
- MSG_WriteByte (&cls.message, clc_nop);
- NET_SendMessage (cls.netcon, &cls.message);
- SZ_Clear (&cls.message);
+ if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5)
+ {
+ sizebuf_t msg;
+ qbyte buf[4];
+ lastmsg = time;
+ // write out a nop
+ // LordHavoc: must use unreliable because reliable could kill the sigon message!
+ Con_Print("--> client to server keepalive\n");
+ msg.data = buf;
+ msg.maxsize = sizeof(buf);
+ msg.cursize = 0;
+ MSG_WriteChar(&msg, svc_nop);
+ NetConn_SendUnreliableMessage(cls.netcon, &msg);
+ // try not to utterly crush the computer with work, that's just rude
+ Sys_Sleep(1);
+ }
}
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
+ // LordHavoc: default to the map's sky (q3 shader parsing sets this)
+ R_SetSkyBox(cl.worldmodel->brush.skybox);
data = entdata;
if (!data)
return;
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data, false))
return; // error
if (com_token[0] != '{')
return; // error
while (1)
{
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data, false))
return; // error
if (com_token[0] == '}')
break; // end of worldspawn
if (com_token[0] == '_')
- strcpy(key, com_token + 1);
+ strlcpy (key, com_token + 1, sizeof (key));
else
- strcpy(key, com_token);
+ strlcpy (key, com_token, sizeof (key));
while (key[strlen(key)-1] == ' ') // remove trailing spaces
key[strlen(key)-1] = 0;
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data, false))
return; // error
- strcpy(value, com_token);
+ strlcpy (value, com_token, sizeof (value));
if (!strcmp("sky", key))
R_SetSkyBox(value);
else if (!strcmp("skyname", key)) // non-standard, introduced by QuakeForge... sigh.
*/
static void CL_SignonReply (void)
{
- char str[8192];
+ //char str[8192];
-Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
+Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
switch (cls.signon)
{
}
MSG_WriteByte (&cls.message, clc_stringcmd);
- sprintf (str, "spawn %s", cls.spawnparms);
- MSG_WriteString (&cls.message, str);
+ MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer));
+
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, "spawn");
break;
case 3:
CL_ParseServerInfo
==================
*/
+qbyte entlife[MAX_EDICTS];
+// FIXME: this is a lot of memory to be keeping around, this needs to be dynamically allocated and freed
+static char parse_model_precache[MAX_MODELS][MAX_QPATH];
+static char parse_sound_precache[MAX_SOUNDS][MAX_QPATH];
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;
+ entity_t *ent;
- Con_DPrintf ("Serverinfo packet received.\n");
+ Con_DPrint("Serverinfo packet received.\n");
//
// wipe the client_state_t struct
//
// parse protocol version number
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
+ // hack for unmarked Nehahra movie demos which had a custom protocol
+ if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer)
+ i = PROTOCOL_NEHAHRAMOVIE;
+ if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_NEHAHRAMOVIE)
{
- Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
+ Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE);
return;
}
- Nehahrademcompatibility = false;
- if (i == 250)
- Nehahrademcompatibility = true;
- if (cls.demoplayback && demo_nehahra.integer)
- Nehahrademcompatibility = true;
- dpprotocol = i;
- if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
- dpprotocol = 0;
+ cl.protocol = i;
// parse maxclients
cl.maxclients = MSG_ReadByte ();
Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients);
return;
}
+ Mem_EmptyPool(cl_scores_mempool);
cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores));
// parse gametype
// parse signon message
str = MSG_ReadString ();
- strncpy (cl.levelname, str, sizeof(cl.levelname)-1);
+ strlcpy (cl.levelname, str, sizeof(cl.levelname));
// seperate the printfs so the server message can have a color
- if (!Nehahrademcompatibility) // no messages when playing the Nehahra movie
- {
- Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n");
- Con_Printf ("%c%s\n", 2, str);
- }
-
-//
-// first we go through and touch all of the precache data that still
-// happens to be in the cache, so precaching something else doesn't
-// needlessly purge it
-//
+ if (cl.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie
+ Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str);
+ // check memory integrity
Mem_CheckSentinelsGlobal();
- Mod_ClearUsed();
+ // disable until we get textures for it
+ R_ResetSkyBox();
-// precache models
- memset (cl.model_precache, 0, sizeof(cl.model_precache));
+ memset(cl.model_precache, 0, sizeof(cl.model_precache));
+ memset(cl.sound_precache, 0, sizeof(cl.sound_precache));
+
+ // parse model precache list
for (nummodels=1 ; ; nummodels++)
{
- str = MSG_ReadString ();
+ str = MSG_ReadString();
if (!str[0])
break;
if (nummodels==MAX_MODELS)
- {
Host_Error ("Server sent too many model precaches\n");
- return;
- }
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
- strcpy (model_precache[nummodels], str);
- Mod_TouchModel (str);
+ strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels]));
}
-
-// precache sounds
- memset (cl.sound_precache, 0, sizeof(cl.sound_precache));
+ // parse sound precache list
for (numsounds=1 ; ; numsounds++)
{
- str = MSG_ReadString ();
+ str = MSG_ReadString();
if (!str[0])
break;
if (numsounds==MAX_SOUNDS)
- {
- Host_Error ("Server sent too many sound precaches\n");
- return;
- }
+ Host_Error("Server sent too many sound precaches\n");
if (strlen(str) >= MAX_QPATH)
- Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
- strcpy (sound_precache[numsounds], str);
- S_TouchSound (str);
+ Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ strlcpy (parse_sound_precache[numsounds], str, sizeof (parse_sound_precache[numsounds]));
}
+ // touch all of the precached models that are still loaded so we can free
+ // anything that isn't needed
+ Mod_ClearUsed();
+ for (i = 1;i < nummodels;i++)
+ {
+ CL_KeepaliveMessage();
+ Mod_TouchModel(parse_model_precache[i]);
+ }
Mod_PurgeUnused();
-//
-// now we try to load everything else until a cache allocation fails
-//
-
- for (i=1 ; i<nummodels ; i++)
+ // do the same for sounds
+ S_ClearUsed();
+ for (i = 1;i < numsounds;i++)
{
- // LordHavoc: i == 1 means the first model is the world model
- cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, i == 1);
+ CL_KeepaliveMessage();
+ S_TouchSound(parse_sound_precache[i]);
+ }
+ S_PurgeUnused();
- if (cl.model_precache[i] == NULL)
- {
- Host_Error("Model %s not found\n", model_precache[i]);
- return;
- }
- CL_KeepaliveMessage ();
+ // now we try to load everything that is new
+
+ // world model
+ CL_KeepaliveMessage ();
+ cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true);
+ if (cl.model_precache[1] == NULL)
+ Con_Printf("Map %s not found\n", parse_model_precache[1]);
+
+ // normal models
+ for (i=2 ; i<nummodels ; i++)
+ {
+ CL_KeepaliveMessage();
+ if ((cl.model_precache[i] = Mod_ForName(parse_model_precache[i], false, false, false)) == NULL)
+ Con_Printf("Model %s not found\n", parse_model_precache[i]);
}
- S_BeginPrecaching ();
+ // sounds
for (i=1 ; i<numsounds ; i++)
{
- cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
- CL_KeepaliveMessage ();
+ CL_KeepaliveMessage();
+ cl.sound_precache[i] = S_PrecacheSound(parse_sound_precache[i], true);
}
- 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;
+ // local state
+ 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; // some of the renderer still relies on scale
+ ent->render.alpha = 1;
+ ent->render.flags = RENDER_SHADOW | RENDER_LIGHT;
+ Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1);
+ Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
+ CL_BoundingBoxForEntity(&ent->render);
+ // clear entlife array
+ memset(entlife, 0, MAX_EDICTS);
- R_NewMap ();
+ cl_num_entities = 1;
+ R_Modules_NewMap();
CL_CGVM_Start();
- Mem_CheckSentinelsGlobal();
+ // noclip is turned off at start
+ noclip_anglehack = false;
- noclip_anglehack = false; // noclip is turned off at start
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
}
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 = bound(0, cl.mtime[1] - ent->persistent.lerpstarttime, 0.1);
+ 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 (cl.islocalgame)
+ 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 (bits & U_MOREBITS)
bits |= (MSG_ReadByte()<<8);
- if ((bits & U_EXTEND1) && (!Nehahrademcompatibility))
+ if ((bits & U_EXTEND1) && cl.protocol != PROTOCOL_NEHAHRAMOVIE)
{
bits |= MSG_ReadByte() << 16;
if (bits & U_EXTEND2)
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_EXTERIORMODEL) new.flags |= RENDER_EXTERIORMODEL;
// LordHavoc: to allow playback of the Nehahra movie
- if (Nehahrademcompatibility && (bits & U_EXTEND1))
+ if (cl.protocol == PROTOCOL_NEHAHRAMOVIE && (bits & U_EXTEND1))
{
// LordHavoc: evil format
int i = MSG_ReadFloat();
new.alpha = j;
}
- if (deltadie)
+ if (new.active)
+ CL_ValidateState(&new);
+
+ ent->state_previous = ent->state_current;
+ ent->state_current = new;
+ if (ent->state_current.active)
{
- // hide the entity
- new.active = false;
+ CL_MoveLerpEntityStates(ent);
+ cl_entities_active[ent->state_current.number] = true;
+ // mark as visible (no kill this frame)
+ entlife[ent->state_current.number] = 2;
}
- else
- CL_ValidateState(&new);
+}
- if (new.flags & RENDER_STEP) // FIXME: rename this flag?
+static entity_frame_t entityframe;
+extern mempool_t *cl_entities_mempool;
+void CL_ReadEntityFrame(void)
+{
+ if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
{
- // make time identical for memcmp
- new.time = ent->state_current.time;
- if (memcmp(&new, &ent->state_current, sizeof(entity_state_t)))
+ int i;
+ entity_t *ent;
+ EntityFrame_Read(&cl.entitydatabase);
+ EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe);
+ for (i = 0;i < entityframe.numentities;i++)
{
- // set it back to what it should be
- new.time = cl.mtime[0] + 0.1;
- // state has changed
+ // copy the states
+ ent = &cl_entities[entityframe.entitydata[i].number];
ent->state_previous = ent->state_current;
- ent->state_current = new;
- // assume 10fps animation
- //ent->state_previous.time = cl.mtime[0] - 0.1;
+ 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;
}
}
else
{
- ent->state_previous = ent->state_current;
- ent->state_current = new;
- }
-}
-
-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];
+ if (!cl.entitydatabase4)
+ cl.entitydatabase4 = EntityFrame4_AllocDatabase(cl_entities_mempool);
+ EntityFrame4_CL_ReadFrame(cl.entitydatabase4);
}
- 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++)
- 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;
- for (i = 1;i < MAX_EDICTS;i++)
- if (entkill[i])
- cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+ if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+ {
+ int i;
+ // disable entities that disappeared this frame
+ for (i = 1;i < MAX_EDICTS;i++)
+ {
+ // 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;
+ }
+ }
+ }
}
/*
{
int i;
- memset(&ent->state_baseline, 0, sizeof(entity_state_t));
+ ClearStateToDefault(&ent->state_baseline);
ent->state_baseline.active = true;
if (large)
{
ent->state_baseline.origin[i] = MSG_ReadCoord ();
ent->state_baseline.angles[i] = MSG_ReadAngle ();
}
- ent->state_baseline.alpha = 255;
- ent->state_baseline.scale = 16;
- ent->state_baseline.glowsize = 0;
- ent->state_baseline.glowcolor = 254;
- ent->state_previous = ent->state_current = ent->state_baseline;
-
CL_ValidateState(&ent->state_baseline);
+ ent->state_previous = ent->state_current = ent->state_baseline;
}
cl.idealpitch = 0;
VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
- for (i=0 ; i<3 ; i++)
+ if (cl.protocol == PROTOCOL_DARKPLACES5)
{
- if (bits & (SU_PUNCH1<<i) )
+ for (i = 0;i < 3;i++)
{
- if (dpprotocol)
+ if (bits & (SU_PUNCH1<<i) )
cl.punchangle[i] = MSG_ReadPreciseAngle();
else
- cl.punchangle[i] = MSG_ReadChar();
+ cl.punchangle[i] = 0;
+ if (bits & (SU_PUNCHVEC1<<i))
+ cl.punchvector[i] = MSG_ReadFloat();
+ else
+ cl.punchvector[i] = 0;
+ if (bits & (SU_VELOCITY1<<i) )
+ cl.mvelocity[0][i] = MSG_ReadFloat();
+ else
+ cl.mvelocity[0][i] = 0;
+ }
+ }
+ else
+ {
+ for (i = 0;i < 3;i++)
+ {
+ if (bits & (SU_PUNCH1<<i) )
+ {
+ if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
+ cl.punchangle[i] = MSG_ReadPreciseAngle();
+ else
+ cl.punchangle[i] = MSG_ReadChar();
+ }
+ else
+ cl.punchangle[i] = 0;
+ if (bits & (SU_PUNCHVEC1<<i))
+ cl.punchvector[i] = MSG_ReadCoord();
+ else
+ cl.punchvector[i] = 0;
+ if (bits & (SU_VELOCITY1<<i) )
+ cl.mvelocity[0][i] = MSG_ReadChar()*16;
+ else
+ cl.mvelocity[0][i] = 0;
}
- else
- cl.punchangle[i] = 0;
- if (bits & (SU_PUNCHVEC1<<i))
- cl.punchvector[i] = MSG_ReadCoord();
- else
- cl.punchvector[i] = 0;
- if (bits & (SU_VELOCITY1<<i) )
- cl.mvelocity[0][i] = MSG_ReadChar()*16;
- else
- cl.mvelocity[0][i] = 0;
}
i = MSG_ReadLong ();
i = MSG_ReadByte ();
if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
- cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
- else
- cl.stats[STAT_ACTIVEWEAPON] = i;
+ i = (1<<i);
+ // GAME_NEXUIZ hud needs weapon change time
+ // GAME_NEXUIZ uses a bit number as it's STAT_ACTIVEWEAPON, not a bitfield
+ // like other modes
+ if (cl.stats[STAT_ACTIVEWEAPON] != i)
+ cl.weapontime = cl.time;
+ cl.stats[STAT_ACTIVEWEAPON] = i;
cl.viewzoomold = cl.viewzoomnew; // for interpolation
if (bits & SU_VIEWZOOM)
{
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.skinnum = ent->state_baseline.skin;
ent->render.effects = ent->state_baseline.effects;
ent->render.alpha = 1;
- ent->render.scale = 1;
- ent->render.alpha = 1;
+ //ent->render.scale = 1;
+
+ //VectorCopy (ent->state_baseline.origin, ent->render.origin);
+ //VectorCopy (ent->state_baseline.angles, ent->render.angles);
- VectorCopy (ent->state_baseline.origin, ent->render.origin);
- VectorCopy (ent->state_baseline.angles, ent->render.angles);
+ Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1);
+ Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
+ 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 lightning)
+{
+ int i, ent;
+ vec3_t start, end;
+ beam_t *b;
+
+ ent = MSG_ReadShort ();
+ MSG_ReadVector(start);
+ MSG_ReadVector(end);
+
+ if (ent >= MAX_EDICTS)
+ {
+ Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent);
+ ent = 0;
+ }
+
+ // 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->lightning = lightning;
+ b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0;
+ 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->lightning = lightning;
+ b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0;
+ b->model = m;
+ b->endtime = cl.time + 0.2;
+ VectorCopy (start, b->start);
+ VectorCopy (end, b->end);
+ return;
+ }
+ }
+ Con_Print("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;
+ matrix4x4_t tempmatrix;
+
+ type = MSG_ReadByte();
+ switch (type)
+ {
+ case TE_WIZSPIKE:
+ // spike hitting wall
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, 0, false, 1);
+ 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);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, 0, false, 1);
+ 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);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ // 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);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ // LordHavoc: changed to spark shower
+ CL_SparkShower(pos, vec3_origin, 15);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1);
+ 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);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ // 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);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ // LordHavoc: changed to dust shower
+ CL_SparkShower(pos, vec3_origin, 30);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 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;
+ // LordHavoc: added for improved blood splatters
+ case TE_BLOOD:
+ // blood puff
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ dir[0] = MSG_ReadChar();
+ dir[1] = MSG_ReadChar();
+ dir[2] = MSG_ReadChar();
+ count = MSG_ReadByte();
+ CL_BloodPuff(pos, dir, count);
+ break;
+ case TE_SPARK:
+ // spark shower
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ dir[0] = MSG_ReadChar();
+ dir[1] = MSG_ReadChar();
+ dir[2] = MSG_ReadChar();
+ count = MSG_ReadByte();
+ CL_SparkShower(pos, dir, count);
+ break;
+ case TE_PLASMABURN:
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, 0, true, 1);
+ 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);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ // LordHavoc: changed to dust shower
+ CL_SparkShower(pos, vec3_origin, 15);
+ break;
+
+ case TE_GUNSHOTQUAD:
+ // quad bullet hitting wall
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ CL_SparkShower(pos, vec3_origin, 15);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1);
+ break;
+
+ case TE_EXPLOSION:
+ // rocket explosion
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ CL_ParticleExplosion(pos);
+ // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 1.0f, 700, 0.5, 0, 0, true, 1);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_EXPLOSIONQUAD:
+ // quad rocket explosion
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ CL_ParticleExplosion(pos);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, 0, true, 1);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_EXPLOSION3:
+ // Nehahra movie colored lighting explosion
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ CL_ParticleExplosion(pos);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ color[0] = MSG_ReadCoord() * (2.0f / 1.0f);
+ color[1] = MSG_ReadCoord() * (2.0f / 1.0f);
+ color[2] = MSG_ReadCoord() * (2.0f / 1.0f);
+ CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_EXPLOSIONRGB:
+ // colored lighting explosion
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ CL_ParticleExplosion(pos);
+ color[0] = MSG_ReadByte() * (2.0f / 255.0f);
+ color[1] = MSG_ReadByte() * (2.0f / 255.0f);
+ color[2] = MSG_ReadByte() * (2.0f / 255.0f);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_TAREXPLOSION:
+ // tarbaby explosion
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ CL_BlobExplosion(pos);
+
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, 0, true, 1);
+ break;
+
+ case TE_SMALLFLASH:
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, 0, true, 1);
+ break;
+
+ case TE_CUSTOMFLASH:
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ radius = MSG_ReadByte() * 8;
+ velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0);
+ color[0] = MSG_ReadByte() * (2.0f / 255.0f);
+ color[1] = MSG_ReadByte() * (2.0f / 255.0f);
+ color[2] = MSG_ReadByte() * (2.0f / 255.0f);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, 0, true, 1);
+ 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, true);
+ 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, true);
+ 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, false);
+ 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, false);
+ break;
+// PGM 01/21/97
+
+// LordHavoc: for compatibility with the Nehahra movie...
+ case TE_LIGHTNING4NEH:
+ CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, false), false);
+ break;
+
+ case TE_LAVASPLASH:
+ MSG_ReadVector(pos);
+ CL_LavaSplash(pos);
+ break;
+
+ case TE_TELEPORT:
+ MSG_ReadVector(pos);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f, 0, 0, true, 1);
+// CL_TeleportSplash(pos);
+ break;
+
+ case TE_EXPLOSION2:
+ // color mapped explosion
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ colorStart = MSG_ReadByte();
+ colorLength = MSG_ReadByte();
+ CL_ParticleExplosion2(pos, colorStart, colorLength);
+ tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart];
+ color[0] = tempcolor[0] * (2.0f / 255.0f);
+ color[1] = tempcolor[1] * (2.0f / 255.0f);
+ color[2] = tempcolor[2] * (2.0f / 255.0f);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_TEI_G3:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(pos2);
+ MSG_ReadVector(dir);
+ CL_BeamParticle(pos, pos2, 12, 1, 0.3, 0.1, 1, 1);
+ CL_BeamParticle(pos, pos2, 5, 1, 0.9, 0.3, 1, 1);
+ break;
+
+ case TE_TEI_SMOKE:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(dir);
+ count = MSG_ReadByte();
+ CL_FindNonSolidLocation(pos, pos, 4);
+ CL_Tei_Smoke(pos, dir, count);
+ break;
+
+ case TE_TEI_BIGEXPLOSION:
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ CL_ParticleExplosion(pos);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, 0, true, 1);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
-#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
+ case TE_TEI_PLASMAHIT:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(dir);
+ count = MSG_ReadByte();
+ CL_FindNonSolidLocation(pos, pos, 5);
+ CL_Tei_PlasmaHit(pos, dir, count);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, 0, true, 1);
+ break;
+
+ default:
+ Host_Error("CL_ParseTempEntity: bad type %d (hex %02X)", type, type);
+ }
+}
+
+#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x);
static qbyte cgamenetbuffer[65536];
CL_ParseServerMessage
=====================
*/
-void CL_ParseServerMessage (void)
+int parsingerror = false;
+void CL_ParseServerMessage(void)
{
int cmd;
int i, entitiesupdated;
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
+ if (cls.demorecording)
+ CL_WriteDemoMessage ();
+
+ cl.last_received_message = realtime;
+
//
// if recording demos, copy the message out
//
if (cl_shownet.integer == 1)
- Con_Printf ("%i ",net_message.cursize);
+ Con_Printf("%f %i\n", realtime, net_message.cursize);
else if (cl_shownet.integer == 2)
- Con_Printf ("------------------\n");
+ Con_Print("------------------\n");
cl.onground = false; // unless the server says otherwise
//
// parse the message
//
- MSG_BeginReading ();
+ //MSG_BeginReading ();
entitiesupdated = false;
- CL_EntityUpdateSetup();
+
+ parsingerror = true;
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 ();
}
{
char description[32*64], temp[64];
int count;
- strcpy(description, "packet dump: ");
+ strcpy (description, "packet dump: ");
i = cmdcount - 32;
if (i < 0)
i = 0;
i &= 31;
while(count > 0)
{
- sprintf(temp, "%3i:%s ", cmdlog[i], cmdlogname[i]);
- strcat(description, temp);
+ snprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
+ strlcat (description, temp, sizeof (description));
count--;
i++;
i &= 31;
}
description[strlen(description)-1] = '\n'; // replace the last space with a newline
- Con_Printf("%s", description);
+ Con_Print(description);
Host_Error ("CL_ParseServerMessage: Illegible server message\n");
}
break;
case svc_nop:
+ if (cls.signon < SIGNONS)
+ Con_Print("<-- server to client keepalive\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 != 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 && dpprotocol != DPPROTOCOL_VERSION3)
- dpprotocol = 0;
+ // hack for unmarked Nehahra movie demos which had a custom protocol
+ if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer)
+ i = PROTOCOL_NEHAHRAMOVIE;
+ if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_NEHAHRAMOVIE)
+ Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE);
+ cl.protocol = i;
break;
case svc_disconnect:
- Host_EndGame ("Server disconnected\n");
+ Con_Printf ("Server disconnected\n");
+ if (cls.demonum != -1)
+ CL_NextDemo ();
+ else
+ CL_Disconnect ();
+ break;
case svc_print:
- Con_Printf ("%s", MSG_ReadString ());
+ Con_Print(MSG_ReadString());
break;
case svc_centerprint:
- SCR_CenterPrint (MSG_ReadString ());
+ SCR_CenterPrint(MSG_ReadString ());
break;
case svc_stufftext:
break;
case svc_setview:
- cl.viewentity = MSG_ReadShort ();
+ cl.viewentity = (unsigned short)MSG_ReadShort ();
+ if (cl.viewentity >= MAX_EDICTS)
+ Host_Error("svc_setview >= MAX_EDICTS\n");
+ // LordHavoc: assume first setview recieved is the real player entity
+ if (!cl.playerentity)
+ cl.playerentity = cl.viewentity;
break;
case svc_lightstyle:
i = MSG_ReadByte ();
if (i >= MAX_LIGHTSTYLES)
Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES");
- strncpy (cl_lightstyle[i].map, MSG_ReadString(), MAX_STYLESTRING - 1);
+ strlcpy (cl_lightstyle[i].map, MSG_ReadString(), sizeof (cl_lightstyle[i].map));
cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
break;
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients");
- strcpy (cl.scores[i].name, MSG_ReadString ());
+ strlcpy (cl.scores[i].name, MSG_ReadString (), sizeof (cl.scores[i].name));
break;
case svc_updatefrags:
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:
cl.paused = MSG_ReadByte ();
if (cl.paused)
+ {
CDAudio_Pause ();
+ S_PauseGameSounds ();
+ }
else
+ {
CDAudio_Resume ();
+ S_ResumeGameSounds ();
+ }
break;
case svc_signonnum:
case svc_finale:
cl.intermission = 2;
cl.completed_time = cl.time;
- SCR_CenterPrint (MSG_ReadString ());
+ SCR_CenterPrint(MSG_ReadString ());
break;
case svc_cutscene:
cl.intermission = 3;
cl.completed_time = cl.time;
- SCR_CenterPrint (MSG_ReadString ());
+ SCR_CenterPrint(MSG_ReadString ());
break;
case svc_sellscreen:
Cmd_ExecuteString ("help", src_command);
break;
case svc_hidelmp:
- SHOWLMP_decodehide();
+ if (gamemode == GAME_TENEBRAE)
+ {
+ // repeating particle effect
+ MSG_ReadCoord();
+ MSG_ReadCoord();
+ MSG_ReadCoord();
+ MSG_ReadCoord();
+ MSG_ReadCoord();
+ MSG_ReadCoord();
+ MSG_ReadByte();
+ MSG_ReadLong();
+ MSG_ReadLong();
+ MSG_ReadString();
+ }
+ else
+ SHOWLMP_decodehide();
break;
case svc_showlmp:
- SHOWLMP_decodeshow();
+ if (gamemode == GAME_TENEBRAE)
+ {
+ // particle effect
+ MSG_ReadCoord();
+ MSG_ReadCoord();
+ MSG_ReadCoord();
+ MSG_ReadByte();
+ MSG_ReadString();
+ }
+ else
+ SHOWLMP_decodeshow();
break;
case svc_skybox:
R_SetSkyBox(MSG_ReadString());
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();
+
+ parsingerror = false;
+}
+
+void CL_Parse_DumpPacket(void)
+{
+ if (!parsingerror)
+ return;
+ Con_Print("Packet dump:\n");
+ SZ_HexDumpToConsole(&net_message);
+ parsingerror = false;
}
+void CL_Parse_Init(void)
+{
+ // LordHavoc: added demo_nehahra cvar
+ cl_scores_mempool = Mem_AllocPool("client player info");
+ Cvar_RegisterVariable (&demo_nehahra);
+ if (gamemode == GAME_NEHAHRA)
+ Cvar_SetValue("demo_nehahra", 1);
+ Cvar_RegisterVariable(&developer_networkentities);
+}
projects / xonotic / darkplaces.git / blobdiff