#include "quakedef.h"
-char *svc_strings[] =
+char *svc_strings[128] =
{
"svc_bad",
"svc_nop",
"?", // 48
"?", // 49
"svc_farclip", // [coord] size
- "svc_fog", // [byte] enable <optional past this point, only included if enable is true> [short * 4096] density [byte] red [byte] green [byte] blue
+ "svc_fog", // [byte] enable <optional past this point, only included if enable is true> [short] density*4096 [byte] red [byte] green [byte] blue
"svc_playerposition" // [float] x [float] y [float] z
};
extern qboolean isworldmodel;
extern char skyname[];
-extern float fog_density;
-extern float fog_red;
-extern float fog_green;
-extern float fog_blue;
extern void R_SetSkyBox (char *sky);
extern void FOG_clear();
extern cvar_t r_farclip;
// parse protocol version number
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != 250)
+ if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
{
- Con_Printf ("Server returned version %i, not %i", i, PROTOCOL_VERSION);
+ Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
return;
}
Nehahrademcompatibility = false;
Con_Printf ("Server sent too many model precaches\n");
return;
}
+ if (strlen(str) >= MAX_QPATH)
+ Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (model_precache[nummodels], str);
Mod_TouchModel (str);
}
Con_Printf ("Server sent too many sound precaches\n");
return;
}
+ if (strlen(str) >= MAX_QPATH)
+ Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (sound_precache[numsounds], str);
S_TouchSound (str);
}
relinked. Other attributes can change without relinking.
==================
*/
-//int bitcounts[16];
-
void CL_ParseUpdate (int bits)
{
- int i, modnum, num, skin, alpha, scale, glowsize, glowcolor, colormod;
+ int i, modnum, num, alpha, scale, glowsize, glowcolor, colormod;
model_t *model;
qboolean forcelink;
entity_t *ent;
}
if (bits & U_MOREBITS)
- {
- i = MSG_ReadByte ();
- bits |= (i<<8);
- }
+ bits |= (MSG_ReadByte()<<8);
if (bits & U_EXTEND1 && !Nehahrademcompatibility)
{
bits |= MSG_ReadByte() << 16;
ent = CL_EntityNum (num);
-//for (i=0 ; i<16 ; i++)
-//if (bits&(1<<i))
-// bitcounts[i]++;
-
forcelink = ent->msgtime != cl.mtime[1]; // no previous frame to lerp from
ent->msgtime = cl.mtime[0];
if (bits & U_DELTA)
baseline = &ent->deltabaseline;
+ if (forcelink)
+ {
+ ent->deltabaseline.origin[0] = ent->deltabaseline.origin[1] = ent->deltabaseline.origin[2] = 0;
+ ent->deltabaseline.angles[0] = ent->deltabaseline.angles[1] = ent->deltabaseline.angles[2] = 0;
+ ent->deltabaseline.effects = 0;
+ ent->deltabaseline.modelindex = 0;
+ ent->deltabaseline.frame = 0;
+ ent->deltabaseline.colormap = 0;
+ ent->deltabaseline.skin = 0;
+ ent->deltabaseline.alpha = 255;
+ ent->deltabaseline.scale = 16;
+ ent->deltabaseline.glowsize = 0;
+ ent->deltabaseline.glowcolor = 254;
+ ent->deltabaseline.colormod = 255;
+ }
+
modnum = bits & U_MODEL ? MSG_ReadByte() : baseline->modelindex;
if (modnum >= MAX_MODELS)
Host_Error ("CL_ParseModel: bad modnum");
ent->colormap = cl.scores[i-1].colors; // color it
}
- skin = bits & U_SKIN ? MSG_ReadByte() : baseline->skin;
- if (skin != ent->skinnum)
- {
- ent->skinnum = skin;
- }
- ent->deltabaseline.skin = skin;
+ ent->deltabaseline.skin = ent->skinnum = bits & U_SKIN ? MSG_ReadByte() : baseline->skin;
ent->effects = ((bits & U_EFFECTS) ? MSG_ReadByte() : (baseline->effects & 0xFF));
cl.mvelocity[0][i] = 0;
}
-// [always sent] if (bits & SU_ITEMS)
- i = MSG_ReadLong ();
-
+ i = MSG_ReadLong ();
if (cl.items != i)
{ // set flash times
-// Sbar_Changed ();
for (j=0 ; j<32 ; j++)
if ( (i & (1<<j)) && !(cl.items & (1<<j)))
cl.item_gettime[j] = cl.time;
cl.onground = (bits & SU_ONGROUND) != 0;
cl.inwater = (bits & SU_INWATER) != 0;
- if (bits & SU_WEAPONFRAME)
- cl.stats[STAT_WEAPONFRAME] = MSG_ReadByte ();
- else
- cl.stats[STAT_WEAPONFRAME] = 0;
-
- if (bits & SU_ARMOR)
- i = MSG_ReadByte ();
- else
- i = 0;
- if (cl.stats[STAT_ARMOR] != i)
- {
- cl.stats[STAT_ARMOR] = i;
-// Sbar_Changed ();
- }
+ cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_HEALTH] = MSG_ReadShort();
+ cl.stats[STAT_AMMO] = MSG_ReadByte();
- if (bits & SU_WEAPON)
- i = MSG_ReadByte ();
- else
- i = 0;
- if (cl.stats[STAT_WEAPON] != i)
- {
- cl.stats[STAT_WEAPON] = i;
-// Sbar_Changed ();
- }
-
- i = MSG_ReadShort ();
- if (cl.stats[STAT_HEALTH] != i)
- {
- cl.stats[STAT_HEALTH] = i;
-// Sbar_Changed ();
- }
-
- i = MSG_ReadByte ();
- if (cl.stats[STAT_AMMO] != i)
- {
- cl.stats[STAT_AMMO] = i;
-// Sbar_Changed ();
- }
-
- for (i=0 ; i<4 ; i++)
- {
- j = MSG_ReadByte ();
- if (cl.stats[STAT_SHELLS+i] != j)
- {
- cl.stats[STAT_SHELLS+i] = j;
-// Sbar_Changed ();
- }
- }
+ 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 (standard_quake)
- {
- if (cl.stats[STAT_ACTIVEWEAPON] != i)
- {
- cl.stats[STAT_ACTIVEWEAPON] = i;
-// Sbar_Changed ();
- }
- }
+ cl.stats[STAT_ACTIVEWEAPON] = i;
else
- {
- if (cl.stats[STAT_ACTIVEWEAPON] != (1<<i))
- {
- cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
-// Sbar_Changed ();
- }
- }
+ cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
}
/*
extern void SHOWLMP_decodeshow();
extern void R_SetSkyBox(char* sky);
-extern float fog_density;
-extern float fog_red;
-extern float fog_green;
-extern float fog_blue;
-
/*
=====================
CL_ParseServerMessage
{
int cmd;
int i;
+ byte cmdlog[32];
+ char *cmdlogname[32], *temp;
+ int cmdindex, cmdcount = 0;
//
// if recording demos, copy the message out
return; // end of message
}
- // if the high bit of the command byte is set, it is a fast update
+ cmdindex = cmdcount & 31;
+ cmdcount++;
+ cmdlog[cmdindex] = cmd;
+
+ // if the high bit of the command byte is set, it is a fast update
if (cmd & 128)
{
+ // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer)
+ temp = "svc_entity";
+ cmdlogname[cmdindex] = temp;
SHOWNET("fast update");
CL_ParseUpdate (cmd&127);
continue;
}
SHOWNET(svc_strings[cmd]);
+ cmdlogname[cmdindex] = svc_strings[cmd];
+ if (!cmdlogname[cmdindex])
+ {
+ // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer)
+ temp = "<unknown>";
+ cmdlogname[cmdindex] = temp;
+ }
- // other commands
+ // other commands
switch (cmd)
{
default:
- Host_Error ("CL_ParseServerMessage: Illegible server message\n");
+ {
+ char description[32*64], temp[64];
+ int count;
+ strcpy(description, "packet dump: ");
+ i = cmdcount - 32;
+ if (i < 0)
+ i = 0;
+ count = cmdcount - i;
+ i &= 31;
+ while(count > 0)
+ {
+ sprintf(temp, "%3i:%s ", cmdlog[i], cmdlogname[i]);
+ strcat(description, temp);
+ count--;
+ i++;
+ i &= 31;
+ }
+ description[strlen(description)-1] = '\n'; // replace the last space with a newline
+ Con_Printf(description);
+ Host_Error ("CL_ParseServerMessage: Illegible server message\n");
+ }
break;
case svc_nop:
break;
case svc_updatename:
-// Sbar_Changed ();
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatename > MAX_SCOREBOARD");
break;
case svc_updatefrags:
-// Sbar_Changed ();
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatefrags > MAX_SCOREBOARD");
break;
case svc_updatecolors:
-// Sbar_Changed ();
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatecolors > MAX_SCOREBOARD");
break;
case svc_setpause:
- {
- cl.paused = MSG_ReadByte ();
-
- if (cl.paused)
- CDAudio_Pause ();
- else
- CDAudio_Resume ();
- }
+ cl.paused = MSG_ReadByte ();
+ if (cl.paused)
+ CDAudio_Pause ();
+ else
+ CDAudio_Resume ();
break;
case svc_signonnum:
projects / xonotic / darkplaces.git / blobdiff