// cl_parse.c -- parse a message received from the server
#include "quakedef.h"
+#include "cdaudio.h"
#include "cl_collision.h"
char *svc_strings[128] =
"svc_nop",
"svc_disconnect",
"svc_updatestat",
- "svc_version", // [long] server version
+ "svc_version", // [int] server version
"svc_setview", // [short] entity number
"svc_sound", // <see code>
"svc_time", // [float] server time
// the string should be \n terminated
"svc_setangle", // [vec3] set the view angle to this absolute value
- "svc_serverinfo", // [long] version
+ "svc_serverinfo", // [int] version
// [string] signon string
// [string]..[0]model cache [string]...[0]sounds cache
// [string]..[0]item cache
"", // 48
"", // 49
"svc_cgame", // 50 // [short] length [bytes] data
- "svc_unusedlh1", // 51 // unused
+ "svc_updatestatubyte", // 51 // [byte] stat [byte] value
"svc_effect", // 52 // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
"svc_effect2", // 53 // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
"svc_sound2", // 54 // short soundindex instead of byte
cvar_t demo_nehahra = {0, "demo_nehahra", "0"};
cvar_t developer_networkentities = {0, "developer_networkentities", "0"};
-mempool_t *cl_scores_mempool;
-
/*
==================
CL_ParseStartSoundPacket
int volume;
int field_mask;
float attenuation;
- int i;
field_mask = MSG_ReadByte();
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);
+ MSG_ReadVector(pos, cl.protocol);
+ if (sound_num >= MAX_SOUNDS)
+ {
+ Con_Printf("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS);
+ return;
+ }
if (ent >= MAX_EDICTS)
- Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent);
-
- MSG_ReadVector(pos);
+ {
+ Con_Printf("CL_ParseStartSoundPacket: ent = %i", ent);
+ return;
+ }
- 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.0f, attenuation);
}
/*
lastmsg = time;
// write out a nop
// LordHavoc: must use unreliable because reliable could kill the sigon message!
- Con_Printf("--> client to server keepalive\n");
+ 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);
}
}
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;
{
//char str[8192];
-Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
+Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
switch (cls.signon)
{
case 2:
MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string));
+ MSG_WriteString (&cls.message, va("name \"%s\"", 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));
+ MSG_WriteString (&cls.message, va("color %i %i", cl_color.integer >> 4, cl_color.integer & 15));
if (cl_pmodel.integer)
{
MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer));
+ MSG_WriteString (&cls.message, va("pmodel %i", cl_pmodel.integer));
+ }
+ if (*cl_playermodel.string)
+ {
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, va("playermodel %s", cl_playermodel.string));
+ }
+ if (*cl_playerskin.string)
+ {
+ MSG_WriteByte (&cls.message, clc_stringcmd);
+ MSG_WriteString (&cls.message, va("playerskin %s", cl_playerskin.string));
}
MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer));
+ MSG_WriteString (&cls.message, va("rate %i", cl_rate.integer));
MSG_WriteByte (&cls.message, clc_stringcmd);
MSG_WriteString (&cls.message, "spawn");
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];
{
char *str;
int i;
+ protocolversion_t protocol;
int nummodels, numsounds;
entity_t *ent;
- Con_DPrintf ("Serverinfo packet received.\n");
+ Con_DPrint("Serverinfo packet received.\n");
+
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+
//
// wipe the client_state_t struct
//
// parse protocol version number
i = MSG_ReadLong ();
- // 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)
+ protocol = Protocol_EnumForNumber(i);
+ if (protocol == PROTOCOL_UNKNOWN)
{
- 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);
+ Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)\n", i);
return;
}
- cl.protocol = i;
+ // hack for unmarked Nehahra movie demos which had a custom protocol
+ if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer)
+ protocol = PROTOCOL_NEHAHRAMOVIE;
+ cl.protocol = protocol;
+ Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cl.protocol));
// parse maxclients
cl.maxclients = MSG_ReadByte ();
if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD)
{
- Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients);
+ Host_Error("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));
+ cl.scores = (scoreboard_t *)Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores));
// parse gametype
cl.gametype = MSG_ReadByte ();
// seperate the printfs so the server message can have a color
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");
- Con_Printf("%c%s\n", 2, str);
- }
+ 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();
+ S_StopAllSounds();
+ // if server is active, we already began a loading plaque
+ if (!sv.active)
+ SCR_BeginLoadingPlaque();
+
// disable until we get textures for it
R_ResetSkyBox();
// anything that isn't needed
Mod_ClearUsed();
for (i = 1;i < nummodels;i++)
- {
- CL_KeepaliveMessage();
- Mod_TouchModel(parse_model_precache[i]);
- }
+ Mod_FindName(parse_model_precache[i]);
+ // precache any models used by the client (this also marks them used)
+ cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false);
+ cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false);
+ cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false);
+ cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false);
Mod_PurgeUnused();
// do the same for sounds
- S_ClearUsed();
- for (i = 1;i < numsounds;i++)
- {
- CL_KeepaliveMessage();
- S_TouchSound(parse_sound_precache[i]);
- }
- S_PurgeUnused();
+ // FIXME: S_ServerSounds does not know about cl.sfx_ sounds
+ S_ServerSounds (parse_sound_precache, numsounds);
+
+ // precache any sounds used by the client
+ cl.sfx_wizhit = S_PrecacheSound("sound/wizard/hit.wav", false, true);
+ cl.sfx_knighthit = S_PrecacheSound("sound/hknight/hit.wav", false, true);
+ cl.sfx_tink1 = S_PrecacheSound("sound/weapons/tink1.wav", false, true);
+ cl.sfx_ric1 = S_PrecacheSound("sound/weapons/ric1.wav", false, true);
+ cl.sfx_ric2 = S_PrecacheSound("sound/weapons/ric2.wav", false, true);
+ cl.sfx_ric3 = S_PrecacheSound("sound/weapons/ric3.wav", false, true);
+ cl.sfx_r_exp3 = S_PrecacheSound("sound/weapons/r_exp3.wav", false, true);
// now we try to load everything that is new
for (i=1 ; i<numsounds ; i++)
{
CL_KeepaliveMessage();
- cl.sound_precache[i] = S_PrecacheSound(parse_sound_precache[i], true);
+
+ // Don't lock the sfx here, S_ServerSounds already did that
+ cl.sound_precache[i] = S_PrecacheSound (parse_sound_precache[i], true, false);
}
// local state
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.colormap = -1; // no special coloring
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);
cl_num_entities = 1;
Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS);
// colormap is client index + 1
- if (s->colormap > cl.maxclients)
- Host_Error ("CL_ValidateState: colormap (%i) > cl.maxclients (%i)", s->colormap, cl.maxclients);
+ if ((!s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients)
+ {
+ Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients);
+ s->colormap = 0;
+ }
model = cl.model_precache[s->modelindex];
Mod_CheckLoaded(model);
- if (model && s->frame >= model->numframes)
+ if (model && model->type && s->frame >= model->numframes)
{
- Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
+ Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
s->frame = 0;
}
- if (model && s->skin > 0 && s->skin >= model->numskins)
+ if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
{
- Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+ Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins);
s->skin = 0;
}
}
void CL_MoveLerpEntityStates(entity_t *ent)
{
float odelta[3], adelta[3];
+ CL_ValidateState(&ent->state_current);
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)
+ if (!ent->state_previous.active || ent->state_previous.modelindex != ent->state_current.modelindex)
{
- // we definitely shouldn't lerp
+ // reset all persistent stuff if this is a new entity
+ 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);
+ // reset animation interpolation as well
+ ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
+ ent->render.frame1time = ent->render.frame2time = cl.time;
+ ent->render.framelerp = 1;
+ // reset various persistent stuff
+ ent->persistent.muzzleflash = 0;
+ VectorCopy(ent->state_current.origin, ent->persistent.trail_origin);
+ }
+ else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000)
+ {
+ // don't interpolate the move
ent->persistent.lerpdeltatime = 0;
ent->persistent.lerpstarttime = cl.mtime[1];
VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
else
{
// not a monster
- ent->persistent.lerpstarttime = cl.mtime[1];
+ ent->persistent.lerpstarttime = ent->state_previous.time;
// no lerp if it's singleplayer
if (cl.islocalgame)
ent->persistent.lerpdeltatime = 0;
else
- ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
+ ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1);
VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
}
}
-/*
-==================
-CL_ParseUpdate
-
-Parse an entity update message from the server
-If an entities model or origin changes from frame to frame, it must be
-relinked. Other attributes can change without relinking.
-==================
-*/
-void CL_ParseUpdate (int bits)
-{
- int num;
- entity_t *ent;
- entity_state_t new;
-
- if (bits & U_MOREBITS)
- bits |= (MSG_ReadByte()<<8);
- if ((bits & U_EXTEND1) && cl.protocol != PROTOCOL_NEHAHRAMOVIE)
- {
- bits |= MSG_ReadByte() << 16;
- if (bits & U_EXTEND2)
- bits |= MSG_ReadByte() << 24;
- }
-
- if (bits & U_LONGENTITY)
- num = (unsigned) MSG_ReadShort ();
- else
- num = (unsigned) MSG_ReadByte ();
-
- 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);
-
- ent = cl_entities + num;
-
- // 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;
- else
- {
- new = ent->state_baseline;
- new.active = true;
- }
-
- 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 (cl.protocol == PROTOCOL_NEHAHRAMOVIE && (bits & U_EXTEND1))
- {
- // 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
- new.alpha = j;
- }
-
- if (new.active)
- CL_ValidateState(&new);
-
- ent->state_previous = ent->state_current;
- ent->state_current = new;
- if (ent->state_current.active)
- {
- CL_MoveLerpEntityStates(ent);
- cl_entities_active[ent->state_current.number] = true;
- // mark as visible (no kill this frame)
- entlife[ent->state_current.number] = 2;
- }
-}
-
-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)
- {
- 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
- {
- if (!cl.entitydatabase4)
- cl.entitydatabase4 = EntityFrame4_AllocDatabase(cl_entities_mempool);
- EntityFrame4_CL_ReadFrame(cl.entitydatabase4);
- }
-}
-
-void CL_EntityUpdateSetup(void)
-{
-}
-
-void CL_EntityUpdateEnd(void)
-{
- 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;
- }
- }
- }
-}
-
/*
==================
CL_ParseBaseline
{
int i;
- ClearStateToDefault(&ent->state_baseline);
+ ent->state_baseline = defaultstate;
+ // FIXME: set ent->state_baseline.number?
ent->state_baseline.active = true;
if (large)
{
ent->state_baseline.skin = MSG_ReadByte();
for (i = 0;i < 3;i++)
{
- ent->state_baseline.origin[i] = MSG_ReadCoord ();
- ent->state_baseline.angles[i] = MSG_ReadAngle ();
+ ent->state_baseline.origin[i] = MSG_ReadCoord(cl.protocol);
+ ent->state_baseline.angles[i] = MSG_ReadAngle(cl.protocol);
}
CL_ValidateState(&ent->state_baseline);
ent->state_previous = ent->state_current = ent->state_baseline;
Server information pertaining to this client only
==================
*/
-void CL_ParseClientdata (int bits)
+void CL_ParseClientdata (void)
{
- int i, j;
+ int i, j, bits;
+
+ VectorCopy (cl.mpunchangle[0], cl.mpunchangle[1]);
+ VectorCopy (cl.mpunchvector[0], cl.mpunchvector[1]);
+ VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
+ cl.mviewzoom[1] = cl.mviewzoom[0];
- bits &= 0xFFFF;
+ if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
+ {
+ cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT;
+ cl.stats[STAT_ITEMS] = 0;
+ cl.stats[STAT_VIEWZOOM] = 255;
+ }
+ cl.idealpitch = 0;
+ cl.mpunchangle[0][0] = 0;
+ cl.mpunchangle[0][1] = 0;
+ cl.mpunchangle[0][2] = 0;
+ cl.mpunchvector[0][0] = 0;
+ cl.mpunchvector[0][1] = 0;
+ cl.mpunchvector[0][2] = 0;
+ cl.mvelocity[0][0] = 0;
+ cl.mvelocity[0][1] = 0;
+ cl.mvelocity[0][2] = 0;
+ cl.mviewzoom[0] = 1;
+
+ bits = (unsigned short) MSG_ReadShort ();
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.viewheight = DEFAULT_VIEWHEIGHT;
+ cl.stats[STAT_VIEWHEIGHT] = MSG_ReadChar ();
if (bits & SU_IDEALPITCH)
cl.idealpitch = MSG_ReadChar ();
- else
- cl.idealpitch = 0;
- VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
- if (cl.protocol == PROTOCOL_DARKPLACES5)
+ for (i = 0;i < 3;i++)
{
- for (i = 0;i < 3;i++)
+ if (bits & (SU_PUNCH1<<i) )
{
- if (bits & (SU_PUNCH1<<i) )
- cl.punchangle[i] = MSG_ReadPreciseAngle();
- else
- cl.punchangle[i] = 0;
- if (bits & (SU_PUNCHVEC1<<i))
- cl.punchvector[i] = MSG_ReadFloat();
+ if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE)
+ cl.mpunchangle[0][i] = MSG_ReadChar();
else
- cl.punchvector[i] = 0;
- if (bits & (SU_VELOCITY1<<i) )
- cl.mvelocity[0][i] = MSG_ReadFloat();
- else
- cl.mvelocity[0][i] = 0;
+ cl.mpunchangle[0][i] = MSG_ReadAngle16i();
}
- }
- else
- {
- for (i = 0;i < 3;i++)
+ if (bits & (SU_PUNCHVEC1<<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();
+ if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+ cl.mpunchvector[0][i] = MSG_ReadCoord16i();
else
- cl.punchvector[i] = 0;
- if (bits & (SU_VELOCITY1<<i) )
+ cl.mpunchvector[0][i] = MSG_ReadCoord32f();
+ }
+ if (bits & (SU_VELOCITY1<<i) )
+ {
+ if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
cl.mvelocity[0][i] = MSG_ReadChar()*16;
else
- cl.mvelocity[0][i] = 0;
+ cl.mvelocity[0][i] = MSG_ReadCoord32f();
}
}
- i = MSG_ReadLong ();
- if (cl.items != i)
- { // set flash times
- for (j=0 ; j<32 ; j++)
- if ( (i & (1<<j)) && !(cl.items & (1<<j)))
- cl.item_gettime[j] = cl.time;
- cl.items = i;
- }
+ // LordHavoc: hipnotic demos don't have this bit set but should
+ if (bits & SU_ITEMS || cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
+ cl.stats[STAT_ITEMS] = MSG_ReadLong ();
cl.onground = (bits & SU_ONGROUND) != 0;
cl.inwater = (bits & SU_INWATER) != 0;
- cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadByte() : 0;
- cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadByte() : 0;
- cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
- cl.stats[STAT_HEALTH] = MSG_ReadShort();
- cl.stats[STAT_AMMO] = MSG_ReadByte();
+ if (cl.protocol == PROTOCOL_DARKPLACES5)
+ {
+ cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadShort() : 0;
+ cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadShort() : 0;
+ cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadShort() : 0;
+ cl.stats[STAT_HEALTH] = MSG_ReadShort();
+ cl.stats[STAT_AMMO] = MSG_ReadShort();
+ cl.stats[STAT_SHELLS] = MSG_ReadShort();
+ cl.stats[STAT_NAILS] = MSG_ReadShort();
+ cl.stats[STAT_ROCKETS] = MSG_ReadShort();
+ cl.stats[STAT_CELLS] = MSG_ReadShort();
+ cl.stats[STAT_ACTIVEWEAPON] = (unsigned short) MSG_ReadShort ();
+ }
+ else if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+ {
+ cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_HEALTH] = MSG_ReadShort();
+ cl.stats[STAT_AMMO] = MSG_ReadByte();
+ cl.stats[STAT_SHELLS] = MSG_ReadByte();
+ cl.stats[STAT_NAILS] = MSG_ReadByte();
+ cl.stats[STAT_ROCKETS] = MSG_ReadByte();
+ cl.stats[STAT_CELLS] = MSG_ReadByte();
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+ cl.stats[STAT_ACTIVEWEAPON] = (1<<MSG_ReadByte ());
+ else
+ cl.stats[STAT_ACTIVEWEAPON] = MSG_ReadByte ();
+ }
+
+ if (bits & SU_VIEWZOOM)
+ {
+ if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+ cl.stats[STAT_VIEWZOOM] = MSG_ReadByte();
+ else
+ cl.stats[STAT_VIEWZOOM] = (unsigned short) MSG_ReadShort();
+ }
- cl.stats[STAT_SHELLS] = MSG_ReadByte();
- cl.stats[STAT_NAILS] = MSG_ReadByte();
- cl.stats[STAT_ROCKETS] = MSG_ReadByte();
- cl.stats[STAT_CELLS] = MSG_ReadByte();
+ // check for important changes
- i = MSG_ReadByte ();
+ // set flash times
+ if (cl.olditems != cl.stats[STAT_ITEMS])
+ for (j = 0;j < 32;j++)
+ if ((cl.stats[STAT_ITEMS] & (1<<j)) && !(cl.olditems & (1<<j)))
+ cl.item_gettime[j] = cl.time;
+ cl.olditems = cl.stats[STAT_ITEMS];
- if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
- 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)
+ if (cl.activeweapon != cl.stats[STAT_ACTIVEWEAPON])
cl.weapontime = cl.time;
- 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.viewzoomnew = 1;
+ cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON];
+ // viewzoom interpolation
+ cl.mviewzoom[0] = (float) max(cl.stats[STAT_VIEWZOOM], 2) * (1.0f / 255.0f);
}
/*
vec3_t org;
int sound_num, vol, atten;
- MSG_ReadVector(org);
+ MSG_ReadVector(org, cl.protocol);
if (large)
sound_num = (unsigned short) MSG_ReadShort ();
else
vol = MSG_ReadByte ();
atten = MSG_ReadByte ();
- S_StaticSound (cl.sound_precache[sound_num], org, vol, atten);
+ S_StaticSound (cl.sound_precache[sound_num], org, vol/255.0f, atten);
}
void CL_ParseEffect (void)
vec3_t org;
int modelindex, startframe, framecount, framerate;
- MSG_ReadVector(org);
+ MSG_ReadVector(org, cl.protocol);
modelindex = MSG_ReadByte ();
startframe = MSG_ReadByte ();
framecount = MSG_ReadByte ();
vec3_t org;
int modelindex, startframe, framecount, framerate;
- MSG_ReadVector(org);
- modelindex = MSG_ReadShort ();
- startframe = MSG_ReadShort ();
+ MSG_ReadVector(org, cl.protocol);
+ modelindex = (unsigned short) MSG_ReadShort ();
+ startframe = (unsigned short) 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);
+ ent = (unsigned short) MSG_ReadShort ();
+ MSG_ReadVector(start, cl.protocol);
+ MSG_ReadVector(end, cl.protocol);
if (ent >= MAX_EDICTS)
{
ent = 0;
}
+ if (ent >= cl_max_entities)
+ CL_ExpandEntities(ent);
+
// override any beam with the same entity
for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
{
- if (b->entity == ent)
+ if (b->entity == ent && ent)
{
//b->entity = ent;
b->lightning = lightning;
return;
}
}
- Con_Printf ("beam list overflow!\n");
+ Con_Print("beam list overflow!\n");
}
void CL_ParseTempEntity(void)
{
case TE_WIZSPIKE:
// spike hitting wall
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 150, 0.25f, 1.00f, 0.25f, 250, 0.2, 0, 0, false, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
CL_RunParticleEffect(pos, vec3_origin, 20, 30);
- S_StartSound(-1, 0, cl_sfx_wizhit, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1);
break;
case TE_KNIGHTSPIKE:
// spike hitting wall
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 150, 1.0f, 0.60f, 0.20f, 250, 0.2, 0, 0, false, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
CL_RunParticleEffect(pos, vec3_origin, 226, 20);
- S_StartSound(-1, 0, cl_sfx_knighthit, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1);
break;
case TE_SPIKE:
// spike hitting wall
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to spark shower
- CL_SparkShower(pos, vec3_origin, 15);
+ if (cl_particles_bulletimpacts.integer)
+ {
+ CL_SparkShower(pos, vec3_origin, 15, 1);
+ CL_Smoke(pos, vec3_origin, 15);
+ CL_BulletMark(pos);
+ }
if (rand() % 5)
- S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
+ 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);
+ S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
else if (rnd == 2)
- S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
else
- S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
}
break;
case TE_SPIKEQUAD:
// quad spike hitting wall
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
// LordHavoc: changed to spark shower
- CL_SparkShower(pos, vec3_origin, 15);
+ if (cl_particles_bulletimpacts.integer)
+ {
+ CL_SparkShower(pos, vec3_origin, 15, 1);
+ CL_Smoke(pos, vec3_origin, 15);
+ CL_BulletMark(pos);
+ }
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
if (rand() % 5)
- S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
+ 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);
+ S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
else if (rnd == 2)
- S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
else
- S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
}
break;
case TE_SUPERSPIKE:
// super spike hitting wall
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
// LordHavoc: changed to dust shower
- CL_SparkShower(pos, vec3_origin, 30);
+ if (cl_particles_bulletimpacts.integer)
+ {
+ CL_SparkShower(pos, vec3_origin, 30, 1);
+ CL_Smoke(pos, vec3_origin, 30);
+ CL_BulletMark(pos);
+ }
if (rand() % 5)
- S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
+ 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);
+ S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
else if (rnd == 2)
- S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
else
- S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
}
break;
case TE_SUPERSPIKEQUAD:
// quad super spike hitting wall
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
// LordHavoc: changed to dust shower
- CL_SparkShower(pos, vec3_origin, 30);
+ if (cl_particles_bulletimpacts.integer)
+ {
+ CL_SparkShower(pos, vec3_origin, 30, 1);
+ CL_Smoke(pos, vec3_origin, 30);
+ CL_BulletMark(pos);
+ }
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2, 0, 0, true, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
if (rand() % 5)
- S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
+ 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);
+ S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
else if (rnd == 2)
- S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
+ S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
else
- S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
+ 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);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
dir[0] = MSG_ReadChar();
dir[1] = MSG_ReadChar();
break;
case TE_SPARK:
// spark shower
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
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);
+ CL_SparkShower(pos, dir, count, 1);
break;
case TE_PLASMABURN:
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
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_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
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
+ MSG_ReadVector(pos, cl.protocol); // mins
+ MSG_ReadVector(pos2, cl.protocol); // maxs
+ velspeed = MSG_ReadCoord(cl.protocol); // speed
+ count = (unsigned short) 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
+ MSG_ReadVector(pos, cl.protocol); // mins
+ MSG_ReadVector(pos2, cl.protocol); // maxs
+ MSG_ReadVector(dir, cl.protocol); // dir
+ count = (unsigned short) MSG_ReadShort(); // number of particles
colorStart = MSG_ReadByte(); // color
colorLength = MSG_ReadByte(); // gravity (1 or 0)
- velspeed = MSG_ReadCoord(); // randomvel
+ velspeed = MSG_ReadCoord(cl.protocol); // 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
+ MSG_ReadVector(pos, cl.protocol); // mins
+ MSG_ReadVector(pos2, cl.protocol); // maxs
+ MSG_ReadVector(dir, cl.protocol); // dir
+ count = (unsigned short) 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
+ MSG_ReadVector(pos, cl.protocol); // mins
+ MSG_ReadVector(pos2, cl.protocol); // maxs
+ MSG_ReadVector(dir, cl.protocol); // dir
+ count = (unsigned short) 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);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to dust shower
- CL_SparkShower(pos, vec3_origin, 15);
+ CL_SparkShower(pos, vec3_origin, 15, 1);
+ CL_Smoke(pos, vec3_origin, 15);
+ CL_BulletMark(pos);
break;
case TE_GUNSHOTQUAD:
// quad bullet hitting wall
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- CL_SparkShower(pos, vec3_origin, 15);
+ CL_SparkShower(pos, vec3_origin, 15, 1);
+ CL_Smoke(pos, vec3_origin, 15);
+ CL_BulletMark(pos);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2, 0, 0, true, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
break;
case TE_EXPLOSION:
// rocket explosion
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
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, 1.25f, 1.0f, 0.5f, 700, 0.5, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ if (gamemode != GAME_NEXUIZ)
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_EXPLOSIONQUAD:
// quad rocket explosion
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
CL_ParticleExplosion(pos);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ if (gamemode != GAME_NEXUIZ)
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_EXPLOSION3:
// Nehahra movie colored lighting explosion
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
CL_ParticleExplosion(pos);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ color[0] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f);
+ color[1] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f);
+ color[2] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f);
+ CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ if (gamemode != GAME_NEXUIZ)
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_EXPLOSIONRGB:
// colored lighting explosion
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
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);
+ 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);
+ CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ if (gamemode != GAME_NEXUIZ)
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_TAREXPLOSION:
// tarbaby explosion
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
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);
+ if (gamemode != GAME_NEXUIZ)
+ 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, 0.8f, 0.4f, 1.0f, 1200, 0.5, 0, 0, true, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
break;
case TE_SMALLFLASH:
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
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_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
break;
case TE_CUSTOMFLASH:
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- radius = MSG_ReadByte() * 8;
+ radius = (MSG_ReadByte() + 1) * 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);
+ 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);
+ CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
break;
case TE_FLAMEJET:
- MSG_ReadVector(pos);
- MSG_ReadVector(dir);
+ MSG_ReadVector(pos, cl.protocol);
+ MSG_ReadVector(dir, cl.protocol);
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);
+ 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);
+ 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);
+ 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);
+ CL_ParseBeam(cl.model_beam, false);
break;
// PGM 01/21/97
break;
case TE_LAVASPLASH:
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_LavaSplash(pos);
break;
case TE_TELEPORT:
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
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);
+ CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_TeleportSplash(pos);
break;
case TE_EXPLOSION2:
// color mapped explosion
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
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, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ if (gamemode != GAME_NEXUIZ)
+ 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);
+ MSG_ReadVector(pos, cl.protocol);
+ MSG_ReadVector(pos2, cl.protocol);
+ MSG_ReadVector(dir, cl.protocol);
+ CL_BeamParticle(pos, pos2, 8, 1, 1, 1, 1, 1);
break;
case TE_TEI_SMOKE:
- MSG_ReadVector(pos);
- MSG_ReadVector(dir);
+ MSG_ReadVector(pos, cl.protocol);
+ MSG_ReadVector(dir, cl.protocol);
count = MSG_ReadByte();
CL_FindNonSolidLocation(pos, pos, 4);
CL_Tei_Smoke(pos, dir, count);
break;
case TE_TEI_BIGEXPLOSION:
- MSG_ReadVector(pos);
+ MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
CL_ParticleExplosion(pos);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 500, 1.25f, 1.0f, 0.5f, 500, 9999, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ if (gamemode != GAME_NEXUIZ)
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_TEI_PLASMAHIT:
- MSG_ReadVector(pos);
- MSG_ReadVector(dir);
+ MSG_ReadVector(pos, cl.protocol);
+ MSG_ReadVector(dir, cl.protocol);
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.3, 0.6, 1.0f, 2000, 9999, 0, 0, true, 1);
+ CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
break;
default:
}
}
-#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
+#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x);
static qbyte cgamenetbuffer[65536];
void CL_ParseServerMessage(void)
{
int cmd;
- int i, entitiesupdated;
+ int i;
+ protocolversion_t protocol;
qbyte cmdlog[32];
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
+ qboolean sendmove = false;
if (cls.demorecording)
CL_WriteDemoMessage ();
// if recording demos, copy the message out
//
if (cl_shownet.integer == 1)
- Con_Printf ("%f %i\n", realtime, 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
//
//
//MSG_BeginReading ();
- entitiesupdated = false;
-
parsingerror = true;
while (1)
cls.signon = SIGNONS;
CL_SignonReply ();
}
- CL_ParseUpdate (cmd&127);
+ EntityFrameQuake_ReadEntity (cmd&127);
continue;
}
i &= 31;
while(count > 0)
{
- snprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
+ dpsnprintf (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_Printf("<-- server to client keepalive\n");
+ Con_Print("<-- 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 ();
+ sendmove = true;
break;
case svc_clientdata:
- i = MSG_ReadShort ();
- CL_ParseClientdata (i);
+ CL_ParseClientdata();
break;
case svc_version:
i = MSG_ReadLong ();
+ protocol = Protocol_EnumForNumber(i);
+ if (protocol == PROTOCOL_UNKNOWN)
+ Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)\n", i);
// 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;
+ if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer)
+ protocol = PROTOCOL_NEHAHRAMOVIE;
+ cl.protocol = protocol;
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:
case svc_setangle:
for (i=0 ; i<3 ; i++)
- cl.viewangles[i] = MSG_ReadAngle ();
+ cl.viewangles[i] = MSG_ReadAngle (cl.protocol);
break;
case svc_setview:
cl.viewentity = (unsigned short)MSG_ReadShort ();
if (cl.viewentity >= MAX_EDICTS)
Host_Error("svc_setview >= MAX_EDICTS\n");
+ if (cl.viewentity >= cl_max_entities)
+ CL_ExpandEntities(cl.viewentity);
// LordHavoc: assume first setview recieved is the real player entity
if (!cl.playerentity)
cl.playerentity = cl.viewentity;
Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES");
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);
+ cl_lightstyle[i].length = (int)strlen(cl_lightstyle[i].map);
break;
case svc_sound:
CL_ParseStartSoundPacket(false);
break;
- case svc_sound2:
- CL_ParseStartSoundPacket(true);
+ case svc_precache:
+ if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+ {
+ // was svc_sound2 in protocols 1, 2, 3, removed in 4, 5, changed to svc_precache in 6
+ CL_ParseStartSoundPacket(true);
+ }
+ else
+ {
+ int i = (unsigned short)MSG_ReadShort();
+ char *s = MSG_ReadString();
+ if (i < 32768)
+ {
+ if (i >= 1 && i < MAX_MODELS)
+ {
+ model_t *model = Mod_ForName(s, false, false, i == 1);
+ if (!model)
+ Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
+ cl.model_precache[i] = model;
+ }
+ else
+ Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_MODELS);
+ }
+ else
+ {
+ i -= 32768;
+ if (i >= 1 && i < MAX_SOUNDS)
+ {
+ sfx_t *sfx = S_PrecacheSound (s, true, false);
+ if (!sfx && snd_initialized.integer)
+ Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
+ cl.sound_precache[i] = sfx;
+ }
+ else
+ Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_SOUNDS);
+ }
+ }
break;
case svc_stopsound:
- i = MSG_ReadShort();
+ i = (unsigned short) MSG_ReadShort();
S_StopSound(i>>3, i&7);
break;
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients");
- cl.scores[i].frags = MSG_ReadShort ();
+ cl.scores[i].frags = (signed short) MSG_ReadShort ();
break;
case svc_updatecolors:
break;
case svc_spawnbaseline:
- i = MSG_ReadShort ();
+ i = (unsigned short) MSG_ReadShort ();
if (i < 0 || i >= MAX_EDICTS)
Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i);
+ if (i >= cl_max_entities)
+ CL_ExpandEntities(i);
CL_ParseBaseline (cl_entities + i, false);
break;
case svc_spawnbaseline2:
- i = MSG_ReadShort ();
+ i = (unsigned short) MSG_ReadShort ();
if (i < 0 || i >= MAX_EDICTS)
Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i);
+ if (i >= cl_max_entities)
+ CL_ExpandEntities(i);
CL_ParseBaseline (cl_entities + i, true);
break;
case svc_spawnstatic:
CDAudio_Pause ();
else
CDAudio_Resume ();
+ S_PauseGameSounds (cl.paused);
break;
case svc_signonnum:
i = MSG_ReadByte ();
- if (i <= cls.signon)
+ // LordHavoc: it's rude to kick off the client if they missed the
+ // reconnect somehow, so allow signon 1 even if at signon 1
+ if (i <= cls.signon && i != 1)
Host_Error ("Received signon %i when at %i", i, cls.signon);
cls.signon = i;
CL_SignonReply ();
cl.stats[i] = MSG_ReadLong ();
break;
+ case svc_updatestatubyte:
+ i = MSG_ReadByte ();
+ if (i < 0 || i >= MAX_CL_STATS)
+ Host_Error ("svc_updatestat: %i is invalid", i);
+ cl.stats[i] = MSG_ReadByte ();
+ break;
+
case svc_spawnstaticsound:
CL_ParseStaticSound (false);
break;
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:
if (gamemode == GAME_TENEBRAE)
{
// repeating particle effect
- MSG_ReadCoord();
- MSG_ReadCoord();
- MSG_ReadCoord();
- MSG_ReadCoord();
- MSG_ReadCoord();
- MSG_ReadCoord();
+ MSG_ReadCoord(cl.protocol);
+ MSG_ReadCoord(cl.protocol);
+ MSG_ReadCoord(cl.protocol);
+ MSG_ReadCoord(cl.protocol);
+ MSG_ReadCoord(cl.protocol);
+ MSG_ReadCoord(cl.protocol);
MSG_ReadByte();
MSG_ReadLong();
MSG_ReadLong();
if (gamemode == GAME_TENEBRAE)
{
// particle effect
- MSG_ReadCoord();
- MSG_ReadCoord();
- MSG_ReadCoord();
+ MSG_ReadCoord(cl.protocol);
+ MSG_ReadCoord(cl.protocol);
+ MSG_ReadCoord(cl.protocol);
MSG_ReadByte();
MSG_ReadString();
}
cls.signon = SIGNONS;
CL_SignonReply ();
}
- CL_ReadEntityFrame();
+ if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+ EntityFrame_CL_ReadFrame();
+ else if (cl.protocol == PROTOCOL_DARKPLACES4)
+ EntityFrame4_CL_ReadFrame();
+ else
+ EntityFrame5_CL_ReadFrame();
break;
}
}
- if (entitiesupdated)
- CL_EntityUpdateEnd();
+ EntityFrameQuake_ISeeDeadEntities();
+
+ if (sendmove)
+ {
+ // send one move per server frame
+ CL_SendMove();
+ }
parsingerror = false;
}
{
if (!parsingerror)
return;
- Con_Printf("Packet dump:\n");
+ 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);
}
+
+void CL_Parse_Shutdown(void)
+{
+}
projects / xonotic / darkplaces.git / blobdiff