// cl_parse.c -- parse a message received from the server
#include "quakedef.h"
+#include "cdaudio.h"
#include "cl_collision.h"
+#include "csprogs.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
"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_csqcentities", // 58 // [short] entnum [variable length] entitydata ... [short] 0x0000
"svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten
};
//=============================================================================
-cvar_t demo_nehahra = {0, "demo_nehahra", "0"};
-cvar_t developer_networkentities = {0, "developer_networkentities", "0"};
-
-mempool_t *cl_scores_mempool;
+cvar_t demo_nehahra = {0, "demo_nehahra", "0", "reads all quake demos as nehahra movie protocol"};
+cvar_t developer_networkentities = {0, "developer_networkentities", "0", "prints received entities, value is 0-4 (higher for more info)"};
/*
==================
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, cl.protocol);
+ {
+ 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);
}
/*
==================
*/
-static qbyte olddata[NET_MAXMESSAGE];
+static unsigned char olddata[NET_MAXMESSAGE];
void CL_KeepaliveMessage (void)
{
float time;
- static float lastmsg;
+ static double nextmsg = -1;
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)
+ if (sv.active || !cls.netcon)
return;
// read messages from server, should just be nops
net_message = old;
memcpy(net_message.data, olddata, net_message.cursize);
- if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5)
+ if (cls.netcon && (time = Sys_DoubleTime()) >= nextmsg)
{
sizebuf_t msg;
- qbyte buf[4];
- lastmsg = time;
+ unsigned char buf[4];
+ nextmsg = time + 5;
// write out a nop
// LordHavoc: must use unreliable because reliable could kill the sigon message!
Con_Print("--> client to server keepalive\n");
+ memset(&msg, 0, sizeof(msg));
msg.data = buf;
msg.maxsize = sizeof(buf);
- msg.cursize = 0;
MSG_WriteChar(&msg, svc_nop);
NetConn_SendUnreliableMessage(cls.netcon, &msg);
- // try not to utterly crush the computer with work, that's just rude
- Sys_Sleep(1);
}
}
void CL_ParseEntityLump(char *entdata)
{
const char *data;
- char key[128], value[4096];
+ char key[128], value[MAX_INPUTLINE];
FOG_clear(); // LordHavoc: no fog until set
// LordHavoc: default to the map's sky (q3 shader parsing sets this)
R_SetSkyBox(cl.worldmodel->brush.skybox);
*/
static void CL_SignonReply (void)
{
- //char str[8192];
-
-Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
+ Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
switch (cls.signon)
{
case 1:
- MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, "prespawn");
+ if (cls.netcon)
+ {
+ MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->message, "prespawn");
+ }
break;
case 2:
- MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string));
+ if (cls.netcon)
+ {
+ MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->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_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->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));
- }
+ if (cl_pmodel.integer)
+ {
+ MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->message, va("pmodel %i", cl_pmodel.integer));
+ }
+ if (*cl_playermodel.string)
+ {
+ MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->message, va("playermodel %s", cl_playermodel.string));
+ }
+ if (*cl_playerskin.string)
+ {
+ MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->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_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->message, va("rate %i", cl_rate.integer));
- MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, "spawn");
+ MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->message, "spawn");
+ }
break;
case 3:
- MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, "begin");
+ if (cls.netcon)
+ {
+ MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString (&cls.netcon->message, "begin");
+ }
break;
case 4:
{
char *str;
int i;
+ protocolversion_t protocol;
int nummodels, numsounds;
entity_t *ent;
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)", i);
return;
}
- cl.protocol = i;
- Con_DPrintf("Protocol %i\n", cl.protocol);
+ // 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", 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 ();
// 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();
+ memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache)); //[515]: csqc
memset(cl.model_precache, 0, sizeof(cl.model_precache));
memset(cl.sound_precache, 0, sizeof(cl.sound_precache));
if (!str[0])
break;
if (nummodels==MAX_MODELS)
- Host_Error ("Server sent too many model precaches\n");
+ Host_Error ("Server sent too many model precaches");
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels]));
if (!str[0])
break;
if (numsounds==MAX_SOUNDS)
- Host_Error("Server sent too many sound precaches\n");
+ Host_Error("Server sent too many sound precaches");
if (strlen(str) >= MAX_QPATH)
Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strlcpy (parse_sound_precache[numsounds], str, sizeof (parse_sound_precache[numsounds]));
// 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], true);
- }
- 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
// world model
CL_KeepaliveMessage ();
cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true);
- if (cl.model_precache[1] == NULL)
+ if (cl.model_precache[1]->Draw == NULL)
Con_Printf("Map %s not found\n", parse_model_precache[1]);
// normal models
for (i=2 ; i<nummodels ; i++)
{
CL_KeepaliveMessage();
- if ((cl.model_precache[i] = Mod_ForName(parse_model_precache[i], false, false, false)) == NULL)
+ if ((cl.model_precache[i] = Mod_ForName(parse_model_precache[i], false, false, false))->Draw == NULL)
Con_Printf("Model %s not found\n", parse_model_precache[i]);
}
for (i=1 ; i<numsounds ; i++)
{
CL_KeepaliveMessage();
- cl.sound_precache[i] = S_PrecacheSound(parse_sound_precache[i], true, 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);
if (!s->active)
return;
- if (s->modelindex >= MAX_MODELS)
+ if (s->modelindex >= MAX_MODELS && (65536-s->modelindex) >= MAX_MODELS)
Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS);
// colormap is client index + 1
- if (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;
}
}
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)
+ {
+ // 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)
{
- // we definitely shouldn't lerp
+ // 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)
+ if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer)
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);
}
}
-void CL_ReadEntityFrame(void)
-{
- 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 if (cl.protocol == PROTOCOL_DARKPLACES5)
- EntityFrame5_CL_ReadFrame();
-}
-
/*
==================
CL_ParseBaseline
Server information pertaining to this client only
==================
*/
-void CL_ParseClientdata (int bits)
+void CL_ParseClientdata (void)
{
- int i, j;
+ int i, j, bits;
- bits &= 0xFFFF;
+ 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];
+
+ 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]);
for (i = 0;i < 3;i++)
{
if (bits & (SU_PUNCH1<<i) )
{
- if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
- cl.punchangle[i] = MSG_ReadAngle16i();
- else if (cl.protocol == PROTOCOL_QUAKE)
- cl.punchangle[i] = MSG_ReadChar();
+ if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE)
+ cl.mpunchangle[0][i] = MSG_ReadChar();
else
- Host_Error("CL_ParseClientData: unknown cl.protocol\n");
+ cl.mpunchangle[0][i] = MSG_ReadAngle16i();
}
- else
- cl.punchangle[i] = 0;
if (bits & (SU_PUNCHVEC1<<i))
{
if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
- cl.punchvector[i] = MSG_ReadCoord16i();
- else if (cl.protocol == PROTOCOL_DARKPLACES5)
- cl.punchvector[i] = MSG_ReadCoord32f();
+ cl.mpunchvector[0][i] = MSG_ReadCoord16i();
else
- Host_Error("CL_ParseClientData: unknown cl.protocol\n");
+ cl.mpunchvector[0][i] = MSG_ReadCoord32f();
}
- else
- cl.punchvector[i] = 0;
if (bits & (SU_VELOCITY1<<i) )
{
- if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+ 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 if (cl.protocol == PROTOCOL_DARKPLACES5)
- cl.mvelocity[0][i] = MSG_ReadCoord32f();
else
- Host_Error("CL_ParseClientData: unknown cl.protocol\n");
+ cl.mvelocity[0][i] = MSG_ReadCoord32f();
}
- else
- cl.mvelocity[0][i] = 0;
}
- 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;
+ csqc_onground = cl.onground; //[515]: cause without this csqc will receive not right value on svc_print =/
cl.inwater = (bits & SU_INWATER) != 0;
if (cl.protocol == PROTOCOL_DARKPLACES5)
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_GENERIC1] = MSG_ReadShort();
- //cl.stats[STAT_GENERIC2] = MSG_ReadShort();
- //cl.stats[STAT_GENERIC3] = MSG_ReadShort();
- //cl.stats[STAT_GENERIC4] = MSG_ReadShort();
- //cl.stats[STAT_GENERIC5] = MSG_ReadShort();
- //cl.stats[STAT_GENERIC6] = MSG_ReadShort();
-
- i = (unsigned short) MSG_ReadShort ();
+ cl.stats[STAT_ACTIVEWEAPON] = (unsigned short) MSG_ReadShort ();
}
- else
+ 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();
-
- i = MSG_ReadByte ();
- if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
- i = (1<<i);
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+ cl.stats[STAT_ACTIVEWEAPON] = (1<<MSG_ReadByte ());
+ else
+ cl.stats[STAT_ACTIVEWEAPON] = MSG_ReadByte ();
}
- // GAME_NEXUIZ hud needs weapon change time
- // GAME_NEXUIZ uses a bit number as it's STAT_ACTIVEWEAPON, not a bitfield
- // like other modes
- if (cl.stats[STAT_ACTIVEWEAPON] != i)
- cl.weapontime = cl.time;
- cl.stats[STAT_ACTIVEWEAPON] = i;
-
- cl.viewzoomold = cl.viewzoomnew; // for interpolation
if (bits & SU_VIEWZOOM)
{
- if (cl.protocol == PROTOCOL_DARKPLACES5)
- i = (unsigned short) MSG_ReadShort();
+ if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+ cl.stats[STAT_VIEWZOOM] = MSG_ReadByte();
else
- i = MSG_ReadByte();
- if (i < 2)
- i = 2;
- cl.viewzoomnew = (float) i * (1.0f / 255.0f);
+ cl.stats[STAT_VIEWZOOM] = (unsigned short) MSG_ReadShort();
}
- else
- cl.viewzoomnew = 1;
+ // check for important changes
+
+ // 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];
+
+ // GAME_NEXUIZ hud needs weapon change time
+ if (cl.activeweapon != cl.stats[STAT_ACTIVEWEAPON])
+ cl.weapontime = cl.time;
+ cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON];
+
+ // viewzoom interpolation
+ cl.mviewzoom[0] = (float) max(cl.stats[STAT_VIEWZOOM], 2) * (1.0f / 255.0f);
}
/*
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)
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, true);
- cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav", false, true);
- cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav", false, true);
- cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav", false, true);
- cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav", false, true);
- cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav", false, true);
- cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false, true);
-}
-
void CL_ParseBeam (model_t *m, int lightning)
{
int i, ent;
vec3_t start, end;
- beam_t *b;
+ beam_t *b = NULL;
ent = (unsigned short) MSG_ReadShort ();
MSG_ReadVector(start, cl.protocol);
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;
- }
- }
+ if (ent >= cl_max_entities)
+ CL_ExpandEntities(ent);
- // find a free beam
- for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+ // override any beam with the same entity
+ i = cl_max_beams;
+ if (ent)
+ for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+ if (b->entity == ent)
+ break;
+ // if the entity was not found then just replace an unused beam
+ if (i == cl_max_beams)
+ for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+ if (!b->model || b->endtime < cl.time)
+ break;
+ if (i < cl_max_beams)
{
- if (!b->model || b->endtime < cl.time)
+ b->entity = ent;
+ b->lightning = lightning;
+ b->model = m;
+ b->endtime = cl.time + 0.2;
+ VectorCopy (start, b->start);
+ VectorCopy (end, b->end);
+ b->relativestartvalid = 0;
+ if (ent && cl_entities[ent].state_current.active)
{
- 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;
+ entity_state_t *p;
+ matrix4x4_t matrix, imatrix;
+ if (ent == cl.viewentity && cl.movement)
+ p = &cl_entities[b->entity].state_previous;
+ else
+ p = &cl_entities[b->entity].state_current;
+ // not really valid yet, we need to get the orientation now
+ // (ParseBeam flagged this because it is received before
+ // entities are received, by now they have been received)
+ // note: because players create lightning in their think
+ // function (which occurs before movement), they actually
+ // have some lag in it's location, so compare to the
+ // previous player state, not the latest
+ Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2], -p->angles[0], p->angles[1], p->angles[2], 1);
+ Matrix4x4_Invert_Simple(&imatrix, &matrix);
+ Matrix4x4_Transform(&imatrix, b->start, b->relativestart);
+ Matrix4x4_Transform(&imatrix, b->end, b->relativeend);
+ b->relativestartvalid = 1;
}
}
- Con_Print("beam list overflow!\n");
+ else
+ Con_Print("beam list overflow!\n");
}
void CL_ParseTempEntity(void)
int rnd;
int colorStart, colorLength, count;
float velspeed, radius;
- qbyte *tempcolor;
+ unsigned char *tempcolor;
matrix4x4_t tempmatrix;
type = MSG_ReadByte();
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, 0, false, 1);
+ //CL_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:
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, 0, false, 1);
+ //CL_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, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to spark shower
- CL_SparkShower(pos, vec3_origin, 15);
+ if (cl_particles_quake.integer)
+ CL_RunParticleEffect(pos, vec3_origin, 0, 10);
+ else 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, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to spark shower
- CL_SparkShower(pos, vec3_origin, 15);
+ if (cl_particles_quake.integer)
+ CL_RunParticleEffect(pos, vec3_origin, 0, 10);
+ else 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, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ 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, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to dust shower
- CL_SparkShower(pos, vec3_origin, 30);
+ if (cl_particles_quake.integer)
+ CL_RunParticleEffect(pos, vec3_origin, 0, 20);
+ else 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, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to dust shower
- CL_SparkShower(pos, vec3_origin, 30);
+ if (cl_particles_quake.integer)
+ CL_RunParticleEffect(pos, vec3_origin, 0, 20);
+ else 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, 100, 0.15f, 0.15f, 1.5f, 500, 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
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, 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
// bullet hitting wall
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to dust shower
- CL_SparkShower(pos, vec3_origin, 15);
+ if (cl_particles_quake.integer)
+ CL_RunParticleEffect(pos, vec3_origin, 0, 20);
+ else
+ {
+ 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, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- CL_SparkShower(pos, vec3_origin, 15);
+ if (cl_particles_quake.integer)
+ CL_RunParticleEffect(pos, vec3_origin, 0, 20);
+ else
+ {
+ 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, 100, 0.15f, 0.15f, 1.5f, 500, 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:
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, 4.0f, 2.0f, 0.50f, 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:
CL_FindNonSolidLocation(pos, pos, 10);
CL_ParticleExplosion(pos);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ 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:
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, 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_EXPLOSIONRGB:
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:
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, 1.6f, 0.8f, 2.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, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, 0, true, 1);
+ 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, 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() * (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:
case TE_LIGHTNING1:
// lightning bolts
- if (!cl_model_bolt)
- cl_model_bolt = Mod_ForName("progs/bolt.mdl", false, 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", false, 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
case TE_TELEPORT:
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:
colorStart = MSG_ReadByte();
colorLength = MSG_ReadByte();
CL_ParticleExplosion2(pos, colorStart, colorLength);
- tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart];
+ tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart];
color[0] = tempcolor[0] * (2.0f / 255.0f);
color[1] = tempcolor[1] * (2.0f / 255.0f);
color[2] = tempcolor[2] * (2.0f / 255.0f);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ 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, cl.protocol);
MSG_ReadVector(pos2, cl.protocol);
MSG_ReadVector(dir, cl.protocol);
- CL_BeamParticle(pos, pos2, 12, 1, 0.3, 0.1, 1, 1);
- CL_BeamParticle(pos, pos2, 5, 1, 0.9, 0.3, 1, 1);
+ CL_BeamParticle(pos, pos2, 8, 1, 1, 1, 1, 1);
break;
case TE_TEI_SMOKE:
CL_FindNonSolidLocation(pos, pos, 10);
CL_ParticleExplosion(pos);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, 0, true, 1);
- S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ 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:
CL_FindNonSolidLocation(pos, pos, 5);
CL_Tei_PlasmaHit(pos, dir, count);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, 0, true, 1);
+ 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);
-static qbyte cgamenetbuffer[65536];
+//[515]: csqc
+void CL_VM_Init (void);
+qboolean CL_VM_Parse_TempEntity (void);
+void CL_VM_Parse_StuffCmd (const char *msg);
+void CL_VM_Parse_CenterPrint (const char *msg);
+void CSQC_AddPrintText (const char *msg);
+void CSQC_ReadEntities (void);
+//
+static unsigned char cgamenetbuffer[65536];
/*
=====================
{
int cmd;
int i;
- qbyte cmdlog[32];
+ protocolversion_t protocol;
+ unsigned char cmdlog[32];
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
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++;
}
description[strlen(description)-1] = '\n'; // replace the last space with a newline
Con_Print(description);
- Host_Error ("CL_ParseServerMessage: Illegible server message\n");
+ Host_Error ("CL_ParseServerMessage: Illegible server message");
}
break;
case svc_time:
cl.mtime[1] = cl.mtime[0];
cl.mtime[0] = MSG_ReadFloat ();
+ cl.movement_needupdate = true;
break;
case svc_clientdata:
- i = (unsigned short) 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)", 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:
break;
case svc_print:
- Con_Print(MSG_ReadString());
+ CSQC_AddPrintText(MSG_ReadString()); //[515]: csqc
break;
case svc_centerprint:
- SCR_CenterPrint(MSG_ReadString ());
+ CL_VM_Parse_CenterPrint(MSG_ReadString ()); //[515]: csqc
break;
case svc_stufftext:
- Cbuf_AddText (MSG_ReadString ());
+ CL_VM_Parse_StuffCmd(MSG_ReadString ()); //[515]: csqc
break;
case svc_damage:
case svc_serverinfo:
CL_ParseServerInfo ();
+ CL_VM_Init(); //[515]: init csqc
break;
case svc_setangle:
case svc_setview:
cl.viewentity = (unsigned short)MSG_ReadShort ();
if (cl.viewentity >= MAX_EDICTS)
- Host_Error("svc_setview >= MAX_EDICTS\n");
+ Host_Error("svc_setview >= MAX_EDICTS");
+ 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;
case svc_lightstyle:
i = MSG_ReadByte ();
- if (i >= MAX_LIGHTSTYLES)
- Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES");
+ if (i >= cl_max_lightstyle)
+ {
+ Con_Printf ("svc_lightstyle >= MAX_LIGHTSTYLES");
+ break;
+ }
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_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients");
- cl.scores[i].frags = (unsigned short) MSG_ReadShort ();
+ cl.scores[i].frags = (signed short) MSG_ReadShort ();
break;
case svc_updatecolors:
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 = (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:
CL_ParseStatic (true);
break;
case svc_temp_entity:
- CL_ParseTempEntity ();
+ if(!CL_VM_Parse_TempEntity())
+ CL_ParseTempEntity ();
break;
case svc_setpause:
cl.paused = MSG_ReadByte ();
if (cl.paused)
- {
CDAudio_Pause ();
- S_PauseGameSounds ();
- }
else
- {
CDAudio_Resume ();
- S_ResumeGameSounds ();
- }
+ 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;
cl.cdtrack = MSG_ReadByte ();
cl.looptrack = MSG_ReadByte ();
if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) )
- CDAudio_Play ((qbyte)cls.forcetrack, true);
+ CDAudio_Play ((unsigned char)cls.forcetrack, true);
else
- CDAudio_Play ((qbyte)cl.cdtrack, true);
+ CDAudio_Play ((unsigned char)cl.cdtrack, true);
break;
case svc_intermission:
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;
+ case svc_csqcentities:
+ CSQC_ReadEntities();
break;
}
}
void CL_Parse_Init(void)
{
// LordHavoc: added demo_nehahra cvar
- cl_scores_mempool = Mem_AllocPool("client player info", 0, NULL);
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