X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=e49f1c3c44843677b233d5f83ba341cf12257160;hb=a2445d85eccf4d0c5766f44f02cd04a600c4bad4;hp=c2268e5c4911a9d2a149e77576cc00efc8d1e505;hpb=83b77bee53d11d3e694f34e242e15cacdce188cd;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index c2268e5c..e49f1c3c 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -20,6 +20,8 @@ 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" +#include "cdaudio.h" +#include "cl_collision.h" char *svc_strings[128] = { @@ -48,11 +50,11 @@ char *svc_strings[128] = "svc_updatecolors", // [byte] [byte] "svc_particle", // [vec3] "svc_damage", // [byte] impact [byte] blood [vec3] from - + "svc_spawnstatic", "OBSOLETE svc_spawnbinary", "svc_spawnbaseline", - + "svc_temp_entity", // "svc_setpause", "svc_signonnum", @@ -80,55 +82,24 @@ char *svc_strings[128] = "", // 47 "", // 48 "", // 49 - "", // 50 - "svc_fog", // 51 - "svc_effect", // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate - "svc_effect2", // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate + "svc_cgame", // 50 // [short] length [bytes] data + "svc_unusedlh1", // 51 // unused + "svc_effect", // 52 // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate + "svc_effect2", // 53 // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate + "svc_sound2", // 54 // short soundindex instead of byte + "svc_spawnbaseline2", // 55 // short modelindex instead of byte + "svc_spawnstatic2", // 56 // short modelindex instead of byte + "svc_entities", // 57 // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata + "svc_unusedlh3", // 58 + "svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten }; //============================================================================= cvar_t demo_nehahra = {0, "demo_nehahra", "0"}; +cvar_t developer_networkentities = {0, "developer_networkentities", "0"}; -void CL_Parse_Init(void) -{ - // LordHavoc: added demo_nehahra cvar - Cvar_RegisterVariable (&demo_nehahra); - if (gamemode == GAME_NEHAHRA) - Cvar_SetValue("demo_nehahra", 1); -} - -qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments -qboolean dpprotocol; // LordHavoc: whether or not the current network stream is the enhanced DarkPlaces protocol - -/* -=============== -CL_EntityNum - -This error checks and tracks the total number of entities -=============== -*/ -entity_t *CL_EntityNum (int num) -{ - /* - if (num >= cl.num_entities) - { - if (num >= MAX_EDICTS) - Host_Error ("CL_EntityNum: %i is an invalid number",num); - cl.num_entities = num; -// while (cl.num_entities <= num) -// { -// cl_entities[cl.num_entities].colormap = -1; // no special coloring -// cl.num_entities++; -// } - } - */ - if (num >= MAX_EDICTS) - Host_Error ("CL_EntityNum: %i is an invalid number",num); - - return &cl_entities[num]; -} - +mempool_t *cl_scores_mempool; /* ================== @@ -137,28 +108,38 @@ CL_ParseStartSoundPacket */ void CL_ParseStartSoundPacket(int largesoundindex) { - vec3_t pos; - int channel, ent; - int sound_num; - int volume; - int field_mask; - float attenuation; - int i; - - field_mask = MSG_ReadByte(); - - if (field_mask & SND_VOLUME) + vec3_t pos; + int channel, ent; + int sound_num; + int volume; + int field_mask; + float attenuation; + + field_mask = MSG_ReadByte(); + + if (field_mask & SND_VOLUME) volume = MSG_ReadByte (); else volume = DEFAULT_SOUND_PACKET_VOLUME; - - if (field_mask & SND_ATTENUATION) + + if (field_mask & SND_ATTENUATION) attenuation = MSG_ReadByte () / 64.0; else attenuation = DEFAULT_SOUND_PACKET_ATTENUATION; - - channel = MSG_ReadShort (); - if (largesoundindex) + + if (field_mask & SND_LARGEENTITY) + { + ent = (unsigned short) MSG_ReadShort (); + channel = MSG_ReadByte (); + } + else + { + channel = (unsigned short) MSG_ReadShort (); + ent = channel >> 3; + channel &= 7; + } + + if (largesoundindex || field_mask & SND_LARGESOUND) sound_num = (unsigned short) MSG_ReadShort (); else sound_num = MSG_ReadByte (); @@ -166,17 +147,14 @@ void CL_ParseStartSoundPacket(int largesoundindex) if (sound_num >= MAX_SOUNDS) Host_Error("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS); - ent = channel >> 3; - channel &= 7; - if (ent > MAX_EDICTS) + if (ent >= MAX_EDICTS) Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent); - - for (i=0 ; i<3 ; i++) - pos[i] = MSG_ReadCoord (); - S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation); -} + MSG_ReadVector(pos, cl.protocol); + + S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation); +} /* ================== @@ -186,211 +164,80 @@ When the client is taking a long time to load stuff, send keepalive messages so the server doesn't disconnect. ================== */ + +static qbyte olddata[NET_MAXMESSAGE]; void CL_KeepaliveMessage (void) { - float time; + float time; static float lastmsg; - int ret; - sizebuf_t old; - byte olddata[8192]; - - if (sv.active) - return; // no need if server is local - if (cls.demoplayback) + int oldreadcount; + qboolean oldbadread; + sizebuf_t old; + + // no need if server is local and definitely not if this is a demo + if (sv.active || cls.demoplayback) return; // read messages from server, should just be nops + oldreadcount = msg_readcount; + oldbadread = msg_badread; old = net_message; - memcpy (olddata, net_message.data, net_message.cursize); - - do - { - ret = CL_GetMessage (); - switch (ret) - { - default: - Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed"); - case 0: - break; // nothing waiting - case 1: - Host_Error ("CL_KeepaliveMessage: received a message"); - break; - case 2: - if (MSG_ReadByte() != svc_nop) - Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop"); - break; - } - } while (ret); - - net_message = old; - memcpy (net_message.data, olddata, net_message.cursize); - -// check time - time = Sys_DoubleTime (); - if (time - lastmsg < 5) - return; - lastmsg = time; + memcpy(olddata, net_message.data, net_message.cursize); -// write out a nop - Con_Printf ("--> client to server keepalive\n"); + NetConn_ClientFrame(); - MSG_WriteByte (&cls.message, clc_nop); - NET_SendMessage (cls.netcon, &cls.message); - SZ_Clear (&cls.message); -} + msg_readcount = oldreadcount; + msg_badread = oldbadread; + net_message = old; + memcpy(net_message.data, olddata, net_message.cursize); -void CL_ParseEntityLump(char *entdata) -{ - char *data; - char key[128], value[4096]; - FOG_clear(); // LordHavoc: no fog until set - R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set - data = entdata; - if (!data) - return; - data = COM_Parse(data); - if (!data) - return; // error - if (com_token[0] != '{') - return; // error - while (1) + if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5) { - data = COM_Parse(data); - if (!data) - return; // error - if (com_token[0] == '}') - break; // end of worldspawn - if (com_token[0] == '_') - strcpy(key, com_token + 1); - else - strcpy(key, com_token); - while (key[strlen(key)-1] == ' ') // remove trailing spaces - key[strlen(key)-1] = 0; - data = COM_Parse(data); - if (!data) - return; // error - strcpy(value, com_token); - if (!strcmp("sky", key)) - R_SetSkyBox(value); - else if (!strcmp("skyname", key)) // non-standard, introduced by QuakeForge... sigh. - R_SetSkyBox(value); - 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", &fog_density, &fog_red, &fog_green, &fog_blue); - else if (!strcmp("fog_density", key)) - fog_density = atof(value); - else if (!strcmp("fog_red", key)) - fog_red = atof(value); - else if (!strcmp("fog_green", key)) - fog_green = atof(value); - else if (!strcmp("fog_blue", key)) - fog_blue = atof(value); + sizebuf_t msg; + qbyte buf[4]; + lastmsg = time; + // write out a nop + // LordHavoc: must use unreliable because reliable could kill the sigon message! + Con_Print("--> client to server keepalive\n"); + msg.data = buf; + msg.maxsize = sizeof(buf); + msg.cursize = 0; + MSG_WriteChar(&msg, svc_nop); + NetConn_SendUnreliableMessage(cls.netcon, &msg); + // try not to utterly crush the computer with work, that's just rude + Sys_Sleep(1); } } -/* -//this code is going to be removed - -#define MAX_STATICLIGHTS 2048 -// tyrlite types -#define LIGHTFADE_LMINUSX 0 // light, arghlite, others? -#define LIGHTFADE_LDIVX 1 -#define LIGHTFADE_LDIVX2 2 // hlight -#define LIGHTFADE_L 3 -#define LIGHTFADE_DEFAULT 999999 // light util not yet identified, switched later - -typedef struct -{ - int fadetype; // one of the LIGHTFADE_ values - int style; - vec3_t origin; - vec_t distancescale; // attenuation - - // spotlights - vec3_t direction; // direction - vec_t cone; // cone cosine, any light cosine outside this range is suddenly black - - // LIGHTFADE_LMINUSX - vec_t light; - vec3_t color; - - // LIGHTFADE_LDIVX and LIGHTFADE_LDIVX2 - vec3_t light2; // light * color - vec_t lightsubtract; // hlight feature -} -staticlight_t; - -extern staticlight_t staticlight[MAX_STATICLIGHTS]; -extern int staticlights; - -extern int r_sunlightenabled; -extern vec3_t r_sunlightdirection, r_sunlightcolor; -extern vec3_t r_light_ambientcolor; - - - -staticlight_t staticlight[MAX_STATICLIGHTS]; -int staticlights; - -int r_sunlightenabled; -vec3_t r_sunlightdirection, r_sunlightcolor; -vec3_t r_light_ambientcolor; - void CL_ParseEntityLump(char *entdata) { - char *data; + const char *data; char key[128], value[4096]; - char targetnamebuffer[65536]; - char *targetname[8192], *target[MAX_STATICLIGHTS], light_target[256]; - vec3_t targetnameorigin[8192], v; - int targets, targetnames, targetnamebufferpos, targetnameorigintofillin; - int i, j, n; - float f1, f2, f3, f4; - float ambientlight, ambientcolor[3], sunlight, sunlightdirection[3], sunlightcolor[3]; - int light_fadetype, light_style, hlight, tyrlite, light_enable; - float light_origin[3], light_light, light_distancescale, light_lightcolor[3], light_color[3], light_direction[3], light_cone, light_lightradius; FOG_clear(); // LordHavoc: no fog until set - R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set - r_sunlightenabled = false; - staticlights = 0; + // LordHavoc: default to the map's sky (q3 shader parsing sets this) + R_SetSkyBox(cl.worldmodel->brush.skybox); data = entdata; if (!data) return; - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data, false)) return; // error if (com_token[0] != '{') return; // error - hlight = false; - tyrlite = false; - ambientlight = 0; - ambientcolor[0] = ambientcolor[1] = ambientcolor[2] = 1; - sunlight = 0; - sunlightcolor[0] = sunlightcolor[1] = sunlightcolor[2] = 1; - sunlightdirection[0] = 0; - sunlightdirection[1] = 0; - sunlightdirection[2] = -1; - targets = 0; - targetnames = 0; - targetnamebufferpos = 0; while (1) { - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data, false)) return; // error if (com_token[0] == '}') break; // end of worldspawn if (com_token[0] == '_') - strcpy(key, com_token + 1); + strlcpy (key, com_token + 1, sizeof (key)); else - strcpy(key, com_token); + strlcpy (key, com_token, sizeof (key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data, false)) return; // error - strcpy(value, com_token); + strlcpy (value, com_token, sizeof (value)); if (!strcmp("sky", key)) R_SetSkyBox(value); else if (!strcmp("skyname", key)) // non-standard, introduced by QuakeForge... sigh. @@ -407,239 +254,8 @@ void CL_ParseEntityLump(char *entdata) fog_green = atof(value); else if (!strcmp("fog_blue", key)) fog_blue = atof(value); - else if (!strcmp("light", key)) - ambientlight = atof(value); - else if (!strcmp("sunlight", key)) - { - sunlight = atof(value); - tyrlite = true; - } - else if (!strcmp("sun_color", key)) - { - if (sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3) - VectorCopy(v, sunlightcolor); - tyrlite = true; - } - else if (!strcmp("sun_mangle", key)) - { - if (sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3) - AngleVectors(v, sunlightdirection, NULL, NULL); - tyrlite = true; - } - } - - if (sunlight) - { - r_sunlightenabled = true; - VectorScale(sunlightcolor, sunlight, r_sunlightcolor); - VectorCopy(sunlightdirection, r_sunlightdirection); - } - VectorScale(ambientcolor, ambientlight, r_light_ambientcolor); - - while(1) - { - data = COM_Parse(data); - if (!data) - break; // done - if (com_token[0] != '{') - break; // error - light_light = 0; - VectorClear(light_origin); - light_lightcolor[0] = light_lightcolor[1] = light_lightcolor[2] = 1.0f; - light_color[0] = light_color[1] = light_color[2] = 1.0f; - light_direction[0] = light_direction[1] = light_direction[2] = 0.0f; - light_cone = -cos(20*M_PI/180); - light_distancescale = 1.0f; - light_fadetype = LIGHTFADE_DEFAULT; // replaced later when light util is identified - light_style = 0; - light_lightradius = 0; - light_enable = false; - targetnameorigintofillin = -1; - while (1) - { - data = COM_Parse(data); - if (!data) - return; // error - if (com_token[0] == '}') - break; - if (com_token[0] == '_') - strcpy(key, com_token + 1); - else - strcpy(key, com_token); - while (key[strlen(key)-1] == ' ') // remove trailing spaces - key[strlen(key)-1] = 0; - data = COM_Parse(data); - if (!data) - return; // error - strcpy(value, com_token); - if (!strcmp("light", key)) - { - n = sscanf(value, "%f %f %f %f", &f1, &f2, &f3, &f4); - switch(n) - { - case 1: - // id light, arghlite, tyrlite, others - light_light = f1; - light_lightcolor[0] = light_lightcolor[1] = light_lightcolor[2] = 1.0f; - break; - case 3: - // hlight specific (supports all 3 light formats, but this one is unique to it) - hlight = true; - light_light = max(f1, max(f2, f3)); - light_lightcolor[0] = f1 / light_light; - light_lightcolor[1] = f2 / light_light; - light_lightcolor[2] = f3 / light_light; - break; - case 4: - // halflife - hlight = true; // unless this is a halflife map, probably hlight - light_light = f4; - light_lightcolor[0] = f1 * (1.0f / 255.0f); - light_lightcolor[1] = f1 * (1.0f / 255.0f); - light_lightcolor[2] = f1 * (1.0f / 255.0f); - break; - default: - // error - break; - } - } - else if (!strcmp("color", key)) - { - n = sscanf(value, "%f %f %f", &f1, &f2, &f3); - if (n == 3) - { - light_color[0] = f1; - light_color[1] = f2; - light_color[2] = f3; - } - // n != 3 is an error - } - else if (!strcmp("wait", key)) - { - light_distancescale = atof(value); - } - else if (!strcmp("delay", key)) - { - light_fadetype = atoi(value); - tyrlite = true; - } - else if (!strcmp("angle", key)) - { - light_cone = -cos(atof(value) * M_PI / 360); - } - else if (!strcmp("mangle", key)) - { - n = sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]); - if (n == 3) - AngleVectors(v, light_direction, NULL, NULL); - // n != 3 is an error - tyrlite = true; - } - else if (!strcmp("style", key)) - { - n = atoi(value); - if (n >= 0 && n < MAX_LIGHTSTYLES) - light_style = n; - } - else if (!strcmp("lightradius", key)) - { - hlight = true; - light_lightradius = atof(value); - } - else if (!strcmp("classname", key)) - { - if (!strncmp(value, "light", 5)) - light_enable = true; - } - else if (!strcmp("origin", key)) - { - if (sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3) - VectorCopy(v, light_origin); - } - else if (!strcmp("targetname", key)) - { - if ((targetnames < 8192) && (strlen(value) + 1 + targetnamebufferpos <= 65536)) - { - targetname[targetnames] = targetnamebuffer + targetnamebufferpos; - strcpy(targetnamebuffer + targetnamebufferpos, value); - targetnamebufferpos += strlen(value) + 1; - targetnameorigintofillin = targetnames++; - } - } - else if (!strcmp("target", key)) - if (strlen(value) < sizeof(light_target)) - strcpy(light_target, value); - } - if (targetnameorigintofillin >= 0) - VectorCopy(light_origin, targetnameorigin[targetnameorigintofillin]); - if (light_enable && staticlights < MAX_STATICLIGHTS && light_light != 0) - { - if (light_target[0] && (targets < 8192) && (strlen(value) + 1 + targetnamebufferpos <= 65536)) - { - target[staticlights] = targetnamebuffer + targetnamebufferpos; - strcpy(targetnamebuffer + targetnamebufferpos, value); - targetnamebufferpos += strlen(value) + 1; - } - else - target[staticlights] = NULL; - - staticlight[staticlights].fadetype = light_fadetype; - staticlight[staticlights].style = light_style; - VectorCopy(light_origin, staticlight[staticlights].origin); - staticlight[staticlights].distancescale = light_distancescale; - // these are often altered later by the target name linking - VectorCopy(light_direction, staticlight[staticlights].direction); - staticlight[staticlights].cone = light_cone; - - staticlight[staticlights].light = light_light; - staticlight[staticlights].color[0] = light_lightcolor[0] * light_color[0]; - staticlight[staticlights].color[1] = light_lightcolor[1] * light_color[1]; - staticlight[staticlights].color[2] = light_lightcolor[2] * light_color[2]; - - staticlight[staticlights].light2[0] = light_light * light_lightcolor[0] * light_color[0]; - staticlight[staticlights].light2[1] = light_light * light_lightcolor[1] * light_color[1]; - staticlight[staticlights].light2[2] = light_light * light_lightcolor[2] * light_color[2]; - staticlight[staticlights].lightsubtract = 0; - if (light_lightradius) - { - staticlight[staticlights].fadetype = LIGHTFADE_LDIVX2; - staticlight[staticlights].lightsubtract = max(staticlight[staticlights].color[0], max(staticlight[staticlights].color[1], staticlight[staticlights].color[2])) * 0.5f / (light_lightradius * light_distancescale * light_lightradius * light_distancescale * (1.0f / 65536.0f) + 1.0f); - } - staticlights++; - } - } - if (cl.worldmodel->ishlbsp) - n = LIGHTFADE_LDIVX2; - else if (light_hlight.integer) - n = LIGHTFADE_LDIVX2; - else if (tyrlite) - n = LIGHTFADE_LMINUSX; - else if (hlight) - n = LIGHTFADE_LDIVX2; - else - n = LIGHTFADE_LMINUSX; - for (i = 0;i < staticlights;i++) - { - if (staticlight[i].fadetype == LIGHTFADE_DEFAULT) - staticlight[i].fadetype = n; - if (target[i]) - { - for (j = 0;j < targetnames;j++) - { - if (!strcmp(target[i], targetname[j])) - { - VectorSubtract(targetnameorigin[j], staticlight[i].origin, v); - VectorNormalize(v); - VectorCopy(v, staticlight[i].direction); - break; - } - } - } - if (staticlight[i].direction[0] == 0 && staticlight[i].direction[1] == 0 && staticlight[i].direction[2] == 0) - staticlight[i].cone = 0; } } -*/ /* ===================== @@ -650,9 +266,9 @@ An svc_signonnum has been received, perform a client side setup */ static void CL_SignonReply (void) { - char str[8192]; + //char str[8192]; -Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); +Con_DPrintf("CL_SignonReply: %i\n", cls.signon); switch (cls.signon) { @@ -675,8 +291,10 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); } MSG_WriteByte (&cls.message, clc_stringcmd); - sprintf (str, "spawn %s", cls.spawnparms); - MSG_WriteString (&cls.message, str); + MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer)); + + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, "spawn"); break; case 3: @@ -685,7 +303,6 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); break; case 4: -// SCR_EndLoadingPlaque (); // allow normal screen updates Con_ClearNotify(); break; } @@ -696,15 +313,17 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); CL_ParseServerInfo ================== */ +// FIXME: this is a lot of memory to be keeping around, this needs to be dynamically allocated and freed +static char parse_model_precache[MAX_MODELS][MAX_QPATH]; +static char parse_sound_precache[MAX_SOUNDS][MAX_QPATH]; void CL_ParseServerInfo (void) { - char *str; - int i; - int nummodels, numsounds; - char model_precache[MAX_MODELS][MAX_QPATH]; - char sound_precache[MAX_SOUNDS][MAX_QPATH]; + char *str; + int i; + int nummodels, numsounds; + entity_t *ent; - Con_DPrintf ("Serverinfo packet received.\n"); + Con_DPrint("Serverinfo packet received.\n"); // // wipe the client_state_t struct // @@ -712,17 +331,16 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250) + // hack for unmarked Nehahra movie demos which had a custom protocol + if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer) + i = PROTOCOL_NEHAHRAMOVIE; + if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_NEHAHRAMOVIE) { - Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION); + Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE); return; } - Nehahrademcompatibility = false; - if (i == 250) - Nehahrademcompatibility = true; - if (cls.demoplayback && demo_nehahra.integer) - Nehahrademcompatibility = true; - dpprotocol = i == DPPROTOCOL_VERSION; + cl.protocol = i; + Con_DPrintf("Protocol %i\n", cl.protocol); // parse maxclients cl.maxclients = MSG_ReadByte (); @@ -731,6 +349,7 @@ void CL_ParseServerInfo (void) Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients); return; } + Mem_EmptyPool(cl_scores_mempool); cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores)); // parse gametype @@ -738,106 +357,106 @@ void CL_ParseServerInfo (void) // parse signon message str = MSG_ReadString (); - strncpy (cl.levelname, str, sizeof(cl.levelname)-1); + strlcpy (cl.levelname, str, sizeof(cl.levelname)); // seperate the printfs so the server message can have a color - if (!Nehahrademcompatibility) // no messages when playing the Nehahra movie - { - 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"); - Con_Printf ("%c%s\n", 2, str); - } - -// -// first we go through and touch all of the precache data that still -// happens to be in the cache, so precaching something else doesn't -// needlessly purge it -// + if (cl.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie + 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); + // check memory integrity Mem_CheckSentinelsGlobal(); - Mod_ClearUsed(); + // disable until we get textures for it + R_ResetSkyBox(); - Mem_CheckSentinelsGlobal(); + memset(cl.model_precache, 0, sizeof(cl.model_precache)); + memset(cl.sound_precache, 0, sizeof(cl.sound_precache)); -// precache models - memset (cl.model_precache, 0, sizeof(cl.model_precache)); + // parse model precache list for (nummodels=1 ; ; nummodels++) { - str = MSG_ReadString (); + str = MSG_ReadString(); if (!str[0]) break; if (nummodels==MAX_MODELS) - { - Con_Printf ("Server sent too many model precaches\n"); - return; - } + Host_Error ("Server sent too many model precaches\n"); 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); + strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels])); } - -// precache sounds - memset (cl.sound_precache, 0, sizeof(cl.sound_precache)); + // parse sound precache list for (numsounds=1 ; ; numsounds++) { - str = MSG_ReadString (); + str = MSG_ReadString(); if (!str[0]) break; if (numsounds==MAX_SOUNDS) - { - Con_Printf ("Server sent too many sound precaches\n"); - return; - } + Host_Error("Server sent too many sound precaches\n"); 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); + Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); + strlcpy (parse_sound_precache[numsounds], str, sizeof (parse_sound_precache[numsounds])); } - Mem_CheckSentinelsGlobal(); - + // touch all of the precached models that are still loaded so we can free + // anything that isn't needed + Mod_ClearUsed(); + for (i = 1;i < nummodels;i++) + { + CL_KeepaliveMessage(); + Mod_FindName(parse_model_precache[i]); + } Mod_PurgeUnused(); -// -// now we try to load everything else until a cache allocation fails -// + // do the same for sounds + S_ServerSounds (parse_sound_precache, numsounds); - Mem_CheckSentinelsGlobal(); + // now we try to load everything that is new - for (i=1 ; istate_current.active = true; + ent->render.model = cl.worldmodel = cl.model_precache[1]; + ent->render.scale = 1; // some of the renderer still relies on scale + ent->render.alpha = 1; + ent->render.flags = RENDER_SHADOW | RENDER_LIGHT; + Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1); + Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix); + CL_BoundingBoxForEntity(&ent->render); - R_NewMap (); + cl_num_entities = 1; - Mem_CheckSentinelsGlobal(); + R_Modules_NewMap(); + CL_CGVM_Start(); - noclip_anglehack = false; // noclip is turned off at start + // noclip is turned off at start + noclip_anglehack = false; + + // check memory integrity + Mem_CheckSentinelsGlobal(); } void CL_ValidateState(entity_state_t *s) @@ -851,229 +470,88 @@ void CL_ValidateState(entity_state_t *s) Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS); // colormap is client index + 1 - if (s->colormap > cl.maxclients) - Host_Error ("CL_ValidateState: colormap (%i) > cl.maxclients (%i)", s->colormap, cl.maxclients); + 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]; Mod_CheckLoaded(model); - if (model && s->frame >= model->numframes) + if (model && model->type && s->frame >= model->numframes) { - Con_Printf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name); + 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 && s->skin > 0 && s->skin >= model->numskins) + if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC)) { - Con_Printf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name); + Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins); s->skin = 0; } } -/* -================== -CL_ParseUpdate - -Parse an entity update message from the server -If an entities model or origin changes from frame to frame, it must be -relinked. Other attributes can change without relinking. -================== -*/ -byte entkill[MAX_EDICTS]; -int bitprofile[32], bitprofilecount = 0; -void CL_ParseUpdate (int bits) +void CL_MoveLerpEntityStates(entity_t *ent) { - int i, num, deltadie; - entity_t *ent; - entity_state_t new; - - if (cls.signon == SIGNONS - 1) - { // first update is the final signon stage - cls.signon = SIGNONS; - CL_SignonReply (); - } - - if (bits & U_MOREBITS) - bits |= (MSG_ReadByte()<<8); - if ((bits & U_EXTEND1) && (!Nehahrademcompatibility)) - { - bits |= MSG_ReadByte() << 16; - if (bits & U_EXTEND2) - bits |= MSG_ReadByte() << 24; - } - - if (bits & U_LONGENTITY) - num = (unsigned) MSG_ReadShort (); - else - num = (unsigned) MSG_ReadByte (); - - if (num >= MAX_EDICTS) - Host_Error("CL_ParseUpdate: entity number (%i) >= MAX_EDICTS (%i)\n", num, MAX_EDICTS); - if (num < 1) - Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num); - - // mark as visible (no kill) - entkill[num] = 0; - - ent = CL_EntityNum (num); - - for (i = 0;i < 32;i++) - if (bits & (1 << i)) - bitprofile[i]++; - bitprofilecount++; - - deltadie = false; - if (bits & U_DELTA) - { - new = ent->state_current; - if (!new.active) - deltadie = true; // was not present in previous frame, leave hidden until next full update - } - else - new = ent->state_baseline; - - new.time = cl.mtime[0]; - - new.flags = 0; - new.active = true; - if (bits & U_MODEL) new.modelindex = (new.modelindex & 0xFF00) | MSG_ReadByte(); - if (bits & U_FRAME) new.frame = (new.frame & 0xFF00) | MSG_ReadByte(); - if (bits & U_COLORMAP) new.colormap = MSG_ReadByte(); - if (bits & U_SKIN) new.skin = MSG_ReadByte(); - if (bits & U_EFFECTS) new.effects = (new.effects & 0xFF00) | MSG_ReadByte(); - if (bits & U_ORIGIN1) new.origin[0] = MSG_ReadCoord(); - if (bits & U_ANGLE1) new.angles[0] = MSG_ReadAngle(); - if (bits & U_ORIGIN2) new.origin[1] = MSG_ReadCoord(); - if (bits & U_ANGLE2) new.angles[1] = MSG_ReadAngle(); - if (bits & U_ORIGIN3) new.origin[2] = MSG_ReadCoord(); - if (bits & U_ANGLE3) new.angles[2] = MSG_ReadAngle(); - if (bits & U_STEP) new.flags |= RENDER_STEP; - if (bits & U_ALPHA) new.alpha = MSG_ReadByte(); - if (bits & U_SCALE) new.scale = MSG_ReadByte(); - if (bits & U_EFFECTS2) new.effects = (new.effects & 0x00FF) | (MSG_ReadByte() << 8); - if (bits & U_GLOWSIZE) new.glowsize = MSG_ReadByte(); - if (bits & U_GLOWCOLOR) new.glowcolor = MSG_ReadByte(); -#if 0 - if (bits & U_COLORMOD) {int i = MSG_ReadByte();float r = (((int) i >> 5) & 7) * 1.0 / 7, g = (((int) i >> 2) & 7) * 1.0 / 7, b = ((int) i & 3) * 1.0 / 3;Con_Printf("warning: U_COLORMOD %i (%1.2f %1.2f %1.2f) ignored\n", i, r, g, b);} -#else - // apparently the dpcrush demo uses this (unintended, and it uses white anyway) - if (bits & U_COLORMOD) MSG_ReadByte(); -#endif - if (bits & U_GLOWTRAIL) new.flags |= RENDER_GLOWTRAIL; - if (bits & U_FRAME2) new.frame = (new.frame & 0x00FF) | (MSG_ReadByte() << 8); - if (bits & U_MODEL2) new.modelindex = (new.modelindex & 0x00FF) | (MSG_ReadByte() << 8); - if (bits & U_VIEWMODEL) new.flags |= RENDER_VIEWMODEL; - if (bits & U_EXTERIORMODEL) new.flags |= RENDER_EXTERIORMODEL; - - // LordHavoc: to allow playback of the Nehahra movie - if (Nehahrademcompatibility && (bits & U_EXTEND1)) + 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) { - // LordHavoc: evil format - int i = MSG_ReadFloat(); - int j = MSG_ReadFloat() * 255.0f; - if (i == 2) - { - if (MSG_ReadFloat()) - new.effects |= EF_FULLBRIGHT; - } - if (j < 0) - new.alpha = 0; - else if (j == 0 || j >= 255) - new.alpha = 255; - else - new.alpha = j; + // reset all persistent stuff if this is a new entity + ent->persistent.lerpdeltatime = 0; + ent->persistent.lerpstarttime = cl.mtime[1]; + VectorCopy(ent->state_current.origin, ent->persistent.oldorigin); + VectorCopy(ent->state_current.angles, ent->persistent.oldangles); + 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.frame1time = ent->render.frame2time = cl.time; + ent->render.framelerp = 1; + // reset various persistent stuff + ent->persistent.muzzleflash = 0; + VectorCopy(ent->state_current.origin, ent->persistent.trail_origin); } - - if (deltadie) + else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000) { - // hide the entity - new.active = false; + // don't interpolate the move + ent->persistent.lerpdeltatime = 0; + ent->persistent.lerpstarttime = cl.mtime[1]; + VectorCopy(ent->state_current.origin, ent->persistent.oldorigin); + VectorCopy(ent->state_current.angles, ent->persistent.oldangles); + VectorCopy(ent->state_current.origin, ent->persistent.neworigin); + VectorCopy(ent->state_current.angles, ent->persistent.newangles); } - else - CL_ValidateState(&new); - - if (new.flags & RENDER_STEP) // FIXME: rename this flag? + else if (ent->state_current.flags & RENDER_STEP) { - // make time identical for memcmp - new.time = ent->state_current.time; - if (memcmp(&new, &ent->state_current, sizeof(entity_state_t))) + // monster interpolation + if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01) { - // state has changed - ent->state_previous = ent->state_current; - ent->state_current = new; - // assume 10fps animation - ent->state_previous.time = cl.mtime[0]; - ent->state_current.time = cl.mtime[0] + 0.1; //ent->state_previous.time + 0.1; + ent->persistent.lerpdeltatime = bound(0, cl.mtime[1] - ent->persistent.lerpstarttime, 0.1); + ent->persistent.lerpstarttime = cl.mtime[1]; + VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin); + VectorCopy(ent->persistent.newangles, ent->persistent.oldangles); + VectorCopy(ent->state_current.origin, ent->persistent.neworigin); + VectorCopy(ent->state_current.angles, ent->persistent.newangles); } } else { - ent->state_previous = ent->state_current; - ent->state_current = new; + // not a monster + ent->persistent.lerpstarttime = ent->state_previous.time; + // no lerp if it's singleplayer + if (cl.islocalgame) + ent->persistent.lerpdeltatime = 0; + else + ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1); + VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin); + VectorCopy(ent->persistent.newangles, ent->persistent.oldangles); + VectorCopy(ent->state_current.origin, ent->persistent.neworigin); + VectorCopy(ent->state_current.angles, ent->persistent.newangles); } } -char *bitprofilenames[32] = -{ - "U_MOREBITS", - "U_ORIGIN1", - "U_ORIGIN2", - "U_ORIGIN3", - "U_ANGLE2", - "U_STEP", - "U_FRAME", - "U_SIGNAL", - "U_ANGLE1", - "U_ANGLE3", - "U_MODEL", - "U_COLORMAP", - "U_SKIN", - "U_EFFECTS", - "U_LONGENTITY", - "U_EXTEND1", - "U_DELTA", - "U_ALPHA", - "U_SCALE", - "U_EFFECTS2", - "U_GLOWSIZE", - "U_GLOWCOLOR", - "obsolete U_COLORMOD", - "U_EXTEND2", - "U_GLOWTRAIL", - "U_VIEWMODEL", - "U_FRAME2", - "U_MODEL2", - "U_EXTERIORMODEL", - "U_UNUSED29", - "U_UNUSED30", - "U_EXTEND3", -}; - -void CL_BitProfile_f(void) -{ - int i; - Con_Printf("bitprofile: %i updates\n"); - if (bitprofilecount) - for (i = 0;i < 32;i++) -// if (bitprofile[i]) - Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount); - Con_Printf("\n"); - for (i = 0;i < 32;i++) - bitprofile[i] = 0; - bitprofilecount = 0; -} - -void CL_EntityUpdateSetup(void) -{ - memset(entkill, 1, MAX_EDICTS); -} - -void CL_EntityUpdateEnd(void) -{ - int i; - for (i = 1;i < MAX_EDICTS;i++) - if (entkill[i]) - cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0; -} - /* ================== CL_ParseBaseline @@ -1083,7 +561,8 @@ void CL_ParseBaseline (entity_t *ent, int large) { int i; - memset(&ent->state_baseline, 0, sizeof(entity_state_t)); + ent->state_baseline = defaultstate; + // FIXME: set ent->state_baseline.number? ent->state_baseline.active = true; if (large) { @@ -1099,16 +578,11 @@ void CL_ParseBaseline (entity_t *ent, int large) ent->state_baseline.skin = MSG_ReadByte(); for (i = 0;i < 3;i++) { - ent->state_baseline.origin[i] = MSG_ReadCoord (); - ent->state_baseline.angles[i] = MSG_ReadAngle (); + ent->state_baseline.origin[i] = MSG_ReadCoord(cl.protocol); + ent->state_baseline.angles[i] = MSG_ReadAngle(cl.protocol); } - ent->state_baseline.alpha = 255; - ent->state_baseline.scale = 16; - ent->state_baseline.glowsize = 0; - ent->state_baseline.glowcolor = 254; - ent->state_previous = ent->state_current = ent->state_baseline; - CL_ValidateState(&ent->state_baseline); + ent->state_previous = ent->state_current = ent->state_baseline; } @@ -1138,25 +612,41 @@ void CL_ParseClientdata (int bits) cl.idealpitch = MSG_ReadChar (); else cl.idealpitch = 0; - + VectorCopy (cl.mvelocity[0], cl.mvelocity[1]); - for (i=0 ; i<3 ; i++) + for (i = 0;i < 3;i++) { if (bits & (SU_PUNCH1<= MAX_STATIC_ENTITIES) + if (cl_num_static_entities >= cl_max_static_entities) Host_Error ("Too many static entities"); - ent = &cl_static_entities[cl.num_statics++]; + ent = &cl_static_entities[cl_num_static_entities++]; CL_ParseBaseline (ent, large); // copy it to the current state @@ -1216,11 +749,18 @@ void CL_ParseStatic (int large) ent->render.skinnum = ent->state_baseline.skin; ent->render.effects = ent->state_baseline.effects; ent->render.alpha = 1; - ent->render.scale = 1; - ent->render.alpha = 1; + //ent->render.scale = 1; + + //VectorCopy (ent->state_baseline.origin, ent->render.origin); + //VectorCopy (ent->state_baseline.angles, ent->render.angles); - VectorCopy (ent->state_baseline.origin, ent->render.origin); - VectorCopy (ent->state_baseline.angles, ent->render.angles); + Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1); + Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix); + CL_BoundingBoxForEntity(&ent->render); + + // This is definitely cheating... + if (ent->render.model == NULL) + cl_num_static_entities--; } /* @@ -1233,15 +773,15 @@ void CL_ParseStaticSound (int large) vec3_t org; int sound_num, vol, atten; - MSG_ReadVector(org); + MSG_ReadVector(org, cl.protocol); if (large) sound_num = (unsigned short) MSG_ReadShort (); else sound_num = MSG_ReadByte (); vol = MSG_ReadByte (); atten = MSG_ReadByte (); - - S_StaticSound (cl.sound_precache[sound_num], org, vol, atten); + + S_StaticSound (cl.sound_precache[sound_num], org, vol/255.0f, atten); } void CL_ParseEffect (void) @@ -1249,7 +789,7 @@ void CL_ParseEffect (void) vec3_t org; int modelindex, startframe, framecount, framerate; - MSG_ReadVector(org); + MSG_ReadVector(org, cl.protocol); modelindex = MSG_ReadByte (); startframe = MSG_ReadByte (); framecount = MSG_ReadByte (); @@ -1263,48 +803,542 @@ void CL_ParseEffect2 (void) vec3_t org; int modelindex, startframe, framecount, framerate; - MSG_ReadVector(org); - modelindex = MSG_ReadShort (); - startframe = MSG_ReadShort (); + MSG_ReadVector(org, cl.protocol); + modelindex = (unsigned short) MSG_ReadShort (); + startframe = (unsigned short) MSG_ReadShort (); framecount = MSG_ReadByte (); framerate = MSG_ReadByte (); CL_Effect(org, modelindex, startframe, framecount, framerate); } +model_t *cl_model_bolt = NULL; +model_t *cl_model_bolt2 = NULL; +model_t *cl_model_bolt3 = NULL; +model_t *cl_model_beam = NULL; + +sfx_t *cl_sfx_wizhit; +sfx_t *cl_sfx_knighthit; +sfx_t *cl_sfx_tink1; +sfx_t *cl_sfx_ric1; +sfx_t *cl_sfx_ric2; +sfx_t *cl_sfx_ric3; +sfx_t *cl_sfx_r_exp3; + + +void CL_InitTEnts (void) +{ + cl_sfx_wizhit = S_PrecacheSound ("sound/wizard/hit.wav", false, true); + cl_sfx_knighthit = S_PrecacheSound ("sound/hknight/hit.wav", false, true); + cl_sfx_tink1 = S_PrecacheSound ("sound/weapons/tink1.wav", false, true); + cl_sfx_ric1 = S_PrecacheSound ("sound/weapons/ric1.wav", false, true); + cl_sfx_ric2 = S_PrecacheSound ("sound/weapons/ric2.wav", false, true); + cl_sfx_ric3 = S_PrecacheSound ("sound/weapons/ric3.wav", false, true); + cl_sfx_r_exp3 = S_PrecacheSound ("sound/weapons/r_exp3.wav", false, true); +} + +void CL_ParseBeam (model_t *m, int lightning) +{ + int i, ent; + vec3_t start, end; + beam_t *b; + + ent = (unsigned short) MSG_ReadShort (); + MSG_ReadVector(start, cl.protocol); + MSG_ReadVector(end, cl.protocol); + + if (ent >= MAX_EDICTS) + { + Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent); + ent = 0; + } + + // override any beam with the same entity + for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + { + if (b->entity == ent) + { + //b->entity = ent; + b->lightning = lightning; + b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0; + b->model = m; + b->endtime = cl.time + 0.2; + VectorCopy (start, b->start); + VectorCopy (end, b->end); + return; + } + } + + // find a free beam + for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + { + if (!b->model || b->endtime < cl.time) + { + b->entity = ent; + b->lightning = lightning; + b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0; + b->model = m; + b->endtime = cl.time + 0.2; + VectorCopy (start, b->start); + VectorCopy (end, b->end); + return; + } + } + Con_Print("beam list overflow!\n"); +} + +void CL_ParseTempEntity(void) +{ + int type; + vec3_t pos; + vec3_t dir; + vec3_t pos2; + vec3_t color; + int rnd; + int colorStart, colorLength, count; + float velspeed, radius; + qbyte *tempcolor; + matrix4x4_t tempmatrix; + + type = MSG_ReadByte(); + switch (type) + { + case TE_WIZSPIKE: + // spike hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, 0, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + CL_RunParticleEffect(pos, vec3_origin, 20, 30); + S_StartSound(-1, 0, cl_sfx_wizhit, pos, 1, 1); + break; + + case TE_KNIGHTSPIKE: + // spike hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, 0, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + CL_RunParticleEffect(pos, vec3_origin, 226, 20); + S_StartSound(-1, 0, cl_sfx_knighthit, pos, 1, 1); + break; + + case TE_SPIKE: + // spike hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + if (cl_particles_bulletimpacts.integer) + { + CL_SparkShower(pos, vec3_origin, 15, 1); + CL_Smoke(pos, vec3_origin, 15); + CL_BulletMark(pos); + } + if (rand() % 5) + S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + case TE_SPIKEQUAD: + // quad spike hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + // LordHavoc: changed to spark shower + if (cl_particles_bulletimpacts.integer) + { + CL_SparkShower(pos, vec3_origin, 15, 1); + CL_Smoke(pos, vec3_origin, 15); + CL_BulletMark(pos); + } + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (rand() % 5) + S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + case TE_SUPERSPIKE: + // super spike hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + // LordHavoc: changed to dust shower + if (cl_particles_bulletimpacts.integer) + { + CL_SparkShower(pos, vec3_origin, 30, 1); + CL_Smoke(pos, vec3_origin, 30); + CL_BulletMark(pos); + } + if (rand() % 5) + S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + case TE_SUPERSPIKEQUAD: + // quad super spike hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + // LordHavoc: changed to dust shower + if (cl_particles_bulletimpacts.integer) + { + CL_SparkShower(pos, vec3_origin, 30, 1); + CL_Smoke(pos, vec3_origin, 30); + CL_BulletMark(pos); + } + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + if (rand() % 5) + S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + // LordHavoc: added for improved blood splatters + case TE_BLOOD: + // blood puff + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + dir[0] = MSG_ReadChar(); + dir[1] = MSG_ReadChar(); + dir[2] = MSG_ReadChar(); + count = MSG_ReadByte(); + CL_BloodPuff(pos, dir, count); + break; + case TE_SPARK: + // spark shower + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + dir[0] = MSG_ReadChar(); + dir[1] = MSG_ReadChar(); + dir[2] = MSG_ReadChar(); + count = MSG_ReadByte(); + CL_SparkShower(pos, dir, count, 1); + break; + case TE_PLASMABURN: + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + CL_PlasmaBurn(pos); + break; + // LordHavoc: added for improved gore + case TE_BLOODSHOWER: + // vaporized body + MSG_ReadVector(pos, cl.protocol); // mins + MSG_ReadVector(pos2, cl.protocol); // maxs + velspeed = MSG_ReadCoord(cl.protocol); // speed + count = (unsigned short) MSG_ReadShort(); // number of particles + CL_BloodShower(pos, pos2, velspeed, count); + break; + case TE_PARTICLECUBE: + // general purpose particle effect + MSG_ReadVector(pos, cl.protocol); // mins + MSG_ReadVector(pos2, cl.protocol); // maxs + MSG_ReadVector(dir, cl.protocol); // dir + count = (unsigned short) MSG_ReadShort(); // number of particles + colorStart = MSG_ReadByte(); // color + colorLength = MSG_ReadByte(); // gravity (1 or 0) + velspeed = MSG_ReadCoord(cl.protocol); // randomvel + CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed); + break; + + case TE_PARTICLERAIN: + // general purpose particle effect + MSG_ReadVector(pos, cl.protocol); // mins + MSG_ReadVector(pos2, cl.protocol); // maxs + MSG_ReadVector(dir, cl.protocol); // dir + count = (unsigned short) MSG_ReadShort(); // number of particles + colorStart = MSG_ReadByte(); // color + CL_ParticleRain(pos, pos2, dir, count, colorStart, 0); + break; + + case TE_PARTICLESNOW: + // general purpose particle effect + MSG_ReadVector(pos, cl.protocol); // mins + MSG_ReadVector(pos2, cl.protocol); // maxs + MSG_ReadVector(dir, cl.protocol); // dir + count = (unsigned short) MSG_ReadShort(); // number of particles + colorStart = MSG_ReadByte(); // color + CL_ParticleRain(pos, pos2, dir, count, colorStart, 1); + break; + + case TE_GUNSHOT: + // bullet hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + CL_SparkShower(pos, vec3_origin, 15, 1); + CL_Smoke(pos, vec3_origin, 15); + CL_BulletMark(pos); + break; + + case TE_GUNSHOTQUAD: + // quad bullet hitting wall + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + CL_SparkShower(pos, vec3_origin, 15, 1); + CL_Smoke(pos, vec3_origin, 15); + CL_BulletMark(pos); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + break; + + case TE_EXPLOSION: + // rocket explosion + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_ParticleExplosion(pos); + // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5 + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_EXPLOSIONQUAD: + // quad rocket explosion + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_ParticleExplosion(pos); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_EXPLOSION3: + // Nehahra movie colored lighting explosion + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_ParticleExplosion(pos); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + color[0] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f); + color[1] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f); + color[2] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f); + CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_EXPLOSIONRGB: + // colored lighting explosion + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_ParticleExplosion(pos); + color[0] = MSG_ReadByte() * (2.0f / 255.0f); + color[1] = MSG_ReadByte() * (2.0f / 255.0f); + color[2] = MSG_ReadByte() * (2.0f / 255.0f); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_TAREXPLOSION: + // tarbaby explosion + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_BlobExplosion(pos); + + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + break; + + case TE_SMALLFLASH: + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + break; + + case TE_CUSTOMFLASH: + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + radius = MSG_ReadByte() * 8; + velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0); + color[0] = MSG_ReadByte() * (2.0f / 255.0f); + color[1] = MSG_ReadByte() * (2.0f / 255.0f); + color[2] = MSG_ReadByte() * (2.0f / 255.0f); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, 0, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + break; + + case TE_FLAMEJET: + MSG_ReadVector(pos, cl.protocol); + MSG_ReadVector(dir, cl.protocol); + count = MSG_ReadByte(); + CL_Flames(pos, dir, count); + break; + + case TE_LIGHTNING1: + // lightning bolts + if (!cl_model_bolt) + cl_model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); + CL_ParseBeam(cl_model_bolt, true); + break; + + case TE_LIGHTNING2: + // lightning bolts + if (!cl_model_bolt2) + cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); + CL_ParseBeam(cl_model_bolt2, true); + break; + + case TE_LIGHTNING3: + // lightning bolts + if (!cl_model_bolt3) + cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false); + CL_ParseBeam(cl_model_bolt3, false); + break; + +// PGM 01/21/97 + case TE_BEAM: + // grappling hook beam + if (!cl_model_beam) + cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false); + CL_ParseBeam(cl_model_beam, false); + break; +// PGM 01/21/97 + +// LordHavoc: for compatibility with the Nehahra movie... + case TE_LIGHTNING4NEH: + CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, false), false); + break; + + case TE_LAVASPLASH: + MSG_ReadVector(pos, cl.protocol); + CL_LavaSplash(pos); + break; + + case TE_TELEPORT: + MSG_ReadVector(pos, cl.protocol); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); +// CL_TeleportSplash(pos); + break; + + case TE_EXPLOSION2: + // color mapped explosion + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + colorStart = MSG_ReadByte(); + colorLength = MSG_ReadByte(); + CL_ParticleExplosion2(pos, colorStart, colorLength); + tempcolor = (qbyte *)&palette_complete[(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); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_TEI_G3: + MSG_ReadVector(pos, cl.protocol); + MSG_ReadVector(pos2, cl.protocol); + MSG_ReadVector(dir, cl.protocol); + CL_BeamParticle(pos, pos2, 12, 1, 0.3, 0.1, 1, 1); + CL_BeamParticle(pos, pos2, 5, 1, 0.9, 0.3, 1, 1); + break; + + case TE_TEI_SMOKE: + MSG_ReadVector(pos, cl.protocol); + MSG_ReadVector(dir, cl.protocol); + count = MSG_ReadByte(); + CL_FindNonSolidLocation(pos, pos, 4); + CL_Tei_Smoke(pos, dir, count); + break; + + case TE_TEI_BIGEXPLOSION: + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_ParticleExplosion(pos); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_TEI_PLASMAHIT: + MSG_ReadVector(pos, cl.protocol); + MSG_ReadVector(dir, cl.protocol); + count = MSG_ReadByte(); + CL_FindNonSolidLocation(pos, pos, 5); + CL_Tei_PlasmaHit(pos, dir, count); + Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); + CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + break; + + default: + Host_Error("CL_ParseTempEntity: bad type %d (hex %02X)", type, type); + } +} + +#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\n", msg_readcount-1, x); +static qbyte cgamenetbuffer[65536]; /* ===================== CL_ParseServerMessage ===================== */ -void CL_ParseServerMessage (void) +int parsingerror = false; +void CL_ParseServerMessage(void) { int cmd; - int i, entitiesupdated; - byte cmdlog[32]; + int i; + qbyte cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; - + + if (cls.demorecording) + CL_WriteDemoMessage (); + + cl.last_received_message = realtime; + // // if recording demos, copy the message out // if (cl_shownet.integer == 1) - Con_Printf ("%i ",net_message.cursize); + Con_Printf("%f %i\n", realtime, net_message.cursize); else if (cl_shownet.integer == 2) - Con_Printf ("------------------\n"); - - cl.onground = false; // unless the server says otherwise + Con_Print("------------------\n"); + + cl.onground = false; // unless the server says otherwise // // parse the message // - MSG_BeginReading (); + //MSG_BeginReading (); + + parsingerror = true; - entitiesupdated = false; - CL_EntityUpdateSetup(); - while (1) { if (msg_badread) @@ -1329,7 +1363,13 @@ void CL_ParseServerMessage (void) temp = "entity"; cmdlogname[cmdindex] = temp; SHOWNET("fast update"); - CL_ParseUpdate (cmd&127); + if (cls.signon == SIGNONS - 1) + { + // first update is the final signon stage + cls.signon = SIGNONS; + CL_SignonReply (); + } + EntityFrameQuake_ReadEntity (cmd&127); continue; } @@ -1341,7 +1381,7 @@ void CL_ParseServerMessage (void) temp = ""; cmdlogname[cmdindex] = temp; } - + // other commands switch (cmd) { @@ -1349,7 +1389,7 @@ void CL_ParseServerMessage (void) { char description[32*64], temp[64]; int count; - strcpy(description, "packet dump: "); + strcpy (description, "packet dump: "); i = cmdcount - 32; if (i < 0) i = 0; @@ -1357,57 +1397,59 @@ void CL_ParseServerMessage (void) i &= 31; while(count > 0) { - sprintf(temp, "%3i:%s ", cmdlog[i], cmdlogname[i]); - strcat(description, temp); + snprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]); + strlcat (description, temp, sizeof (description)); count--; i++; i &= 31; } description[strlen(description)-1] = '\n'; // replace the last space with a newline - Con_Printf("%s", description); + Con_Print(description); Host_Error ("CL_ParseServerMessage: Illegible server message\n"); } break; - + case svc_nop: -// Con_Printf ("svc_nop\n"); + if (cls.signon < SIGNONS) + Con_Print("<-- server to client keepalive\n"); break; - + case svc_time: - // handle old protocols which do not have entity update ranges - entitiesupdated = true; cl.mtime[1] = cl.mtime[0]; - cl.mtime[0] = MSG_ReadFloat (); + cl.mtime[0] = MSG_ReadFloat (); break; case svc_clientdata: - i = MSG_ReadShort (); + i = (unsigned short) MSG_ReadShort (); CL_ParseClientdata (i); break; - + case svc_version: i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250) - Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION); - Nehahrademcompatibility = false; - if (i == 250) - Nehahrademcompatibility = true; - if (cls.demoplayback && demo_nehahra.integer) - Nehahrademcompatibility = true; - dpprotocol = i == DPPROTOCOL_VERSION; + // hack for unmarked Nehahra movie demos which had a custom protocol + if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer) + i = PROTOCOL_NEHAHRAMOVIE; + if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_NEHAHRAMOVIE) + Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE); + cl.protocol = i; break; - + case svc_disconnect: - Host_EndGame ("Server disconnected\n"); + Con_Printf ("Server disconnected\n"); + if (cls.demonum != -1) + CL_NextDemo (); + else + CL_Disconnect (); + break; case svc_print: - Con_Printf ("%s", MSG_ReadString ()); + Con_Print(MSG_ReadString()); break; - + case svc_centerprint: - SCR_CenterPrint (MSG_ReadString ()); + SCR_CenterPrint(MSG_ReadString ()); break; - + case svc_stufftext: Cbuf_AddText (MSG_ReadString ()); break; @@ -1418,27 +1460,31 @@ void CL_ParseServerMessage (void) case svc_serverinfo: CL_ParseServerInfo (); -// vid.recalc_refdef = true; // leave intermission full screen break; - + case svc_setangle: for (i=0 ; i<3 ; i++) - cl.viewangles[i] = MSG_ReadAngle (); + cl.viewangles[i] = MSG_ReadAngle (cl.protocol); break; - + case svc_setview: - cl.viewentity = MSG_ReadShort (); + cl.viewentity = (unsigned short)MSG_ReadShort (); + if (cl.viewentity >= MAX_EDICTS) + Host_Error("svc_setview >= MAX_EDICTS\n"); + // LordHavoc: assume first setview recieved is the real player entity + if (!cl.playerentity) + cl.playerentity = cl.viewentity; break; - + case svc_lightstyle: i = MSG_ReadByte (); if (i >= MAX_LIGHTSTYLES) Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES"); - strncpy (cl_lightstyle[i].map, MSG_ReadString(), MAX_STYLESTRING - 1); + strlcpy (cl_lightstyle[i].map, MSG_ReadString(), sizeof (cl_lightstyle[i].map)); cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0; cl_lightstyle[i].length = strlen(cl_lightstyle[i].map); break; - + case svc_sound: CL_ParseStartSoundPacket(false); break; @@ -1448,31 +1494,31 @@ void CL_ParseServerMessage (void) break; case svc_stopsound: - i = MSG_ReadShort(); + i = (unsigned short) MSG_ReadShort(); S_StopSound(i>>3, i&7); break; case svc_updatename: i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD"); - strcpy (cl.scores[i].name, MSG_ReadString ()); + Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients"); + strlcpy (cl.scores[i].name, MSG_ReadString (), sizeof (cl.scores[i].name)); break; - + case svc_updatefrags: i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD"); - cl.scores[i].frags = MSG_ReadShort (); - break; + Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients"); + cl.scores[i].frags = (signed short) MSG_ReadShort (); + break; case svc_updatecolors: i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatecolors >= MAX_SCOREBOARD"); + Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients"); cl.scores[i].colors = MSG_ReadByte (); break; - + case svc_particle: CL_ParseParticleEffect (); break; @@ -1486,14 +1532,16 @@ void CL_ParseServerMessage (void) break; case svc_spawnbaseline: - i = MSG_ReadShort (); - // must use CL_EntityNum() to force cl.num_entities up - CL_ParseBaseline (CL_EntityNum(i), false); + i = (unsigned short) MSG_ReadShort (); + if (i < 0 || i >= MAX_EDICTS) + Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i); + CL_ParseBaseline (cl_entities + i, false); break; case svc_spawnbaseline2: - i = MSG_ReadShort (); - // must use CL_EntityNum() to force cl.num_entities up - CL_ParseBaseline (CL_EntityNum(i), true); + i = (unsigned short) MSG_ReadShort (); + if (i < 0 || i >= MAX_EDICTS) + Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i); + CL_ParseBaseline (cl_entities + i, true); break; case svc_spawnstatic: CL_ParseStatic (false); @@ -1502,7 +1550,7 @@ void CL_ParseServerMessage (void) CL_ParseStatic (true); break; case svc_temp_entity: - CL_ParseTEnt (); + CL_ParseTempEntity (); break; case svc_setpause: @@ -1511,8 +1559,9 @@ void CL_ParseServerMessage (void) CDAudio_Pause (); else CDAudio_Resume (); + S_PauseGameSounds (cl.paused); break; - + case svc_signonnum: i = MSG_ReadByte (); if (i <= cls.signon) @@ -1535,7 +1584,7 @@ void CL_ParseServerMessage (void) Host_Error ("svc_updatestat: %i is invalid", i); cl.stats[i] = MSG_ReadLong (); break; - + case svc_spawnstaticsound: CL_ParseStaticSound (false); break; @@ -1548,46 +1597,114 @@ void CL_ParseServerMessage (void) cl.cdtrack = MSG_ReadByte (); cl.looptrack = MSG_ReadByte (); if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) - CDAudio_Play ((byte)cls.forcetrack, true); + CDAudio_Play ((qbyte)cls.forcetrack, true); else - CDAudio_Play ((byte)cl.cdtrack, true); + CDAudio_Play ((qbyte)cl.cdtrack, true); break; case svc_intermission: cl.intermission = 1; cl.completed_time = cl.time; -// vid.recalc_refdef = true; // go to full screen break; case svc_finale: cl.intermission = 2; cl.completed_time = cl.time; -// vid.recalc_refdef = true; // go to full screen - SCR_CenterPrint (MSG_ReadString ()); + SCR_CenterPrint(MSG_ReadString ()); break; case svc_cutscene: cl.intermission = 3; cl.completed_time = cl.time; -// vid.recalc_refdef = true; // go to full screen - SCR_CenterPrint (MSG_ReadString ()); + SCR_CenterPrint(MSG_ReadString ()); break; case svc_sellscreen: Cmd_ExecuteString ("help", src_command); break; case svc_hidelmp: - SHOWLMP_decodehide(); + if (gamemode == GAME_TENEBRAE) + { + // repeating particle effect + MSG_ReadCoord(cl.protocol); + MSG_ReadCoord(cl.protocol); + MSG_ReadCoord(cl.protocol); + MSG_ReadCoord(cl.protocol); + MSG_ReadCoord(cl.protocol); + MSG_ReadCoord(cl.protocol); + MSG_ReadByte(); + MSG_ReadLong(); + MSG_ReadLong(); + MSG_ReadString(); + } + else + SHOWLMP_decodehide(); break; case svc_showlmp: - SHOWLMP_decodeshow(); + if (gamemode == GAME_TENEBRAE) + { + // particle effect + MSG_ReadCoord(cl.protocol); + MSG_ReadCoord(cl.protocol); + MSG_ReadCoord(cl.protocol); + MSG_ReadByte(); + MSG_ReadString(); + } + else + SHOWLMP_decodeshow(); break; case svc_skybox: R_SetSkyBox(MSG_ReadString()); break; + case svc_cgame: + { + int length; + length = (int) ((unsigned short) MSG_ReadShort()); + for (i = 0;i < length;i++) + cgamenetbuffer[i] = MSG_ReadByte(); + if (!msg_badread) + CL_CGVM_ParseNetwork(cgamenetbuffer, length); + } + break; + case svc_entities: + if (cls.signon == SIGNONS - 1) + { + // first update is the final signon stage + cls.signon = SIGNONS; + CL_SignonReply (); + } + if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3) + EntityFrame_CL_ReadFrame(); + else if (cl.protocol == PROTOCOL_DARKPLACES4) + EntityFrame4_CL_ReadFrame(); + else if (cl.protocol == PROTOCOL_DARKPLACES5) + EntityFrame5_CL_ReadFrame(); + else + Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol); + break; } } - if (entitiesupdated) - CL_EntityUpdateEnd(); + EntityFrameQuake_ISeeDeadEntities(); + + parsingerror = false; +} + +void CL_Parse_DumpPacket(void) +{ + if (!parsingerror) + return; + Con_Print("Packet dump:\n"); + SZ_HexDumpToConsole(&net_message); + parsingerror = false; +} + +void CL_Parse_Init(void) +{ + // LordHavoc: added demo_nehahra cvar + cl_scores_mempool = Mem_AllocPool("client player info", 0, NULL); + Cvar_RegisterVariable (&demo_nehahra); + if (gamemode == GAME_NEHAHRA) + Cvar_SetValue("demo_nehahra", 1); + Cvar_RegisterVariable(&developer_networkentities); }