#include "quakedef.h"
#include "cdaudio.h"
#include "cl_collision.h"
+#include "csprogs.h"
char *svc_strings[128] =
{
"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"};
+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)"};
/*
==================
==================
*/
-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);
}
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_playermodel.string)
- {
- MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, va("playermodel %s\n", cl_playermodel.string));
- }
- if (*cl_playerskin.string)
- {
- MSG_WriteByte (&cls.message, clc_stringcmd);
- MSG_WriteString (&cls.message, va("playerskin %s\n", cl_playerskin.string));
- }
+ 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:
protocol = Protocol_EnumForNumber(i);
if (protocol == PROTOCOL_UNKNOWN)
{
- Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)\n", i);
+ Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)", i);
return;
}
// hack for unmarked Nehahra movie demos which had a custom protocol
cl.maxclients = MSG_ReadByte ();
if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD)
{
- Host_Error("Bad maxclients (%u) from server\n", cl.maxclients);
+ Host_Error("Bad maxclients (%u) from server", cl.maxclients);
return;
}
- cl.scores = Mem_Alloc(cl_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 ();
// 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]));
// 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]);
}
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
}
model = cl.model_precache[s->modelindex];
- Mod_CheckLoaded(model);
if (model && model->type && s->frame >= model->numframes)
{
Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
// not a monster
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 = bound(0, ent->state_current.time - ent->state_previous.time, 0.1);
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)
{
int i, ent;
vec3_t start, end;
- beam_t *b;
+ beam_t *b = NULL;
ent = (unsigned short) MSG_ReadShort ();
MSG_ReadVector(start, cl.protocol);
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 && ent)
- {
- //b->entity = ent;
- b->lightning = lightning;
- b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0;
- b->model = m;
- b->endtime = cl.time + 0.2;
- VectorCopy (start, b->start);
- VectorCopy (end, b->end);
- return;
- }
- }
-
- // find a free beam
- for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+ 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, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ //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);
break;
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, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ //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);
break;
// spike hitting wall
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_bulletimpacts.integer)
+ 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);
}
+ CL_BulletMark(pos);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
// quad spike hitting wall
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to spark shower
- if (cl_particles_bulletimpacts.integer)
+ 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);
}
+ 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, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
if (rand() % 5)
// super spike hitting wall
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to dust shower
- if (cl_particles_bulletimpacts.integer)
+ 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);
}
+ CL_BulletMark(pos);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
// quad super spike hitting wall
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- // LordHavoc: changed to dust shower
- if (cl_particles_bulletimpacts.integer)
+ 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);
}
+ 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, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
if (rand() % 5)
// bullet hitting wall
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- CL_SparkShower(pos, vec3_origin, 15, 1);
- CL_Smoke(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;
// quad bullet hitting wall
MSG_ReadVector(pos, cl.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- CL_SparkShower(pos, vec3_origin, 15, 1);
- CL_Smoke(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, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
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);
#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;
protocolversion_t protocol;
- qbyte cmdlog[32];
+ unsigned char cmdlog[32];
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
- qboolean sendmove = false;
if (cls.demorecording)
CL_WriteDemoMessage ();
}
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 ();
- sendmove = true;
+ cl.movement_needupdate = true;
break;
case svc_clientdata:
i = MSG_ReadLong ();
protocol = Protocol_EnumForNumber(i);
if (protocol == PROTOCOL_UNKNOWN)
- Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)\n", i);
+ Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)", i);
// hack for unmarked Nehahra movie demos which had a custom protocol
if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer)
protocol = PROTOCOL_NEHAHRAMOVIE;
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
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 = (int)strlen(cl_lightstyle[i].map);
CL_ParseStatic (true);
break;
case svc_temp_entity:
- CL_ParseTempEntity ();
+ if(!CL_VM_Parse_TempEntity())
+ CL_ParseTempEntity ();
break;
case svc_setpause:
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:
else
EntityFrame5_CL_ReadFrame();
break;
+ case svc_csqcentities:
+ CSQC_ReadEntities();
+ break;
}
}
EntityFrameQuake_ISeeDeadEntities();
- if (sendmove)
- {
- // send one move per server frame
- CL_SendMove();
- }
-
parsingerror = false;
}
projects / xonotic / darkplaces.git / blobdiff