qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces
+mempool_t *cl_scores_mempool;
+
/*
==================
CL_ParseStartSoundPacket
so the server doesn't disconnect.
==================
*/
+
+static qbyte olddata[NET_MAXMESSAGE];
void CL_KeepaliveMessage (void)
{
- float time;
+ float time;
static float lastmsg;
- int ret;
- int c;
- sizebuf_t old;
- qbyte olddata[8192];
-
- if (sv.active)
- return; // no need if server is local
- if (cls.demoplayback)
+ int oldreadcount;
+ qboolean oldbadread;
+ sizebuf_t old;
+
+ // no need if server is local and definitely not if this is a demo
+ if (sv.active || cls.demoplayback)
return;
// read messages from server, should just be nops
+ oldreadcount = msg_readcount;
+ oldbadread = msg_badread;
old = net_message;
- memcpy (olddata, net_message.data, net_message.cursize);
+ memcpy(olddata, net_message.data, net_message.cursize);
- do
- {
- ret = CL_GetMessage ();
- switch (ret)
- {
- default:
- Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
- case 0:
- break; // nothing waiting
- case 1:
- Host_Error ("CL_KeepaliveMessage: received a message");
- break;
- case 2:
- c = MSG_ReadByte();
- if (c != svc_nop)
- Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop");
- break;
- }
- } while (ret);
+ NetConn_ClientFrame();
+ msg_readcount = oldreadcount;
+ msg_badread = oldbadread;
net_message = old;
- memcpy (net_message.data, olddata, net_message.cursize);
+ memcpy(net_message.data, olddata, net_message.cursize);
-// check time
- time = Sys_DoubleTime ();
- if (time - lastmsg < 5)
- return;
- lastmsg = time;
-
-// write out a nop
- Con_Printf ("--> client to server keepalive\n");
-
- MSG_WriteByte (&cls.message, clc_nop);
- NET_SendMessage (cls.netcon, &cls.message);
- SZ_Clear (&cls.message);
+ if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5)
+ {
+ lastmsg = time;
+ // write out a nop
+ Con_Printf("--> client to server keepalive\n");
+ MSG_WriteByte(&cls.message, clc_nop);
+ NetConn_SendReliableMessage(cls.netcon, &cls.message);
+ SZ_Clear(&cls.message);
+ // try not to utterly crush the computer with work, that's just rude
+ Sys_Sleep();
+ }
}
void CL_ParseEntityLump(char *entdata)
Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients);
return;
}
+ Mem_EmptyPool(cl_scores_mempool);
cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores));
// parse gametype
ent->render.model = cl.worldmodel = cl.model_precache[1];
//ent->render.scale = 1;
ent->render.alpha = 1;
+ ent->render.flags = RENDER_SHADOW;
Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1);
Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
CL_BoundingBoxForEntity(&ent->render);
// not a monster
ent->persistent.lerpstarttime = cl.mtime[1];
// no lerp if it's singleplayer
- if (sv.active && svs.maxclients == 1 && !ent->state_current.flags & RENDER_STEP)
+ if (sv.active && svs.maxclients == 1)
ent->persistent.lerpdeltatime = 0;
else
ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
entlife[ent->state_current.number] = 2;
cl_entities_active[ent->state_current.number] = true;
}
- VectorCopy(cl.viewentoriginnew, cl.viewentoriginold);
- VectorCopy(entityframe.eye, cl.viewentoriginnew);
}
void CL_EntityUpdateSetup(void)
case TE_WIZSPIKE:
// spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
CL_AllocDlight (NULL, pos, 50, 0.25f, 1.00f, 0.25f, 250, 0.2);
CL_RunParticleEffect (pos, vec3_origin, 20, 30);
S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1);
case TE_KNIGHTSPIKE:
// spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
CL_AllocDlight (NULL, pos, 50, 1.0f, 0.60f, 0.20f, 250, 0.2);
CL_RunParticleEffect (pos, vec3_origin, 226, 20);
S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
case TE_SPIKE:
// spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
// LordHavoc: changed to spark shower
CL_SparkShower(pos, vec3_origin, 15);
if ( rand() % 5 )
case TE_SPIKEQUAD:
// quad spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
// LordHavoc: changed to spark shower
CL_SparkShower(pos, vec3_origin, 15);
CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
case TE_SUPERSPIKE:
// super spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
// LordHavoc: changed to dust shower
CL_SparkShower(pos, vec3_origin, 30);
if ( rand() % 5 )
case TE_SUPERSPIKEQUAD:
// quad super spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
// LordHavoc: changed to dust shower
CL_SparkShower(pos, vec3_origin, 30);
CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
case TE_BLOOD:
// blood puff
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
dir[0] = MSG_ReadChar ();
dir[1] = MSG_ReadChar ();
dir[2] = MSG_ReadChar ();
case TE_BLOOD2:
// blood puff
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
CL_BloodPuff(pos, vec3_origin, 10);
break;
case TE_SPARK:
// spark shower
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
dir[0] = MSG_ReadChar ();
dir[1] = MSG_ReadChar ();
dir[2] = MSG_ReadChar ();
break;
case TE_PLASMABURN:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
- CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
+ CL_AllocDlight(NULL, pos, 200, 1, 1, 1, 1000, 0.2);
CL_PlasmaBurn(pos);
break;
// LordHavoc: added for improved gore
case TE_GUNSHOT:
// bullet hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
// LordHavoc: changed to dust shower
CL_SparkShower(pos, vec3_origin, 15);
break;
case TE_GUNSHOTQUAD:
// quad bullet hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
CL_SparkShower(pos, vec3_origin, 15);
CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
break;
case TE_EXPLOSION:
// rocket explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
CL_ParticleExplosion (pos);
// LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5);
case TE_EXPLOSIONQUAD:
// quad rocket explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
CL_ParticleExplosion (pos);
CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
case TE_EXPLOSION3:
// Nehahra movie colored lighting explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
CL_ParticleExplosion (pos);
CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
case TE_EXPLOSIONRGB:
// colored lighting explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
CL_ParticleExplosion (pos);
color[0] = MSG_ReadByte() * (1.0 / 255.0);
color[1] = MSG_ReadByte() * (1.0 / 255.0);
case TE_TAREXPLOSION:
// tarbaby explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
CL_BlobExplosion (pos);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
case TE_SMALLFLASH:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
break;
case TE_CUSTOMFLASH:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
radius = MSG_ReadByte() * 8;
velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0);
color[0] = MSG_ReadByte() * (1.0 / 255.0);
case TE_EXPLOSION2:
// color mapped explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
colorStart = MSG_ReadByte ();
colorLength = MSG_ReadByte ();
CL_ParticleExplosion2 (pos, colorStart, colorLength);
MSG_ReadVector(pos);
MSG_ReadVector(dir);
count = MSG_ReadByte ();
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 4);
CL_Tei_Smoke(pos, dir, count);
break;
case TE_TEI_BIGEXPLOSION:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 10);
CL_ParticleExplosion (pos);
CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
MSG_ReadVector(pos);
MSG_ReadVector(dir);
count = MSG_ReadByte ();
- Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 5);
+ if (cl.worldmodel) cl.worldmodel->FindNonSolidLocation(cl.worldmodel, pos, pos, 5);
CL_Tei_PlasmaHit(pos, dir, count);
CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999);
break;
=====================
*/
int parsingerror = false;
-void CL_ParseServerMessage (void)
+void CL_ParseServerMessage(void)
{
int cmd;
int i, entitiesupdated;
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
+ if (cls.demorecording)
+ CL_WriteDemoMessage ();
+
+ cl.last_received_message = realtime;
+
//
// if recording demos, copy the message out
//
if (cl_shownet.integer == 1)
- Con_Printf ("%i ",net_message.cursize);
+ Con_Printf ("%f %i\n", realtime, net_message.cursize);
else if (cl_shownet.integer == 2)
Con_Printf ("------------------\n");
//
// parse the message
//
- MSG_BeginReading ();
+ //MSG_BeginReading ();
entitiesupdated = false;
break;
case svc_nop:
+ if (cls.signon < SIGNONS)
+ Con_Printf("<-- server to client keepalive\n");
break;
case svc_time:
void CL_Parse_Init(void)
{
// LordHavoc: added demo_nehahra cvar
+ cl_scores_mempool = Mem_AllocPool("client player info");
Cvar_RegisterVariable (&demo_nehahra);
if (gamemode == GAME_NEHAHRA)
Cvar_SetValue("demo_nehahra", 1);
projects / xonotic / darkplaces.git / blobdiff