This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
// cl_parse.c -- parse a message received from the server
#include "quakedef.h"
+#include "cl_collision.h"
char *svc_strings[128] =
{
"svc_stufftext", // [string] stuffed into client's console buffer
// the string should be \n terminated
"svc_setangle", // [vec3] set the view angle to this absolute value
-
+
"svc_serverinfo", // [long] version
// [string] signon string
// [string]..[0]model cache [string]...[0]sounds cache
"svc_updatecolors", // [byte] [byte]
"svc_particle", // [vec3] <variable>
"svc_damage", // [byte] impact [byte] blood [vec3] from
-
+
"svc_spawnstatic",
"OBSOLETE svc_spawnbinary",
"svc_spawnbaseline",
-
+
"svc_temp_entity", // <variable>
"svc_setpause",
"svc_signonnum",
"svc_cdtrack", // [byte] track [byte] looptrack
"svc_sellscreen",
"svc_cutscene",
- "svc_showlmp", // [string] iconlabel [string] lmpfile [byte] x [byte] y
+ "svc_showlmp", // [string] iconlabel [string] lmpfile [short] x [short] y
"svc_hidelmp", // [string] iconlabel
"svc_skybox", // [string] skyname
- "?", // 38
- "?", // 39
- "?", // 40
- "?", // 41
- "?", // 42
- "?", // 43
- "?", // 44
- "?", // 45
- "?", // 46
- "?", // 47
- "?", // 48
- "?", // 49
- "svc_farclip", // [coord] size
- "svc_fog", // [byte] enable <optional past this point, only included if enable is true> [short] density*4096 [byte] red [byte] green [byte] blue
- "svc_playerposition" // [float] x [float] y [float] z
+ "", // 38
+ "", // 39
+ "", // 40
+ "", // 41
+ "", // 42
+ "", // 43
+ "", // 44
+ "", // 45
+ "", // 46
+ "", // 47
+ "", // 48
+ "", // 49
+ "svc_cgame", // 50 // [short] length [bytes] data
+ "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
+ "svc_spawnbaseline2", // 55 // short modelindex instead of byte
+ "svc_spawnstatic2", // 56 // short modelindex instead of byte
+ "svc_entities", // 57 // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata
+ "svc_unusedlh3", // 58
+ "svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten
};
//=============================================================================
-qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
-qboolean dpprotocol; // LordHavoc: whether or not the current network stream is the enhanced DarkPlaces protocol
-
-/*
-===============
-CL_EntityNum
+cvar_t demo_nehahra = {0, "demo_nehahra", "0"};
-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);
- while (cl.num_entities<=num)
- {
- cl_entities[cl.num_entities].colormap = -1; // no special coloring
- cl.num_entities++;
- }
- }
-
- return &cl_entities[num];
-}
+qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
+int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces
+mempool_t *cl_scores_mempool;
/*
==================
CL_ParseStartSoundPacket
==================
*/
-void CL_ParseStartSoundPacket(void)
+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;
+ int i;
+
+ 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 ();
- sound_num = MSG_ReadByte ();
- ent = channel >> 3;
- channel &= 7;
+ 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 (ent > MAX_EDICTS)
+ 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);
+
+
+ if (ent >= MAX_EDICTS)
Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent);
-
- for (i=0 ; i<3 ; i++)
+
+ for (i = 0;i < 3;i++)
pos[i] = MSG_ReadCoord ();
-
- S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
-}
+
+ 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;
- sizebuf_t old;
- byte 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:
- if (MSG_ReadByte() != svc_nop)
- Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop");
- break;
- }
- } while (ret);
+ memcpy(olddata, net_message.data, net_message.cursize);
- net_message = old;
- memcpy (net_message.data, olddata, net_message.cursize);
-
-// check time
- time = Sys_FloatTime ();
- 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_Printf("--> 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();
+ }
}
-extern qboolean isworldmodel;
-extern char skyname[];
-extern void R_SetSkyBox (char *sky);
-extern void FOG_clear();
-extern cvar_t r_farclip;
-
void CL_ParseEntityLump(char *entdata)
{
- char *data;
+ const char *data;
char key[128], value[4096];
- char wadname[128];
- int i, j, k;
FOG_clear(); // LordHavoc: no fog until set
- skyname[0] = 0; // LordHavoc: no enviroment mapped sky until set
- r_farclip.value = 6144; // LordHavoc: default farclip distance
+ R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set
data = entdata;
if (!data)
return;
- data = COM_Parse(data);
- if (!data)
- return; // valid exit
+ 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] == '}')
- return; // since we're just parsing the first ent (worldspawn), exit
- strcpy(key, com_token);
+ break; // end of worldspawn
+ if (com_token[0] == '_')
+ strcpy(key, com_token + 1);
+ else
+ 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, false))
return; // error
strcpy(value, com_token);
if (!strcmp("sky", key))
R_SetSkyBox(value);
else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
R_SetSkyBox(value);
- else if (!strcmp("farclip", key))
- {
- r_farclip.value = atof(value);
- if (r_farclip.value < 64)
- r_farclip.value = 64;
- }
else if (!strcmp("fog", key))
- {
- scanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue);
- j = 0;
- }
+ sscanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue);
else if (!strcmp("fog_density", key))
fog_density = atof(value);
else if (!strcmp("fog_red", key))
fog_green = atof(value);
else if (!strcmp("fog_blue", key))
fog_blue = atof(value);
- else if (!strcmp("wad", key)) // for HalfLife maps
+ }
+}
+
+/*
+=====================
+CL_SignonReply
+
+An svc_signonnum has been received, perform a client side setup
+=====================
+*/
+static void CL_SignonReply (void)
+{
+ //char str[8192];
+
+Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
+
+ switch (cls.signon)
+ {
+ case 1:
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, "prespawn");
+ break;
+
+ case 2:
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string));
+
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, va("color %i %i\n", cl_color.integer >> 4, cl_color.integer & 15));
+
+ if (cl_pmodel.integer)
{
- j = 0;
- for (i = 0;i < 4096;i++)
- if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
- break;
- if (value[i])
- {
- for (;i < 4096;i++)
- {
- // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'...
- if (value[i] == '\\' || value[i] == '/' || value[i] == ':')
- j = i+1;
- else if (value[i] == ';' || value[i] == 0)
- {
- k = value[i];
- value[i] = 0;
- strcpy(wadname, "textures/");
- strcat(wadname, &value[j]);
- W_LoadTextureWadFile (wadname, false);
- j = i+1;
- if (!k)
- break;
- }
- }
- }
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer));
}
+
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, "spawn");
+ break;
+
+ case 3:
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, "begin");
+ break;
+
+ case 4:
+ Con_ClearNotify();
+ break;
}
}
CL_ParseServerInfo
==================
*/
-extern cvar_t demo_nehahra;
+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");
//
// wipe the client_state_t struct
// parse protocol version number
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
+ if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
{
- Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
+ Host_Error ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
return;
}
Nehahrademcompatibility = false;
if (i == 250)
Nehahrademcompatibility = true;
- if (cls.demoplayback && demo_nehahra.value)
+ if (cls.demoplayback && demo_nehahra.integer)
Nehahrademcompatibility = true;
- dpprotocol = i == DPPROTOCOL_VERSION;
+ dpprotocol = i;
+ if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+ dpprotocol = 0;
// parse maxclients
cl.maxclients = MSG_ReadByte ();
Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients);
return;
}
- cl.scores = Hunk_AllocName (cl.maxclients*sizeof(*cl.scores), "scores");
+ Mem_EmptyPool(cl_scores_mempool);
+ cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores));
// parse gametype
cl.gametype = MSG_ReadByte ();
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
-//
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+
+ // 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)
- {
- Con_Printf ("Server sent too many model precaches\n");
- return;
- }
+ Host_Error ("Server sent too many model 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 (model_precache[nummodels], str);
- Mod_TouchModel (str);
+ strcpy(parse_model_precache[nummodels], str);
}
-
-// 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)
- {
- Con_Printf ("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);
+ strcpy(parse_sound_precache[numsounds], str);
}
-//
-// now we try to load everything else until a cache allocation fails
-//
+ // 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]);
+ }
+ // do the same for sounds
+ for (i = 1;i < numsounds;i++)
+ {
+ CL_KeepaliveMessage();
+ S_TouchSound(parse_sound_precache[i]);
+ }
+ // purge anything that was not touched
+ Mod_PurgeUnused();
+
+ // now we try to load everything that is new
- for (i=1 ; i<nummodels ; i++)
+ // 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++)
{
- isworldmodel = i == 1; // LordHavoc: first model is the world model
- cl.model_precache[i] = Mod_ForName (model_precache[i], false);
- if (cl.model_precache[i] == NULL)
- {
- Con_Printf("Model %s not found\n", model_precache[i]);
- return;
- }
- CL_KeepaliveMessage ();
+ 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]);
}
+ // sounds
S_BeginPrecaching ();
for (i=1 ; i<numsounds ; i++)
{
- cl.sound_precache[i] = S_PrecacheSound (sound_precache[i]);
- CL_KeepaliveMessage ();
+ CL_KeepaliveMessage();
+ cl.sound_precache[i] = S_PrecacheSound(parse_sound_precache[i], true);
}
S_EndPrecaching ();
+ // 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;
+ ent->render.alpha = 1;
+ ent->render.flags = RENDER_SHADOW;
+ 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);
+
+ cl_num_entities = 1;
+
+ R_Modules_NewMap();
+ CL_CGVM_Start();
+
+ // noclip is turned off at start
+ noclip_anglehack = false;
+
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+}
+
+void CL_ValidateState(entity_state_t *s)
+{
+ model_t *model;
+
+ if (!s->active)
+ return;
-// local state
- cl_entities[0].model = cl.worldmodel = cl.model_precache[1];
-
- R_NewMap ();
+ if (s->modelindex >= MAX_MODELS)
+ Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS);
- Hunk_Check (); // make sure nothing is hurt
-
- noclip_anglehack = false; // noclip is turned off at start
+ // colormap is client index + 1
+ if (s->colormap > cl.maxclients)
+ Host_Error ("CL_ValidateState: colormap (%i) > cl.maxclients (%i)", s->colormap, cl.maxclients);
+
+ model = cl.model_precache[s->modelindex];
+ Mod_CheckLoaded(model);
+ if (model && s->frame >= model->numframes)
+ {
+ 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_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)
+ {
+ 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 (sv.active && svs.maxclients == 1)
+ 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);
+ }
+}
/*
==================
*/
void CL_ParseUpdate (int bits)
{
- int i, modnum, num, alpha, scale, glowsize, glowcolor, colormod;
- model_t *model;
- qboolean forcelink;
- entity_t *ent;
- entity_state_t *baseline;
-
- if (cls.signon == SIGNONS - 1)
- { // first update is the final signon stage
- cls.signon = SIGNONS;
- CL_SignonReply ();
- }
+ 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) && (!Nehahrademcompatibility))
{
bits |= MSG_ReadByte() << 16;
if (bits & U_EXTEND2)
bits |= MSG_ReadByte() << 24;
}
- if (bits & U_LONGENTITY)
- num = MSG_ReadShort ();
+ if (bits & U_LONGENTITY)
+ num = (unsigned) MSG_ReadShort ();
else
- num = MSG_ReadByte ();
+ num = (unsigned) MSG_ReadByte ();
- ent = CL_EntityNum (num);
+ if (num >= MAX_EDICTS)
+ Host_Error("CL_ParseUpdate: entity number (%i) >= MAX_EDICTS (%i)\n", num, MAX_EDICTS);
+ if (num < 1)
+ Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num);
- forcelink = ent->msgtime != cl.mtime[1]; // no previous frame to lerp from
+ ent = cl_entities + num;
- ent->msgtime = cl.mtime[0];
-
- // LordHavoc: new protocol stuff
- baseline = &ent->baseline;
+ // 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)
- baseline = &ent->deltabaseline;
-
- if (forcelink)
+ new = ent->state_current;
+ else
{
- ent->deltabaseline.origin[0] = ent->deltabaseline.origin[1] = ent->deltabaseline.origin[2] = 0;
- ent->deltabaseline.angles[0] = ent->deltabaseline.angles[1] = ent->deltabaseline.angles[2] = 0;
- ent->deltabaseline.effects = 0;
- ent->deltabaseline.modelindex = 0;
- ent->deltabaseline.frame = 0;
- ent->deltabaseline.colormap = 0;
- ent->deltabaseline.skin = 0;
- ent->deltabaseline.alpha = 255;
- ent->deltabaseline.scale = 16;
- ent->deltabaseline.glowsize = 0;
- ent->deltabaseline.glowcolor = 254;
- ent->deltabaseline.colormod = 255;
+ new = ent->state_baseline;
+ new.active = true;
}
- modnum = bits & U_MODEL ? MSG_ReadByte() : baseline->modelindex;
- if (modnum >= MAX_MODELS)
- Host_Error ("CL_ParseModel: bad modnum");
- ent->deltabaseline.modelindex = modnum;
-
- model = cl.model_precache[modnum];
- if (model != ent->model)
+ new.number = num;
+ new.time = cl.mtime[0];
+ new.flags = 0;
+ 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_SKIN) new.skin = MSG_ReadByte();
+ if (bits & U_EFFECTS) new.effects = (new.effects & 0xFF00) | MSG_ReadByte();
+ if (bits & U_ORIGIN1) new.origin[0] = MSG_ReadCoord();
+ if (bits & U_ANGLE1) new.angles[0] = MSG_ReadAngle();
+ if (bits & U_ORIGIN2) new.origin[1] = MSG_ReadCoord();
+ if (bits & U_ANGLE2) new.angles[1] = MSG_ReadAngle();
+ if (bits & U_ORIGIN3) new.origin[2] = MSG_ReadCoord();
+ if (bits & U_ANGLE3) new.angles[2] = MSG_ReadAngle();
+ if (bits & U_STEP) new.flags |= RENDER_STEP;
+ if (bits & U_ALPHA) new.alpha = MSG_ReadByte();
+ if (bits & U_SCALE) new.scale = 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();
+ // apparently the dpcrush demo uses this (unintended, and it uses white anyway)
+ if (bits & U_COLORMOD) MSG_ReadByte();
+ 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);
+ if (bits & U_VIEWMODEL) new.flags |= RENDER_VIEWMODEL;
+ if (bits & U_EXTERIORMODEL) new.flags |= RENDER_EXTERIORMODEL;
+
+ // LordHavoc: to allow playback of the Nehahra movie
+ if (Nehahrademcompatibility && (bits & U_EXTEND1))
{
- ent->model = model;
- // automatic animation (torches, etc) can be either all together
- // or randomized
- if (model)
- ent->syncbase = model->synctype == ST_RAND ? (float)(rand()&0x7fff) / 0x7fff : 0.0;
+ // LordHavoc: evil format
+ int i = MSG_ReadFloat();
+ int j = MSG_ReadFloat() * 255.0f;
+ if (i == 2)
+ {
+ i = MSG_ReadFloat();
+ if (i)
+ new.effects |= EF_FULLBRIGHT;
+ }
+ if (j < 0)
+ new.alpha = 0;
+ else if (j == 0 || j >= 255)
+ new.alpha = 255;
else
- forcelink = true; // hack to make null model players work
+ new.alpha = j;
}
- ent->frame = ((bits & U_FRAME) ? MSG_ReadByte() : (baseline->frame & 0xFF));
+ if (new.active)
+ CL_ValidateState(&new);
- i = bits & U_COLORMAP ? MSG_ReadByte() : baseline->colormap;
- ent->deltabaseline.colormap = i;
- if (!i)
- ent->colormap = -1; // no special coloring
- else
+ ent->state_previous = ent->state_current;
+ ent->state_current = new;
+ if (ent->state_current.active)
{
- if (i > cl.maxclients)
- Host_Error ("i >= cl.maxclients");
- ent->colormap = cl.scores[i-1].colors; // color it
+ 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->deltabaseline.skin = ent->skinnum = bits & U_SKIN ? MSG_ReadByte() : baseline->skin;
-
- ent->effects = ((bits & U_EFFECTS) ? MSG_ReadByte() : (baseline->effects & 0xFF));
-
-// shift the known values for interpolation
- VectorCopy (ent->msg_origins[0], ent->msg_origins[1]);
- VectorCopy (ent->msg_angles[0], ent->msg_angles[1]);
- VectorCopy (baseline->origin, ent->msg_origins[0]);
- VectorCopy (baseline->angles, ent->msg_angles[0]);
-
- if (bits & U_ORIGIN1) ent->msg_origins[0][0] = MSG_ReadCoord ();
- if (bits & U_ANGLE1) ent->msg_angles[0][0] = MSG_ReadAngle();
- if (bits & U_ORIGIN2) ent->msg_origins[0][1] = MSG_ReadCoord ();
- if (bits & U_ANGLE2) ent->msg_angles[0][1] = MSG_ReadAngle();
- if (bits & U_ORIGIN3) ent->msg_origins[0][2] = MSG_ReadCoord ();
- if (bits & U_ANGLE3) ent->msg_angles[0][2] = MSG_ReadAngle();
-
- VectorCopy(ent->msg_origins[0], ent->deltabaseline.origin);
- VectorCopy(ent->msg_angles[0], ent->deltabaseline.angles);
-
- alpha = bits & U_ALPHA ? MSG_ReadByte() : baseline->alpha;
- scale = bits & U_SCALE ? MSG_ReadByte() : baseline->scale;
- ent->effects |= ((bits & U_EFFECTS2) ? (MSG_ReadByte() << 8) : (baseline->effects & 0xFF00));
- glowsize = bits & U_GLOWSIZE ? MSG_ReadByte() : baseline->glowsize;
- glowcolor = bits & U_GLOWCOLOR ? MSG_ReadByte() : baseline->glowcolor;
- colormod = bits & U_COLORMOD ? MSG_ReadByte() : baseline->colormod;
- ent->frame |= ((bits & U_FRAME2) ? (MSG_ReadByte() << 8) : (baseline->frame & 0xFF00));
- ent->deltabaseline.alpha = alpha;
- ent->deltabaseline.scale = scale;
- ent->deltabaseline.effects = ent->effects;
- ent->deltabaseline.glowsize = glowsize;
- ent->deltabaseline.glowcolor = glowcolor;
- ent->deltabaseline.colormod = colormod;
- ent->deltabaseline.frame = ent->frame;
- ent->alpha = (float) alpha * (1.0 / 255.0);
- ent->scale = (float) scale * (1.0 / 16.0);
- ent->glowsize = glowsize * 4.0;
- ent->glowcolor = glowcolor;
- ent->colormod[0] = (float) ((colormod >> 5) & 7) * (1.0 / 7.0);
- ent->colormod[1] = (float) ((colormod >> 2) & 7) * (1.0 / 7.0);
- ent->colormod[2] = (float) (colormod & 3) * (1.0 / 3.0);
- if (bits & U_EXTEND1 && Nehahrademcompatibility) // LordHavoc: to allow playback of the early Nehahra movie segments
+static entity_frame_t entityframe;
+void CL_ReadEntityFrame(void)
+{
+ if (dpprotocol == DPPROTOCOL_VERSION3)
{
- i = MSG_ReadFloat();
- ent->alpha = MSG_ReadFloat();
- if (i == 2 && MSG_ReadFloat() != 0.0)
- ent->effects |= EF_FULLBRIGHT;
- if (ent->alpha == 0)
- ent->alpha = 1;
+ 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++)
+ {
+ // 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;
+ }
}
+ else
+ EntityFrame4_CL_ReadFrame(&cl.entitydatabase4);
+}
+
+void CL_EntityUpdateSetup(void)
+{
+}
- //if ( bits & U_NOLERP )
- // ent->forcelink = true;
- //if (bits & U_STEP) // FIXME: implement clientside interpolation of monsters
-
- if ( forcelink )
- { // didn't have an update last message
- VectorCopy (ent->msg_origins[0], ent->msg_origins[1]);
- VectorCopy (ent->msg_origins[0], ent->origin);
- VectorCopy (ent->msg_angles[0], ent->msg_angles[1]);
- VectorCopy (ent->msg_angles[0], ent->angles);
- ent->forcelink = true;
+void CL_EntityUpdateEnd(void)
+{
+ if (dpprotocol != DPPROTOCOL_VERSION4)
+ {
+ 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;
+ }
+ }
}
}
CL_ParseBaseline
==================
*/
-void CL_ParseBaseline (entity_t *ent)
+void CL_ParseBaseline (entity_t *ent, int large)
{
- int i;
-
- ent->baseline.modelindex = MSG_ReadByte ();
- ent->baseline.frame = MSG_ReadByte ();
- ent->baseline.colormap = MSG_ReadByte();
- ent->baseline.skin = MSG_ReadByte();
- for (i=0 ; i<3 ; i++)
+ int i;
+
+ memset(&ent->state_baseline, 0, sizeof(entity_state_t));
+ ent->state_baseline.active = true;
+ if (large)
+ {
+ ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort ();
+ ent->state_baseline.frame = (unsigned short) MSG_ReadShort ();
+ }
+ else
+ {
+ ent->state_baseline.modelindex = MSG_ReadByte ();
+ ent->state_baseline.frame = MSG_ReadByte ();
+ }
+ ent->state_baseline.colormap = MSG_ReadByte();
+ ent->state_baseline.skin = MSG_ReadByte();
+ for (i = 0;i < 3;i++)
{
- ent->baseline.origin[i] = MSG_ReadCoord ();
- ent->baseline.angles[i] = MSG_ReadAngle ();
+ ent->state_baseline.origin[i] = MSG_ReadCoord ();
+ ent->state_baseline.angles[i] = MSG_ReadAngle ();
}
- ent->baseline.alpha = 255;
- ent->baseline.scale = 16;
- ent->baseline.glowsize = 0;
- ent->baseline.glowcolor = 254;
- ent->baseline.colormod = 255;
+ 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);
}
*/
void CL_ParseClientdata (int bits)
{
- int i, j;
-
+ int i, j;
+
+ bits &= 0xFFFF;
+ if (bits & SU_EXTEND1)
+ bits |= (MSG_ReadByte() << 16);
+ if (bits & SU_EXTEND2)
+ bits |= (MSG_ReadByte() << 24);
+
if (bits & SU_VIEWHEIGHT)
cl.viewheight = MSG_ReadChar ();
else
cl.idealpitch = MSG_ReadChar ();
else
cl.idealpitch = 0;
-
+
VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
for (i=0 ; i<3 ; i++)
{
if (bits & (SU_PUNCH1<<i) )
- cl.punchangle[i] = MSG_ReadChar();
+ {
+ if (dpprotocol)
+ 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.item_gettime[j] = cl.time;
cl.items = i;
}
-
+
cl.onground = (bits & SU_ONGROUND) != 0;
cl.inwater = (bits & SU_INWATER) != 0;
i = MSG_ReadByte ();
- if (standard_quake)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
+ cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
+ else
cl.stats[STAT_ACTIVEWEAPON] = i;
+
+ cl.viewzoomold = cl.viewzoomnew; // for interpolation
+ if (bits & SU_VIEWZOOM)
+ {
+ i = MSG_ReadByte();
+ if (i < 2)
+ i = 2;
+ cl.viewzoomnew = (float) i * (1.0f / 255.0f);
+ }
else
- cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
+ cl.viewzoomnew = 1;
+
}
/*
CL_ParseStatic
=====================
*/
-void CL_ParseStatic (void)
+void CL_ParseStatic (int large)
{
entity_t *ent;
- int i;
-
- i = cl.num_statics;
- if (i >= MAX_STATIC_ENTITIES)
+
+ if (cl_num_static_entities >= cl_max_static_entities)
Host_Error ("Too many static entities");
- ent = &cl_static_entities[i];
- cl.num_statics++;
- CL_ParseBaseline (ent);
+ ent = &cl_static_entities[cl_num_static_entities++];
+ CL_ParseBaseline (ent, large);
// copy it to the current state
- ent->model = cl.model_precache[ent->baseline.modelindex];
- ent->frame = ent->baseline.frame;
- ent->colormap = -1; // no special coloring
- ent->skinnum = ent->baseline.skin;
- ent->effects = ent->baseline.effects;
- ent->alpha = 1;
- ent->scale = 1;
- ent->alpha = 1;
- ent->glowsize = 0;
- ent->glowcolor = 254;
- ent->colormod[0] = ent->colormod[1] = ent->colormod[2] = 1;
-
- VectorCopy (ent->baseline.origin, ent->origin);
- VectorCopy (ent->baseline.angles, ent->angles);
- R_AddEfrags (ent);
+ ent->render.model = cl.model_precache[ent->state_baseline.modelindex];
+ ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame;
+ ent->render.framelerp = 0;
+ // make torchs play out of sync
+ ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1);
+ ent->render.colormap = -1; // no special coloring
+ ent->render.skinnum = ent->state_baseline.skin;
+ ent->render.effects = ent->state_baseline.effects;
+ ent->render.alpha = 1;
+ //ent->render.scale = 1;
+
+ //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_ParseStaticSound
===================
*/
-void CL_ParseStaticSound (void)
+void CL_ParseStaticSound (int large)
{
vec3_t org;
int sound_num, vol, atten;
- int i;
-
- for (i=0 ; i<3 ; i++)
- org[i] = MSG_ReadCoord ();
- sound_num = MSG_ReadByte ();
+
+ MSG_ReadVector(org);
+ if (large)
+ sound_num = (unsigned short) MSG_ReadShort ();
+ else
+ sound_num = MSG_ReadByte ();
vol = MSG_ReadByte ();
atten = MSG_ReadByte ();
-
+
S_StaticSound (cl.sound_precache[sound_num], org, vol, atten);
}
+void CL_ParseEffect (void)
+{
+ vec3_t org;
+ int modelindex, startframe, framecount, framerate;
-#define SHOWNET(x) if(cl_shownet.value==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
+ MSG_ReadVector(org);
+ modelindex = MSG_ReadByte ();
+ startframe = MSG_ReadByte ();
+ framecount = MSG_ReadByte ();
+ framerate = MSG_ReadByte ();
-extern void SHOWLMP_decodehide();
-extern void SHOWLMP_decodeshow();
-extern void R_SetSkyBox(char* sky);
+ CL_Effect(org, modelindex, startframe, framecount, framerate);
+}
+
+void CL_ParseEffect2 (void)
+{
+ vec3_t org;
+ int modelindex, startframe, framecount, framerate;
+
+ MSG_ReadVector(org);
+ modelindex = MSG_ReadShort ();
+ startframe = MSG_ReadShort ();
+ framecount = MSG_ReadByte ();
+ framerate = MSG_ReadByte ();
+
+ 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_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);
+ CL_FindNonSolidLocation(pos, pos, 4);
+ CL_AllocDlight(NULL, pos, 50, 0.25f, 1.00f, 0.25f, 250, 0.2);
+ 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);
+ CL_AllocDlight(NULL, pos, 50, 1.0f, 0.60f, 0.20f, 250, 0.2);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ CL_AllocDlight(NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
+ 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
+ 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);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ 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);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ 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);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ 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);
+ 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);
+ CL_AllocDlight(NULL, pos, 600, 0.8f, 0.4f, 1.0f, 1200, 0.5);
+ break;
+
+ case TE_SMALLFLASH:
+ MSG_ReadVector(pos);
+ CL_FindNonSolidLocation(pos, pos, 10);
+ CL_AllocDlight(NULL, pos, 200, 1, 1, 1, 1000, 0.2);
+ 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() * (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, 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:
+ 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, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f);
+// 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];
+ 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;
+
+ 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);
+ CL_AllocDlight(NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999);
+ S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_TEI_PLASMAHIT:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(dir);
+ count = MSG_ReadByte();
+ CL_FindNonSolidLocation(pos, pos, 5);
+ CL_Tei_PlasmaHit(pos, dir, count);
+ CL_AllocDlight(NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999);
+ 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;
- byte cmdlog[32];
+ int i, entitiesupdated;
+ qbyte cmdlog[32];
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.value == 1)
- Con_Printf ("%i ",net_message.cursize);
- else if (cl_shownet.value == 2)
+ if (cl_shownet.integer == 1)
+ Con_Printf ("%f %i\n", realtime, net_message.cursize);
+ else if (cl_shownet.integer == 2)
Con_Printf ("------------------\n");
-
- cl.onground = false; // unless the server says otherwise
+
+ cl.onground = false; // unless the server says otherwise
//
// parse the message
//
- MSG_BeginReading ();
-
+ //MSG_BeginReading ();
+
+ entitiesupdated = false;
+
+ parsingerror = true;
+
while (1)
{
if (msg_badread)
if (cmd == -1)
{
SHOWNET("END OF MESSAGE");
- return; // end of message
+ break; // end of message
}
cmdindex = cmdcount & 31;
if (cmd & 128)
{
// LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer)
- temp = "svc_entity";
+ temp = "entity";
cmdlogname[cmdindex] = temp;
SHOWNET("fast update");
+ if (cls.signon == SIGNONS - 1)
+ {
+ // first update is the final signon stage
+ cls.signon = SIGNONS;
+ CL_SignonReply ();
+ }
CL_ParseUpdate (cmd&127);
continue;
}
temp = "<unknown>";
cmdlogname[cmdindex] = temp;
}
-
+
// other commands
switch (cmd)
{
i &= 31;
}
description[strlen(description)-1] = '\n'; // replace the last space with a newline
- Con_Printf(description);
+ Con_Printf("%s", description);
Host_Error ("CL_ParseServerMessage: Illegible server message\n");
}
break;
-
+
case svc_nop:
-// Con_Printf ("svc_nop\n");
+ if (cls.signon < SIGNONS)
+ Con_Printf("<-- server to client keepalive\n");
break;
-
+
case svc_time:
+ 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 ();
+ cl.mtime[0] = MSG_ReadFloat ();
break;
-
+
case svc_clientdata:
i = MSG_ReadShort ();
CL_ParseClientdata (i);
break;
-
+
case svc_version:
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
- {
- Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
- return;
- }
+ 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.value)
+ if (cls.demoplayback && demo_nehahra.integer)
Nehahrademcompatibility = true;
- dpprotocol = i == DPPROTOCOL_VERSION;
+ dpprotocol = i;
+ if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+ dpprotocol = 0;
break;
-
+
case svc_disconnect:
Host_EndGame ("Server disconnected\n");
case svc_print:
Con_Printf ("%s", MSG_ReadString ());
break;
-
+
case svc_centerprint:
SCR_CenterPrint (MSG_ReadString ());
break;
-
+
case svc_stufftext:
Cbuf_AddText (MSG_ReadString ());
break;
-
+
case svc_damage:
V_ParseDamage ();
break;
-
+
case svc_serverinfo:
CL_ParseServerInfo ();
- vid.recalc_refdef = true; // leave intermission full screen
break;
-
+
case svc_setangle:
for (i=0 ; i<3 ; i++)
cl.viewangles[i] = MSG_ReadAngle ();
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");
+ Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES");
strncpy (cl_lightstyle[i].map, MSG_ReadString(), MAX_STYLESTRING - 1);
cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
break;
-
+
case svc_sound:
- CL_ParseStartSoundPacket();
+ CL_ParseStartSoundPacket(false);
break;
-
+
+ case svc_sound2:
+ CL_ParseStartSoundPacket(true);
+ break;
+
case svc_stopsound:
i = MSG_ReadShort();
S_StopSound(i>>3, i&7);
break;
-
+
case svc_updatename:
i = MSG_ReadByte ();
if (i >= cl.maxclients)
- Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD");
+ Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients");
strcpy (cl.scores[i].name, MSG_ReadString ());
break;
-
+
case svc_updatefrags:
i = MSG_ReadByte ();
if (i >= cl.maxclients)
- Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD");
+ Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients");
cl.scores[i].frags = MSG_ReadShort ();
- break;
+ break;
case svc_updatecolors:
i = MSG_ReadByte ();
if (i >= cl.maxclients)
- Host_Error ("CL_ParseServerMessage: svc_updatecolors >= MAX_SCOREBOARD");
+ Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients");
cl.scores[i].colors = MSG_ReadByte ();
break;
-
+
case svc_particle:
- R_ParseParticleEffect ();
+ CL_ParseParticleEffect ();
+ break;
+
+ case svc_effect:
+ CL_ParseEffect ();
+ break;
+
+ case svc_effect2:
+ CL_ParseEffect2 ();
break;
case svc_spawnbaseline:
i = MSG_ReadShort ();
- // must use CL_EntityNum() to force cl.num_entities up
- CL_ParseBaseline (CL_EntityNum(i));
+ 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 ();
+ 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 ();
- break;
+ CL_ParseStatic (false);
+ break;
+ case svc_spawnstatic2:
+ CL_ParseStatic (true);
+ break;
case svc_temp_entity:
- CL_ParseTEnt ();
+ CL_ParseTempEntity ();
break;
case svc_setpause:
else
CDAudio_Resume ();
break;
-
+
case svc_signonnum:
i = MSG_ReadByte ();
if (i <= cls.signon)
Host_Error ("svc_updatestat: %i is invalid", i);
cl.stats[i] = MSG_ReadLong ();
break;
-
+
case svc_spawnstaticsound:
- CL_ParseStaticSound ();
+ CL_ParseStaticSound (false);
+ break;
+
+ case svc_spawnstaticsound2:
+ CL_ParseStaticSound (true);
break;
case svc_cdtrack:
cl.cdtrack = MSG_ReadByte ();
cl.looptrack = MSG_ReadByte ();
if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) )
- CDAudio_Play ((byte)cls.forcetrack, true);
+ CDAudio_Play ((qbyte)cls.forcetrack, true);
else
- CDAudio_Play ((byte)cl.cdtrack, true);
+ CDAudio_Play ((qbyte)cl.cdtrack, true);
break;
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 ());
+ 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 ());
+ SCR_CenterPrint (MSG_ReadString ());
break;
case svc_sellscreen:
case svc_showlmp:
SHOWLMP_decodeshow();
break;
- // LordHavoc: extra worldspawn fields (fog, sky, farclip)
case svc_skybox:
R_SetSkyBox(MSG_ReadString());
break;
- case svc_farclip:
- r_farclip.value = MSG_ReadCoord();
+ case svc_cgame:
+ {
+ int length;
+ length = (int) ((unsigned short) MSG_ReadShort());
+ for (i = 0;i < length;i++)
+ cgamenetbuffer[i] = MSG_ReadByte();
+ if (!msg_badread)
+ CL_CGVM_ParseNetwork(cgamenetbuffer, length);
+ }
break;
- case svc_fog:
- if (MSG_ReadByte())
+ case svc_entities:
+ if (cls.signon == SIGNONS - 1)
{
- fog_density = MSG_ReadShort() * (1.0f / 4096.0f);
- fog_red = MSG_ReadByte() * (1.0 / 255.0);
- fog_green = MSG_ReadByte() * (1.0 / 255.0);
- fog_blue = MSG_ReadByte() * (1.0 / 255.0);
+ // first update is the final signon stage
+ cls.signon = SIGNONS;
+ CL_SignonReply ();
}
- else
- fog_density = 0.0f;
+ CL_ReadEntityFrame();
break;
}
}
+
+ if (entitiesupdated)
+ CL_EntityUpdateEnd();
+
+ parsingerror = false;
}
+void CL_Parse_DumpPacket(void)
+{
+ if (!parsingerror)
+ return;
+ Con_Printf("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);
+}
projects / xonotic / darkplaces.git / blobdiff