X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=4d4c2f645cc085fe3f2f1744251edffa116a58f6;hp=c16b8eaae4d45bc3a644e3c824c6f4f6a6774200;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=9804c2369e4ac79331fc05bf37655bdf76457f2d diff --git a/cl_parse.c b/cl_parse.c index c16b8eaa..4d4c2f64 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -25,7 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "csprogs.h" #include "libcurl.h" #include "utf8lib.h" +#ifdef CONFIG_MENU #include "menu.h" +#endif #include "cl_video.h" const char *svc_strings[128] = @@ -204,7 +206,7 @@ static void CL_ParseStartSoundPacket(int largesoundindex) vec3_t pos; int channel, ent; int sound_num; - int volume; + int nvolume; int field_mask; float attenuation; float speed; @@ -215,15 +217,15 @@ static void CL_ParseStartSoundPacket(int largesoundindex) 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; @@ -236,9 +238,9 @@ static void CL_ParseStartSoundPacket(int largesoundindex) 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; @@ -272,7 +274,7 @@ static void CL_ParseStartSoundPacket(int largesoundindex) 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; @@ -287,8 +289,8 @@ static void CL_ParseStartSoundPacket(int largesoundindex) 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); } /* @@ -376,6 +378,7 @@ void CL_KeepaliveMessage (qboolean readmessages) void CL_ParseEntityLump(char *entdata) { + qboolean loadedsky = false; const char *data; char key[128], value[MAX_INPUTLINE]; FOG_clear(); // LordHavoc: no fog until set @@ -404,11 +407,20 @@ void CL_ParseEntityLump(char *entdata) 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 @@ -451,6 +463,9 @@ void CL_ParseEntityLump(char *entdata) r_refdef.fog_height_texturename[63] = 0; } } + + if (!loadedsky && cl.worldmodel->brush.isq2bsp) + R_SetSkyBox("unit1_"); } static const vec3_t defaultmins = {-4096, -4096, -4096}; @@ -502,8 +517,10 @@ static void CL_SetupWorldModel(void) // check memory integrity Mem_CheckSentinelsGlobal(); +#ifdef CONFIG_MENU // make menu know MR_NewMap(); +#endif // load the csqc now if (cl.loadcsqc) @@ -567,6 +584,12 @@ static void QW_CL_RequestNextDownload(void) // 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: @@ -1020,7 +1043,7 @@ static void QW_CL_ParseNails(void) { 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; @@ -1214,7 +1237,7 @@ static void CL_BeginDownloads(qboolean aborteddownload) // 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; @@ -1371,7 +1394,7 @@ static void CL_StopDownload(int size, int crc) { 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 { @@ -1393,7 +1416,7 @@ static void CL_StopDownload(int size, int crc) // 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) @@ -2213,7 +2236,7 @@ static void CL_ParseClientdata (void) 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<= 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); @@ -2861,6 +2891,8 @@ static void CL_ParseTempEntity(void) 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); @@ -2875,7 +2907,7 @@ static void CL_ParseTempEntity(void) MSG_ReadVector(&cl_message, pos, cls.protocol); MSG_ReadVector(&cl_message, pos2, cls.protocol); MSG_ReadVector(&cl_message, dir, cls.protocol); - CL_ParticleEffect(EFFECT_TE_TEI_G3, 1, pos, pos2, dir, dir, NULL, 0); + CL_ParticleTrail(EFFECT_TE_TEI_G3, 1, pos, pos2, dir, dir, NULL, 0, true, true, NULL, NULL, 1); break; case TE_TEI_SMOKE: @@ -2920,7 +2952,7 @@ static void CL_ParseTrailParticles(void) effectindex = (unsigned short)MSG_ReadShort(&cl_message); MSG_ReadVector(&cl_message, start, cls.protocol); MSG_ReadVector(&cl_message, end, cls.protocol); - CL_ParticleEffect(effectindex, 1, start, end, vec3_origin, vec3_origin, entityindex > 0 ? cl.entities + entityindex : NULL, 0); + CL_ParticleTrail(effectindex, 1, start, end, vec3_origin, vec3_origin, entityindex > 0 ? cl.entities + entityindex : NULL, 0, true, true, NULL, NULL, 1); } static void CL_ParsePointParticles(void) @@ -3428,8 +3460,8 @@ void CL_ParseServerMessage(void) 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 = ""; - cmdlogname[cmdindex] = temp; + const char *d = ""; + cmdlogname[cmdindex] = d; } // other commands @@ -3437,7 +3469,7 @@ void CL_ParseServerMessage(void) { default: { - char description[32*64], temp[64]; + char description[32*64], logtemp[64]; int count; strlcpy(description, "packet dump: ", sizeof(description)); i = cmdcount - 32; @@ -3447,8 +3479,8 @@ void CL_ParseServerMessage(void) 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; @@ -3789,8 +3821,8 @@ void CL_ParseServerMessage(void) 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 = ""; - cmdlogname[cmdindex] = temp; + const char *d = ""; + cmdlogname[cmdindex] = d; } // other commands @@ -3798,7 +3830,7 @@ void CL_ParseServerMessage(void) { default: { - char description[32*64], temp[64]; + char description[32*64], tempdesc[64]; int count; strlcpy (description, "packet dump: ", sizeof(description)); i = cmdcount - 32; @@ -3808,8 +3840,8 @@ void CL_ParseServerMessage(void) 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; @@ -3960,8 +3992,9 @@ void CL_ParseServerMessage(void) } 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)