// cl_parse.c -- parse a message received from the server
#include "quakedef.h"
-#ifdef CONFIG_CD
#include "cdaudio.h"
-#endif
#include "cl_collision.h"
#include "csprogs.h"
#include "libcurl.h"
vec3_t pos;
int channel, ent;
int sound_num;
- int volume;
+ int nvolume;
int field_mask;
float attenuation;
float speed;
channel = MSG_ReadShort(&cl_message);
if (channel & (1<<15))
- volume = MSG_ReadByte(&cl_message);
+ nvolume = MSG_ReadByte(&cl_message);
else
- volume = DEFAULT_SOUND_PACKET_VOLUME;
+ nvolume = DEFAULT_SOUND_PACKET_VOLUME;
if (channel & (1<<14))
attenuation = MSG_ReadByte(&cl_message) / 64.0;
else
attenuation = DEFAULT_SOUND_PACKET_ATTENUATION;
-
+
speed = 1.0f;
ent = (channel>>3)&1023;
field_mask = MSG_ReadByte(&cl_message);
if (field_mask & SND_VOLUME)
- volume = MSG_ReadByte(&cl_message);
+ nvolume = MSG_ReadByte(&cl_message);
else
- volume = DEFAULT_SOUND_PACKET_VOLUME;
+ nvolume = DEFAULT_SOUND_PACKET_VOLUME;
if (field_mask & SND_ATTENUATION)
attenuation = MSG_ReadByte(&cl_message) / 64.0;
MSG_ReadVector(&cl_message, pos, cls.protocol);
- if (sound_num >= MAX_SOUNDS)
+ if (sound_num < 0 || sound_num >= MAX_SOUNDS)
{
Con_Printf("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS);
return;
if (ent >= cl.max_entities)
CL_ExpandEntities(ent);
- if( !CL_VM_Event_Sound(sound_num, volume / 255.0f, channel, attenuation, ent, pos, fflags, speed) )
- S_StartSound_StartPosition_Flags (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation, 0, fflags, speed);
+ if( !CL_VM_Event_Sound(sound_num, nvolume / 255.0f, channel, attenuation, ent, pos, fflags, speed) )
+ S_StartSound_StartPosition_Flags (ent, channel, cl.sound_precache[sound_num], pos, nvolume/255.0f, attenuation, 0, fflags, speed);
}
/*
unsigned char buf[4];
countdownmsg = 5;
// write out a nop
- // LordHavoc: must use unreliable because reliable could kill the sigon message!
+ // LadyHavoc: 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;
void CL_ParseEntityLump(char *entdata)
{
+ qboolean loadedsky = false;
const char *data;
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)
+ FOG_clear(); // LadyHavoc: no fog until set
+ // LadyHavoc: default to the map's sky (q3 shader parsing sets this)
R_SetSkyBox(cl.worldmodel->brush.skybox);
data = entdata;
if (!data)
return; // error
strlcpy (value, com_token, sizeof (value));
if (!strcmp("sky", key))
+ {
+ loadedsky = true;
R_SetSkyBox(value);
+ }
else if (!strcmp("skyname", key)) // non-standard, introduced by QuakeForge... sigh.
+ {
+ loadedsky = true;
R_SetSkyBox(value);
+ }
else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
+ {
+ loadedsky = true;
R_SetSkyBox(value);
+ }
else if (!strcmp("fog", key))
{
FOG_clear(); // so missing values get good defaults
r_refdef.fog_height_texturename[63] = 0;
}
}
+
+ if (!loadedsky && cl.worldmodel->brush.isq2bsp)
+ R_SetSkyBox("unit1_");
}
static const vec3_t defaultmins = {-4096, -4096, -4096};
// clear name of file that just finished
cls.qw_downloadname[0] = 0;
+ // skip the download fragment if playing a demo
+ if (!cls.netcon)
+ {
+ return;
+ }
+
switch (cls.qw_downloadtype)
{
case dl_single:
{
for (j = 0;j < 6;j++)
bits[j] = MSG_ReadByte(&cl_message);
- if (cl.qw_num_nails > 255)
+ if (cl.qw_num_nails >= 255)
continue;
v = cl.qw_nails[cl.qw_num_nails++];
v[0] = ( ( bits[0] + ((bits[1]&15)<<8) ) <<1) - 4096;
// finished loading sounds
}
- if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+ if(IS_NEXUIZ_DERIVED(gamemode))
Cvar_SetValueQuick(&cl_serverextension_download, false);
// in Nexuiz/Xonotic, the built in download protocol is kinda broken (misses lots
// of dependencies) anyway, and can mess around with the game directory;
{
Con_Printf("Inflated download: new size: %u (%g%%)\n", (unsigned)inflated_size, 100.0 - 100.0*(cls.qw_downloadmemorycursize / (float)inflated_size));
cls.qw_downloadmemory = out;
- cls.qw_downloadmemorycursize = inflated_size;
+ cls.qw_downloadmemorycursize = (int)inflated_size;
}
else
{
// save to disk only if we don't already have it
// (this is mainly for playing back demos)
existingcrc = FS_CRCFile(cls.qw_downloadname, &existingsize);
- if (existingsize || gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC || !strcmp(cls.qw_downloadname, csqc_progname.string))
+ if (existingsize || IS_NEXUIZ_DERIVED(gamemode) || !strcmp(cls.qw_downloadname, csqc_progname.string))
// let csprogs ALWAYS go to dlcache, to prevent "viral csprogs"; also, never put files outside dlcache for Nexuiz/Xonotic
{
if ((int)existingsize != size || existingcrc != crc)
case 2:
if (cls.netcon)
{
- // LordHavoc: quake sent the player info here but due to downloads
+ // LadyHavoc: quake sent the player info here but due to downloads
// it is sent earlier instead
// CL_SendPlayerInfo();
- // LordHavoc: changed to begin a loading stage and issue this when done
+ // LadyHavoc: changed to begin a loading stage and issue this when done
MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
MSG_WriteString (&cls.netcon->message, "spawn");
}
}
}
- // LordHavoc: hipnotic demos don't have this bit set but should
+ // LadyHavoc: 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_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_message);
cl.stats[STAT_NAILS] = MSG_ReadByte(&cl_message);
cl.stats[STAT_ROCKETS] = MSG_ReadByte(&cl_message);
cl.stats[STAT_CELLS] = MSG_ReadByte(&cl_message);
- if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_QUOTH || gamemode == GAME_NEXUIZ)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_QUOTH || IS_OLDNEXUIZ_DERIVED(gamemode))
cl.stats[STAT_ACTIVEWEAPON] = (1<<MSG_ReadByte(&cl_message));
else
cl.stats[STAT_ACTIVEWEAPON] = MSG_ReadByte(&cl_message);
sound_num = (unsigned short) MSG_ReadShort(&cl_message);
else
sound_num = MSG_ReadByte(&cl_message);
+
+ if (sound_num < 0 || sound_num >= MAX_SOUNDS)
+ {
+ Con_Printf("CL_ParseStaticSound: sound_num(%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS);
+ return;
+ }
+
vol = MSG_ReadByte(&cl_message);
atten = MSG_ReadByte(&cl_message);
S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
}
break;
- // LordHavoc: added for improved blood splatters
+ // LadyHavoc: added for improved blood splatters
case TE_BLOOD:
// blood puff
MSG_ReadVector(&cl_message, pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
CL_ParticleEffect(EFFECT_TE_PLASMABURN, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
- // LordHavoc: added for improved gore
+ // LadyHavoc: added for improved gore
case TE_BLOODSHOWER:
// vaporized body
MSG_ReadVector(&cl_message, pos, cls.protocol); // mins
break;
// PGM 01/21/97
- // LordHavoc: for compatibility with the Nehahra movie...
+ // LadyHavoc: for compatibility with the Nehahra movie...
case TE_LIGHTNING4NEH:
CL_ParseBeam(Mod_ForName(MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), true, false, NULL), false);
break;
CL_FindNonSolidLocation(pos, pos, 10);
colorStart = MSG_ReadByte(&cl_message);
colorLength = MSG_ReadByte(&cl_message);
+ if (colorLength == 0)
+ colorLength = 1;
CL_ParticleExplosion2(pos, colorStart, colorLength);
tempcolor = palette_rgb[(rand()%colorLength) + colorStart];
color[0] = tempcolor[0] * (2.0f / 255.0f);
qboolean strip_pqc;
char vabuf[1024];
- // LordHavoc: moved demo message writing from before the packet parse to
+ // LadyHavoc: 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
// code in CL_ParseServerinfo
//if (cls.demorecording)
cmdlogname[cmdindex] = qw_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;
+ // LadyHavoc: 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)
+ const char *d = "<unknown>";
+ cmdlogname[cmdindex] = d;
}
// other commands
{
default:
{
- char description[32*64], temp[64];
+ char description[32*64], logtemp[64];
int count;
strlcpy(description, "packet dump: ", sizeof(description));
i = cmdcount - 32;
i &= 31;
while(count > 0)
{
- dpsnprintf(temp, sizeof(temp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
- strlcat(description, temp, sizeof(description));
+ dpsnprintf(logtemp, sizeof(logtemp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
+ strlcat(description, logtemp, sizeof(description));
count--;
i++;
i &= 31;
case qw_svc_cdtrack:
cl.cdtrack = cl.looptrack = MSG_ReadByte(&cl_message);
-#ifdef CONFIG_CD
if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) )
CDAudio_Play ((unsigned char)cls.forcetrack, true);
else
CDAudio_Play ((unsigned char)cl.cdtrack, true);
-#endif
break;
case qw_svc_intermission:
case qw_svc_setpause:
cl.paused = MSG_ReadByte(&cl_message) != 0;
-#ifdef CONFIG_CD
if (cl.paused)
CDAudio_Pause ();
else
CDAudio_Resume ();
-#endif
S_PauseGameSounds (cl.paused);
break;
}
// 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)
+ // LadyHavoc: 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 = "entity";
cmdlogname[cmdindex] = temp;
SHOWNET("fast update");
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;
+ // LadyHavoc: 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)
+ const char *d = "<unknown>";
+ cmdlogname[cmdindex] = d;
}
// other commands
{
default:
{
- char description[32*64], temp[64];
+ char description[32*64], tempdesc[64];
int count;
strlcpy (description, "packet dump: ", sizeof(description));
i = cmdcount - 32;
i &= 31;
while(count > 0)
{
- dpsnprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
- strlcat (description, temp, sizeof (description));
+ dpsnprintf (tempdesc, sizeof (tempdesc), "%3i:%s ", cmdlog[i], cmdlogname[i]);
+ strlcat (description, tempdesc, sizeof (description));
count--;
i++;
i &= 31;
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
+ // LadyHavoc: assume first setview recieved is the real player entity
if (!cl.realplayerentity)
cl.realplayerentity = cl.viewentity;
// update cl.playerentity to this one if it is a valid player
}
else
{
- int i = (unsigned short)MSG_ReadShort(&cl_message);
- char *s = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring));
+ char *s;
+ i = (unsigned short)MSG_ReadShort(&cl_message);
+ s = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring));
if (i < 32768)
{
if (i >= 1 && i < MAX_MODELS)
case svc_setpause:
cl.paused = MSG_ReadByte(&cl_message) != 0;
-#ifdef CONFIG_CD
if (cl.paused)
CDAudio_Pause ();
else
CDAudio_Resume ();
-#endif
S_PauseGameSounds (cl.paused);
break;
case svc_signonnum:
i = MSG_ReadByte(&cl_message);
- // LordHavoc: it's rude to kick off the client if they missed the
+ // LadyHavoc: 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);
case svc_cdtrack:
cl.cdtrack = MSG_ReadByte(&cl_message);
cl.looptrack = MSG_ReadByte(&cl_message);
-#ifdef CONFIG_CD
if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) )
CDAudio_Play ((unsigned char)cls.forcetrack, true);
else
CDAudio_Play ((unsigned char)cl.cdtrack, true);
-#endif
break;
case svc_intermission:
parsingerror = false;
- // LordHavoc: this was at the start of the function before cl_autodemo was
+ // LadyHavoc: this was at the start of the function before cl_autodemo was
// implemented
if (cls.demorecording)
{
projects / xonotic / darkplaces.git / blobdiff