"svc_entities", // 57 // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata
"svc_csqcentities", // 58 // [short] entnum [variable length] entitydata ... [short] 0x0000
"svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten
+ "svc_trailparticles", // 60 // [short] entnum [short] effectnum [vector] start [vector] end
+ "svc_pointparticles", // 61 // [short] effectnum [vector] start [vector] velocity [short] count
+ "svc_pointparticles1", // 62 // [short] effectnum [vector] start, same as svc_pointparticles except velocity is zero and count is 1
};
char *qw_svc_strings[128] =
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)"};
+cvar_t cl_gameplayfix_soundsmovewithentities = {0, "cl_gameplayfix_soundsmovewithentities", "1", "causes sounds made by lifts, players, projectiles, and any other entities, to move with the entity, so for example a rocket noise follows the rocket rather than staying at the starting position"};
cvar_t cl_sound_wizardhit = {0, "cl_sound_wizardhit", "wizard/hit.wav", "sound to play during TE_WIZSPIKE (empty cvar disables sound)"};
cvar_t cl_sound_hknighthit = {0, "cl_sound_hknighthit", "hknight/hit.wav", "sound to play during TE_KNIGHTSPIKE (empty cvar disables sound)"};
cvar_t cl_sound_tink1 = {0, "cl_sound_tink1", "weapons/tink1.wav", "sound to play with 80% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
cvar_t cl_joinbeforedownloadsfinish = {CVAR_SAVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
cvar_t cl_nettimesyncfactor = {CVAR_SAVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (bounding still applies)"};
-cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "cl_nettimesyncboundmode", "4", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3"};
+cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "cl_nettimesyncboundmode", "6", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3, 5 = slighttly nicer version of Quake3 method, 6 = bounding + Quake3"};
cvar_t cl_nettimesyncboundtolerance = {CVAR_SAVE, "cl_nettimesyncboundtolerance", "0.25", "how much error is tolerated by bounding check, as a fraction of frametime, 0.25 = up to 25% margin of error tolerated, 1 = use only new time, 0 = use only old time (same effect as setting cl_nettimesyncfactor to 1)"};
cvar_t cl_iplog_name = {CVAR_SAVE, "cl_iplog_name", "darkplaces_iplog.txt", "name of iplog file containing player addresses for iplog_list command and automatic ip logging when parsing status command"};
void QW_CL_StartUpload(unsigned char *data, int size);
//static qboolean QW_CL_IsUploading(void);
static void QW_CL_StopUpload(void);
+void CL_VM_UpdateIntermissionState(int intermission);
+qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos);
/*
==================
channel &= 7;
}
- if (largesoundindex || field_mask & SND_LARGESOUND)
+ if (largesoundindex || (field_mask & SND_LARGESOUND) || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
sound_num = (unsigned short) MSG_ReadShort ();
else
sound_num = MSG_ReadByte ();
return;
}
- S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation);
+ if (ent >= cl.max_entities)
+ CL_ExpandEntities(ent);
+
+ if( !CL_VM_Event_Sound(sound_num, volume / 255.0f, channel, attenuation, ent, pos) )
+ S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation);
}
/*
sizebuf_t old;
// no need if server is local and definitely not if this is a demo
- if (sv.active || !cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD)
+ if (!cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD)
return;
if (readmessages)
msg.data = buf;
msg.maxsize = sizeof(buf);
MSG_WriteChar(&msg, clc_nop);
- NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000);
+ NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, false);
}
}
data = entdata;
if (!data)
return;
- if (!COM_ParseToken_Simple(&data, false))
+ if (!COM_ParseToken_Simple(&data, false, false))
return; // error
if (com_token[0] != '{')
return; // error
while (1)
{
- if (!COM_ParseToken_Simple(&data, false))
+ if (!COM_ParseToken_Simple(&data, false, false))
return; // error
if (com_token[0] == '}')
break; // end of worldspawn
strlcpy (key, com_token, sizeof (key));
while (key[strlen(key)-1] == ' ') // remove trailing spaces
key[strlen(key)-1] = 0;
- if (!COM_ParseToken_Simple(&data, false))
+ if (!COM_ParseToken_Simple(&data, false, false))
return; // error
strlcpy (value, com_token, sizeof (value));
if (!strcmp("sky", key))
else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
R_SetSkyBox(value);
else if (!strcmp("fog", key))
- sscanf(value, "%f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue);
+ {
+ r_refdef.fog_start = 0;
+ r_refdef.fog_alpha = 1;
+ r_refdef.fog_end = 16384;
+ sscanf(value, "%f %f %f %f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue, &r_refdef.fog_alpha, &r_refdef.fog_start, &r_refdef.fog_end);
+ }
else if (!strcmp("fog_density", key))
r_refdef.fog_density = atof(value);
else if (!strcmp("fog_red", key))
r_refdef.fog_green = atof(value);
else if (!strcmp("fog_blue", key))
r_refdef.fog_blue = atof(value);
+ else if (!strcmp("fog_alpha", key))
+ r_refdef.fog_alpha = atof(value);
+ else if (!strcmp("fog_start", key))
+ r_refdef.fog_start = atof(value);
+ else if (!strcmp("fog_end", key))
+ r_refdef.fog_end = atof(value);
+ }
+}
+
+extern void CL_Locs_Reload_f(void);
+extern void CL_VM_Init (void);
+static const vec3_t defaultmins = {-4096, -4096, -4096};
+static const vec3_t defaultmaxs = {4096, 4096, 4096};
+static void CL_SetupWorldModel(void)
+{
+ // update the world model
+ cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+ CL_UpdateRenderEntity(&cl.entities[0].render);
+
+ // set up csqc world for collision culling
+ if (cl.worldmodel)
+ World_SetSize(&cl.world, cl.worldmodel->name, cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
+ else
+ World_SetSize(&cl.world, "", defaultmins, defaultmaxs);
+
+ // load or reload .loc file for team chat messages
+ CL_Locs_Reload_f();
+
+ // reset particles and other per-level things
+ R_Modules_NewMap();
+
+ // load the team chat beep if possible
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
+
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+
+ // load the csqc now
+ if (cl.loadcsqc)
+ {
+ cl.loadcsqc = false;
+ CL_VM_Init();
}
}
return false;
}
-extern void CL_Locs_Reload_f(void);
static void QW_CL_ProcessUserInfo(int slot);
static void QW_CL_RequestNextDownload(void)
{
// now that we have a world model, set up the world entity, renderer
// modules and csqc
- cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_UpdateRenderEntity(&cl.entities[0].render);
-
- CL_Locs_Reload_f();
- R_Modules_NewMap();
-
- cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
+ CL_SetupWorldModel();
// add pmodel/emodel CRCs to userinfo
CL_SetInfo("pmodel", va("%i", FS_CRCFile("progs/player.mdl", NULL)), true, true, true, true);
&& cl_serverextension_download.integer
&& (FS_CRCFile(csqc_progname.string, &progsize) != csqc_progcrc.integer || ((int)progsize != csqc_progsize.integer && csqc_progsize.integer != -1))
&& !FS_FileExists(va("dlcache/%s.%i.%i", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer)))
+ {
+ Con_Printf("Downloading new CSQC code to dlcache/%s.%i.%i\n", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer);
Cmd_ForwardStringToServer(va("download %s", csqc_progname.string));
+ return;
+ }
}
if (cl.loadmodel_current < cl.loadmodel_total)
if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1)
{
// we now have the worldmodel so we can set up the game world
- cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_UpdateRenderEntity(&cl.entities[0].render);
- CL_Locs_Reload_f();
- R_Modules_NewMap();
- cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
- // check memory integrity
- Mem_CheckSentinelsGlobal();
+ CL_SetupWorldModel();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
cl.loadfinished = true;
if (cl.downloadmodel_current == 1)
{
// the worldmodel failed, but we need to set up anyway
- cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_UpdateRenderEntity(&cl.entities[0].render);
- CL_Locs_Reload_f();
- R_Modules_NewMap();
- cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
- // check memory integrity
- Mem_CheckSentinelsGlobal();
+ CL_SetupWorldModel();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
cl.loadfinished = true;
if (cl.downloadmodel_current == 1)
{
// we now have the worldmodel so we can set up the game world
- cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_UpdateRenderEntity(&cl.entities[0].render);
- CL_Locs_Reload_f();
- R_Modules_NewMap();
- cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
- // check memory integrity
- Mem_CheckSentinelsGlobal();
+ CL_SetupWorldModel();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
cl.loadfinished = true;
// prevent cl_begindownloads from being issued multiple times in one match
// to prevent accidentally cancelled downloads
if(cl.loadbegun)
- Con_DPrintf("cl_begindownloads is only valid once per match\n");
+ Con_Printf("cl_begindownloads is only valid once per match\n");
else
CL_BeginDownloads(false);
}
void CL_StopDownload(int size, int crc)
{
- if (cls.qw_downloadmemory && cls.qw_downloadmemorycursize == size && CRC_Block(cls.qw_downloadmemory, size) == crc)
+ if (cls.qw_downloadmemory && cls.qw_downloadmemorycursize == size && CRC_Block(cls.qw_downloadmemory, cls.qw_downloadmemorycursize) == crc)
{
int existingcrc;
size_t existingsize;
FS_Rescan();
}
}
+ else if (cls.qw_downloadmemory && size)
+ {
+ Con_Printf("Download \"%s\" is corrupt (%i bytes, %i CRC, should be %i bytes, %i CRC), discarding\n", cls.qw_downloadname, size, crc, (int)cls.qw_downloadmemorycursize, (int)CRC_Block(cls.qw_downloadmemory, cls.qw_downloadmemorycursize));
+ CL_BeginDownloads(true);
+ }
if (cls.qw_downloadmemory)
Mem_Free(cls.qw_downloadmemory);
void CL_StopDownload_f(void)
{
+ Curl_CancelAll();
if (cls.qw_downloadname[0])
{
Con_Printf("Download of %s aborted\n", cls.qw_downloadname);
*/
static void CL_SignonReply (void)
{
- Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
+ if (developer.integer >= 100)
+ Con_Printf("CL_SignonReply: %i\n", cls.signon);
switch (cls.signon)
{
case 4:
Con_ClearNotify();
+ if (COM_CheckParm("-profilegameonly"))
+ Sys_AllowProfiling(true);
break;
}
}
// if server is active, we already began a loading plaque
if (!sv.active)
+ {
SCR_BeginLoadingPlaque();
+ S_StopAllSounds();
+ }
// check memory integrity
Mem_CheckSentinelsGlobal();
i = MSG_ReadByte();
// cl.qw_spectator is an unneeded flag, cl.scores[cl.playerentity].qw_spectator works better (it can be updated by the server during the game)
//cl.qw_spectator = (i & 128) != 0;
- cl.playerentity = cl.viewentity = (i & 127) + 1;
+ cl.realplayerentity = cl.playerentity = cl.viewentity = (i & 127) + 1;
cl.scores = (scoreboard_t *)Mem_Alloc(cls.levelmempool, cl.maxclients*sizeof(*cl.scores));
// get the full level name
str = MSG_ReadString ();
strlcpy (cl.levelname, str, sizeof(cl.levelname));
- // get the movevars
+ // get the movevars that are defined in the qw protocol
cl.movevars_gravity = MSG_ReadFloat();
cl.movevars_stopspeed = MSG_ReadFloat();
cl.movevars_maxspeed = MSG_ReadFloat();
cl.movevars_friction = MSG_ReadFloat();
cl.movevars_waterfriction = MSG_ReadFloat();
cl.movevars_entgravity = MSG_ReadFloat();
+
// other movevars not in the protocol...
- cl.movevars_slowmo = 1;
+ cl.movevars_wallfriction = 0;
+ cl.movevars_timescale = 1;
cl.movevars_jumpvelocity = 270;
cl.movevars_edgefriction = 2;
cl.movevars_maxairspeed = 30;
cl.movevars_stepheight = 18;
- cl.movevars_airaccel_qw = 1.0;
- cl.movevars_airaccel_sideways_friction = 0.0;
+ cl.movevars_airaccel_qw = 1;
+ cl.movevars_airaccel_sideways_friction = 0;
// seperate the printfs so the server message can have a color
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);
cl.downloadcsqc = true;
cl.loadbegun = false;
cl.loadfinished = false;
+ cl.loadcsqc = true;
}
// check memory integrity
if (s->modelindex >= MAX_MODELS)
Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS);
+ // these warnings are only warnings, no corrections are made to the state
+ // because states are often copied for decoding, which otherwise would
+ // propogate some of the corrections accidentally
+ // (this used to happen, sometimes affecting skin and frame)
+
// colormap is client index + 1
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];
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);
- s->frame = 0;
- }
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\" (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 || ent->state_previous.modelindex != ent->state_current.modelindex)
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.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->state_baseline.modelindex = (unsigned short) MSG_ReadShort ();
ent->state_baseline.frame = (unsigned short) MSG_ReadShort ();
}
+ else if (cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
+ {
+ ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort ();
+ ent->state_baseline.frame = MSG_ReadByte ();
+ }
else
{
ent->state_baseline.modelindex = MSG_ReadByte ();
VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
cl.mviewzoom[1] = cl.mviewzoom[0];
- if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
+ if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
{
cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT;
cl.stats[STAT_ITEMS] = 0;
{
if (bits & (SU_PUNCH1<<i) )
{
- if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE)
+ if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
cl.mpunchangle[0][i] = MSG_ReadChar();
else
cl.mpunchangle[0][i] = MSG_ReadAngle16i();
}
if (bits & (SU_VELOCITY1<<i) )
{
- if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4)
+ if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4)
cl.mvelocity[0][i] = MSG_ReadChar()*16;
else
cl.mvelocity[0][i] = MSG_ReadCoord32f();
}
// LordHavoc: hipnotic demos don't have this bit set but should
- if (bits & SU_ITEMS || cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
+ if (bits & SU_ITEMS || cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
cl.stats[STAT_ITEMS] = MSG_ReadLong ();
cl.onground = (bits & SU_ONGROUND) != 0;
cl.stats[STAT_CELLS] = MSG_ReadShort();
cl.stats[STAT_ACTIVEWEAPON] = (unsigned short) MSG_ReadShort ();
}
- else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4)
+ else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.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;
+ if (cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
+ cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? (unsigned short)MSG_ReadShort() : 0;
+ else
+ 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();
// copy it to the current state
ent->render.model = cl.model_precache[ent->state_baseline.modelindex];
- ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame;
+ ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame;
ent->render.framelerp = 0;
// make torchs play out of sync
ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1);
- ent->render.colormap = -1; // no special coloring
ent->render.skinnum = ent->state_baseline.skin;
ent->render.effects = ent->state_baseline.effects;
ent->render.alpha = 1;
int sound_num, vol, atten;
MSG_ReadVector(org, cls.protocol);
- if (large)
+ if (large || cls.protocol == PROTOCOL_NEHAHRABJP2)
sound_num = (unsigned short) MSG_ReadShort ();
else
sound_num = MSG_ReadByte ();
colorStart = MSG_ReadByte();
colorLength = MSG_ReadByte();
CL_ParticleExplosion2(pos, colorStart, colorLength);
- tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart];
+ tempcolor = palette_rgb[(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);
CL_ParticleEffect(effectindex, count, origin, origin, velocity, velocity, NULL, 0);
}
+void CL_ParsePointParticles1(void)
+{
+ int effectindex;
+ vec3_t origin;
+ effectindex = (unsigned short)MSG_ReadShort();
+ MSG_ReadVector(origin, cls.protocol);
+ CL_ParticleEffect(effectindex, 1, origin, origin, vec3_origin, vec3_origin, NULL, 0);
+}
+
typedef struct cl_iplog_item_s
{
char *address;
if (!strcmp(text, "Client ping times:\n"))
{
cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+ // hide ping reports in demos
+ if (cls.demoplayback)
+ cl.parsingtextexpectingpingforscores = 1;
for(cl.parsingtextplayerindex = 0; cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0]; cl.parsingtextplayerindex++)
;
if (cl.parsingtextplayerindex >= cl.maxclients) // should never happen, since the client itself should be in cl.scores
static void CL_NetworkTimeReceived(double newtime)
{
double timehigh;
- cl.mtime[1] = max(cl.mtime[0], newtime - 0.1);
+ cl.mtime[1] = cl.mtime[0];
cl.mtime[0] = newtime;
if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
cl.time = cl.mtime[1] = newtime;
+ else if (cls.demoplayback)
+ {
+ // when time falls behind during demo playback it means the cl.mtime[1] was altered
+ // due to a large time gap, so treat it as an instant change in time
+ // (this can also happen during heavy packet loss in the demo)
+ if (cl.time < newtime - 0.1)
+ cl.mtime[1] = cl.time = newtime;
+ }
else if (cls.protocol != PROTOCOL_QUAKEWORLD)
{
+ cl.mtime[1] = max(cl.mtime[1], cl.mtime[0] - 0.1);
if (developer.integer >= 100 && vid_activewindow)
{
if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1]))
else if (fabs(cl.time - cl.mtime[1]) > 0.1)
cl.time += 0.5 * (cl.mtime[1] - cl.time); // fast
else if (cl.time > cl.mtime[1])
- cl.time -= 0.002 * cl.movevars_slowmo; // fall into the past by 2ms
+ cl.time -= 0.002 * cl.movevars_timescale; // fall into the past by 2ms
+ else
+ cl.time += 0.001 * cl.movevars_timescale; // creep forward 1ms
+ }
+ else if (cl_nettimesyncboundmode.integer == 5)
+ {
+ if (fabs(cl.time - cl.mtime[1]) > 0.5)
+ cl.time = cl.mtime[1]; // reset
+ else if (fabs(cl.time - cl.mtime[1]) > 0.1)
+ cl.time += 0.5 * (cl.mtime[1] - cl.time); // fast
else
- cl.time += 0.001 * cl.movevars_slowmo; // creep forward 1ms
+ cl.time = bound(cl.time - 0.002 * cl.movevars_timescale, cl.mtime[1], cl.time + 0.001 * cl.movevars_timescale);
+ }
+ else if (cl_nettimesyncboundmode.integer == 6)
+ {
+ cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
+ cl.time = bound(cl.time - 0.002 * cl.movevars_timescale, cl.mtime[1], cl.time + 0.001 * cl.movevars_timescale);
}
}
// this packet probably contains a player entity update, so we will need
// to update the prediction
- cl.movement_needupdate = true;
+ cl.movement_replay = true;
// this may get updated later in parsing by svc_clientdata
cl.onground = false;
// if true the cl.viewangles are interpolated from cl.mviewangles[]
VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
}
-#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(%i)\n", msg_readcount-1, x, cmd);
//[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);
unsigned char cmdlog[32];
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
+ qboolean qwplayerupdatereceived;
// LordHavoc: moved demo message writing from before the packet parse to
// after the packet parse so that CL_Stop_f can be called by cl_autodemo
{
CL_NetworkTimeReceived(realtime); // qw has no clock
- // slightly kill qw player entities each frame
- for (i = 1;i < cl.maxclients;i++)
- cl.entities_active[i] = false;
-
// kill all qw nails
cl.qw_num_nails = 0;
cls.servermovesequence = cls.netcon->qw.incoming_sequence;
+ qwplayerupdatereceived = false;
+
while (1)
{
if (msg_badread)
case qw_svc_serverdata:
//Cbuf_Execute(); // make sure any stuffed commands are done
CL_ParseServerInfo();
- CL_VM_Init(); //[515]: init csqc
break;
case qw_svc_setangle:
break;
case qw_svc_intermission:
+ if(!cl.intermission)
+ cl.completed_time = cl.time;
cl.intermission = 1;
- cl.completed_time = cl.time;
MSG_ReadVector(cl.qw_intermission_origin, cls.protocol);
for (i = 0;i < 3;i++)
cl.qw_intermission_angles[i] = MSG_ReadAngle(cls.protocol);
break;
case qw_svc_finale:
+ if(!cl.intermission)
+ cl.completed_time = cl.time;
cl.intermission = 2;
- cl.completed_time = cl.time;
SCR_CenterPrint(MSG_ReadString ());
break;
break;
case qw_svc_playerinfo:
+ // slightly kill qw player entities now that we know there is
+ // an update of player entities this frame...
+ if (!qwplayerupdatereceived)
+ {
+ qwplayerupdatereceived = true;
+ for (i = 1;i < cl.maxclients;i++)
+ cl.entities_active[i] = false;
+ }
EntityStateQW_ReadPlayerUpdate();
break;
EntityFrameQW_CL_ReadFrame(false);
// first update is the final signon stage
if (cls.signon == SIGNONS - 1)
+ {
cls.signon = SIGNONS;
+ CL_SignonReply ();
+ }
break;
case qw_svc_deltapacketentities:
EntityFrameQW_CL_ReadFrame(true);
// first update is the final signon stage
if (cls.signon == SIGNONS - 1)
+ {
cls.signon = SIGNONS;
+ CL_SignonReply ();
+ }
break;
case qw_svc_maxspeed:
case qw_svc_entgravity:
cl.movevars_entgravity = MSG_ReadFloat();
+ if (!cl.movevars_entgravity)
+ cl.movevars_entgravity = 1.0f;
break;
case qw_svc_setpause:
}
}
- // fully kill the still slightly dead qw player entities each frame,
- // but only if a player update was received
- for (i = 1;i <= cl.maxclients;i++)
- if (cl.entities_active[i])
- break;
- if (i <= cl.maxclients)
+ if (qwplayerupdatereceived)
{
- // kill all non-updated entities this frame
+ // fully kill any player entities that were not updated this frame
for (i = 1;i <= cl.maxclients;i++)
if (!cl.entities_active[i])
cl.entities[i].state_current.active = false;
}
- else
- {
- // no update this frame, restore the cl.entities_active for good measure
- for (i = 1;i <= cl.maxclients;i++)
- cl.entities_active[i] = cl.entities[i].state_current.active;
- }
}
else
{
case svc_serverinfo:
CL_ParseServerInfo ();
- CL_VM_Init(); //[515]: init csqc
break;
case svc_setangle:
if (cl.viewentity >= cl.max_entities)
CL_ExpandEntities(cl.viewentity);
// LordHavoc: assume first setview recieved is the real player entity
- if (!cl.playerentity)
+ if (!cl.realplayerentity)
+ cl.realplayerentity = cl.viewentity;
+ // update cl.playerentity to this one if it is a valid player
+ if (cl.viewentity >= 1 && cl.viewentity <= cl.maxclients)
cl.playerentity = cl.viewentity;
break;
break;
case svc_intermission:
+ if(!cl.intermission)
+ cl.completed_time = cl.time;
cl.intermission = 1;
- cl.completed_time = cl.time;
+ CL_VM_UpdateIntermissionState(cl.intermission);
break;
case svc_finale:
+ if(!cl.intermission)
+ cl.completed_time = cl.time;
cl.intermission = 2;
- cl.completed_time = cl.time;
+ CL_VM_UpdateIntermissionState(cl.intermission);
SCR_CenterPrint(MSG_ReadString ());
break;
case svc_cutscene:
+ if(!cl.intermission)
+ cl.completed_time = cl.time;
cl.intermission = 3;
- cl.completed_time = cl.time;
+ CL_VM_UpdateIntermissionState(cl.intermission);
SCR_CenterPrint(MSG_ReadString ());
break;
case svc_pointparticles:
CL_ParsePointParticles();
break;
+ case svc_pointparticles1:
+ CL_ParsePointParticles1();
+ break;
}
}
}
if (gamemode == GAME_NEHAHRA)
Cvar_SetValue("demo_nehahra", 1);
Cvar_RegisterVariable(&developer_networkentities);
+ Cvar_RegisterVariable(&cl_gameplayfix_soundsmovewithentities);
Cvar_RegisterVariable(&cl_sound_wizardhit);
Cvar_RegisterVariable(&cl_sound_hknighthit);
projects / xonotic / darkplaces.git / blobdiff