X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=cl_parse.c;h=923e48e734ad8471ead538b2f1f6783e19fc8f30;hb=200d1d9cb52e8a7e6e4cbd470b620d91b7b9637a;hp=acacc542d9270e7258c3106af0bea7e6f9bb3486;hpb=467aa32eac3892acd8eca4c1e0f653e8b4cf61c4;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index acacc542..923e48e7 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -20,12 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // 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" #include "utf8lib.h" +#ifdef CONFIG_MENU #include "menu.h" +#endif #include "cl_video.h" const char *svc_strings[128] = @@ -223,7 +227,7 @@ static void CL_ParseStartSoundPacket(int largesoundindex) attenuation = MSG_ReadByte(&cl_message) / 64.0; else attenuation = DEFAULT_SOUND_PACKET_ATTENUATION; - + speed = 1.0f; ent = (channel>>3)&1023; @@ -272,7 +276,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; @@ -368,7 +372,7 @@ void CL_KeepaliveMessage (qboolean readmessages) msg.data = buf; msg.maxsize = sizeof(buf); MSG_WriteChar(&msg, clc_nop); - NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, false); + NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, 0, false); } recursive = thisrecursive; @@ -376,6 +380,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 +409,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 +465,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 +519,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 +586,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 +1045,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 +1239,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 +1396,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 +1418,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) @@ -1409,7 +1434,7 @@ static void CL_StopDownload(int size, int crc) { if(cls.caughtcsprogsdata) Mem_Free(cls.caughtcsprogsdata); - cls.caughtcsprogsdata = Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorycursize); + cls.caughtcsprogsdata = (unsigned char *) Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorycursize); memcpy(cls.caughtcsprogsdata, cls.qw_downloadmemory, cls.qw_downloadmemorycursize); cls.caughtcsprogsdatasize = cls.qw_downloadmemorycursize; Con_DPrintf("Buffered \"%s\"\n", name); @@ -1553,6 +1578,9 @@ static void CL_SendPlayerInfo(void) MSG_WriteByte (&cls.netcon->message, clc_stringcmd); MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "rate %i", cl_rate.integer)); + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "rate_burstsize %i", cl_rate_burstsize.integer)); + if (cl_pmodel.integer) { MSG_WriteByte (&cls.netcon->message, clc_stringcmd); @@ -2210,7 +2238,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_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); @@ -2858,6 +2893,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); @@ -2872,7 +2909,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: @@ -2917,7 +2954,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) @@ -3003,9 +3040,12 @@ static void CL_IPLog_Add(const char *address, const char *name, qboolean checkex // add it to the iplog.txt file // TODO: this ought to open the one in the userpath version of the base // gamedir, not the current gamedir +// not necessary for mobile +#ifndef DP_MOBILETOUCH Log_Printf(cl_iplog_name.string, "%s %s\n", address, name); if (developer_extra.integer) Con_DPrintf("CL_IPLog_Add: appending this line to %s: %s %s\n", cl_iplog_name.string, address, name); +#endif } } @@ -3020,7 +3060,12 @@ static void CL_IPLog_Load(void) cl_iplog_loaded = true; // TODO: this ought to open the one in the userpath version of the base // gamedir, not the current gamedir +// not necessary for mobile +#ifndef DP_MOBILETOUCH filedata = FS_LoadFile(cl_iplog_name.string, tempmempool, true, &filesize); +#else + filedata = NULL; +#endif if (!filedata) return; text = (char *)filedata; @@ -3597,10 +3642,12 @@ void CL_ParseServerMessage(void) 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: @@ -3719,10 +3766,12 @@ void CL_ParseServerMessage(void) 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; } @@ -4046,10 +4095,12 @@ void CL_ParseServerMessage(void) 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; @@ -4096,10 +4147,12 @@ void CL_ParseServerMessage(void) 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: