X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=d8436a3a001fee3a9c31ed0fd3834d95d20cfbe0;hp=9a06ee434a8aa17c2aadb19c9e81d219473e016f;hb=38a6d5886112027efd65fa160c1902a0d3b3fd20;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb diff --git a/cl_parse.c b/cl_parse.c index 9a06ee43..d8436a3a 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -48,11 +48,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 +80,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"}; -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]; -} - +int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces /* ================== @@ -137,28 +106,39 @@ 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; + int i; + + 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 +146,15 @@ 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++) + + for (i = 0;i < 3;i++) pos[i] = MSG_ReadCoord (); - S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation); -} + S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation); +} /* ================== @@ -191,9 +169,10 @@ void CL_KeepaliveMessage (void) float time; static float lastmsg; int ret; + int c; sizebuf_t old; - byte olddata[8192]; - + qbyte olddata[8192]; + if (sv.active) return; // no need if server is local if (cls.demoplayback) @@ -202,21 +181,22 @@ void CL_KeepaliveMessage (void) // read messages from server, should just be nops 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"); + 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) + c = MSG_ReadByte(); + if (c != svc_nop) Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop"); break; } @@ -239,81 +219,22 @@ void CL_KeepaliveMessage (void) SZ_Clear (&cls.message); } -//FIXME finish this code! -#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 radius; // the point at which lighting stops - vec3_t direction; - vec_t cone; // if non-zero, it is a spot light - vec3_t color; - vec_t distancescale; // attenuation - vec_t lightsubtract; // biasing lighting toward black (hlight feature) -} -staticlight_t; - -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], targetnametemporigin, 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; data = entdata; if (!data) return; - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data)) 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; - targetnameorigintofillin = -1; - targetnametemporigin[0] = 0; - targetnametemporigin[1] = 0; - targetnametemporigin[2] = 0; while (1) { - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data)) return; // error if (com_token[0] == '}') break; // end of worldspawn @@ -323,8 +244,7 @@ void CL_ParseEntityLump(char *entdata) strcpy(key, com_token); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data)) return; // error strcpy(value, com_token); if (!strcmp("sky", key)) @@ -334,7 +254,7 @@ void CL_ParseEntityLump(char *entdata) else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK) R_SetSkyBox(value); else if (!strcmp("fog", key)) - scanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue); + 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)) @@ -343,242 +263,6 @@ 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 (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3) - VectorCopy(v, sunlightcolor); - tyrlite = true; - } - else if (!strcmp("sun_mangle", key)) - { - if (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3) - AngleVectors(v, sunlightdirection, NULL, NULL); - tyrlite = true; - } - else if (!strcmp("origin", key)) - { - if (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3) - { - VectorCopy(v, targetnametemporigin); - 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++; - } - } - } - if (targetnameorigintofillin >= 0) - VectorCopy(targetnametemporigin, targetnameorigin[targetnameorigintofillin]); - - 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; - 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; - targetnametemporigin[0] = 0; - targetnametemporigin[1] = 0; - targetnametemporigin[2] = 0; - 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 = scanf(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 = scanf(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 = scanf(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 (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3) - VectorCopy(v, targetnametemporigin); - } - 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(targetnametemporigin, targetnameorigin[targetnameorigintofillin]); - if (light_enable && staticlights < MAX_STATICLIGHTS && light_light != 0) - { - VectorCopy(light_origin, staticlight[staticlights].origin); - staticlight[staticlights].color[0] = light_light * light_lightcolor[0] * light_color[0]; - staticlight[staticlights].color[1] = light_light * light_lightcolor[1] * light_color[1]; - staticlight[staticlights].color[2] = light_light * light_lightcolor[2] * light_color[2]; - VectorCopy(light_direction, staticlight[staticlights].direction); - staticlight[staticlights].cone = light_cone; - staticlight[staticlights].distancescale = light_distancescale; - staticlight[staticlights].fadetype = light_fadetype; - staticlight[staticlights].style = light_style; - if (light_target && (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].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 (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; } } @@ -591,7 +275,7 @@ 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); @@ -616,8 +300,7 @@ 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, "spawn"); break; case 3: @@ -626,7 +309,6 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); break; case 4: -// SCR_EndLoadingPlaque (); // allow normal screen updates Con_ClearNotify(); break; } @@ -637,13 +319,16 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); CL_ParseServerInfo ================== */ +qbyte entlife[MAX_EDICTS]; +// 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"); // @@ -653,9 +338,9 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250) + if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) { - Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION); + Host_Error ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); return; } Nehahrademcompatibility = false; @@ -663,7 +348,9 @@ void CL_ParseServerInfo (void) Nehahrademcompatibility = true; if (cls.demoplayback && demo_nehahra.integer) Nehahrademcompatibility = true; - dpprotocol = i == DPPROTOCOL_VERSION; + dpprotocol = i; + if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) + dpprotocol = 0; // parse maxclients cl.maxclients = MSG_ReadByte (); @@ -688,97 +375,98 @@ void CL_ParseServerInfo (void) 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 -// - + // check memory integrity Mem_CheckSentinelsGlobal(); - Mod_ClearUsed(); - - Mem_CheckSentinelsGlobal(); + // disable until we get textures for it + R_ResetSkyBox(); -// precache models memset (cl.model_precache, 0, sizeof(cl.model_precache)); + memset (cl.sound_precache, 0, sizeof(cl.sound_precache)); + + // touch all of the precached models that are still loaded so we can free + // anything that isn't needed + Mod_ClearUsed(); for (nummodels=1 ; ; nummodels++) { + CL_KeepaliveMessage (); 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); + strcpy (parse_model_precache[nummodels], str); Mod_TouchModel (str); } -// precache sounds - memset (cl.sound_precache, 0, sizeof(cl.sound_precache)); + // do the same for sounds for (numsounds=1 ; ; numsounds++) { + CL_KeepaliveMessage (); 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); + strcpy (parse_sound_precache[numsounds], str); S_TouchSound (str); } - Mem_CheckSentinelsGlobal(); - + // purge anything that was not touched Mod_PurgeUnused(); -// -// now we try to load everything else until a cache allocation fails -// + // now we try to load everything that is new - Mem_CheckSentinelsGlobal(); + // world model + CL_KeepaliveMessage (); + cl.model_precache[1] = Mod_ForName (parse_model_precache[1], false, false, true); + if (cl.model_precache[1] == NULL) + Con_Printf("Map %s not found\n", parse_model_precache[1]); - for (i=1 ; istate_current.active = true; + ent->render.model = cl.worldmodel = cl.model_precache[1]; + //ent->render.scale = 1; + ent->render.alpha = 1; + 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); + // clear entlife array + memset(entlife, 0, MAX_EDICTS); - R_NewMap (); + cl_num_entities = 1; - Mem_CheckSentinelsGlobal(); + R_Modules_NewMap (); + CL_CGVM_Start(); + + // noclip is turned off at start + noclip_anglehack = false; - noclip_anglehack = false; // noclip is turned off at start + // check memory integrity + Mem_CheckSentinelsGlobal(); } void CL_ValidateState(entity_state_t *s) @@ -799,16 +487,60 @@ void CL_ValidateState(entity_state_t *s) Mod_CheckLoaded(model); if (model && 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\"\n", s->frame, model->name); s->frame = 0; } if (model && s->skin > 0 && s->skin >= model->numskins) { - 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\"\n", s->skin, model->name); s->skin = 0; } } +void CL_MoveLerpEntityStates(entity_t *ent) +{ + float odelta[3], adelta[3]; + VectorSubtract(ent->state_current.origin, ent->persistent.neworigin, odelta); + VectorSubtract(ent->state_current.angles, ent->persistent.newangles, adelta); + if (!ent->state_previous.active || cls.timedemo || DotProduct(odelta, odelta) > 1000*1000 || cl_nolerp.integer) + { + // we definitely shouldn't lerp + 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 if (ent->state_current.flags & RENDER_STEP) + { + // monster interpolation + if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01) + { + 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 + { + // not a monster + ent->persistent.lerpstarttime = cl.mtime[1]; + // no lerp if it's singleplayer + if (sv.active && svs.maxclients == 1 && !ent->state_current.flags & RENDER_STEP) + ent->persistent.lerpdeltatime = 0; + else + ent->persistent.lerpdeltatime = cl.mtime[0] - 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); + } +} + /* ================== CL_ParseUpdate @@ -818,20 +550,12 @@ 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) { - int i, num, deltadie; + int num; 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)) @@ -851,30 +575,22 @@ void CL_ParseUpdate (int bits) if (num < 1) Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num); - // mark as visible (no kill) - entkill[num] = 0; + ent = cl_entities + num; - ent = CL_EntityNum (num); - - for (i = 0;i < 32;i++) - if (bits & (1 << i)) - bitprofile[i]++; - bitprofilecount++; - - deltadie = false; + // note: this inherits the 'active' state of the baseline chosen + // (state_baseline is always active, state_current may not be active if + // the entity was missing in the last frame) 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.active = true; + } + new.number = num; 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(); @@ -892,12 +608,8 @@ void CL_ParseUpdate (int bits) 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); @@ -912,7 +624,8 @@ void CL_ParseUpdate (int bits) int j = MSG_ReadFloat() * 255.0f; if (i == 2) { - if (MSG_ReadFloat()) + i = MSG_ReadFloat(); + if (i) new.effects |= EF_FULLBRIGHT; } if (j < 0) @@ -923,96 +636,62 @@ void CL_ParseUpdate (int bits) new.alpha = j; } - if (deltadie) - { - // hide the entity - new.active = false; - } - else + if (new.active) CL_ValidateState(&new); - if (new.flags & RENDER_STEP) // FIXME: rename this flag? + ent->state_previous = ent->state_current; + ent->state_current = new; + if (ent->state_current.active) { - // make time identical for memcmp - new.time = ent->state_current.time; - if (memcmp(&new, &ent->state_current, sizeof(entity_state_t))) - { - // 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; - } - } - else - { - ent->state_previous = ent->state_current; - ent->state_current = new; + CL_MoveLerpEntityStates(ent); + cl_entities_active[ent->state_current.number] = true; + // mark as visible (no kill this frame) + entlife[ent->state_current.number] = 2; } } -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) +static entity_frame_t entityframe; +void CL_ReadEntityFrame(void) { + entity_t *ent; 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; + EntityFrame_Read(&cl.entitydatabase); + EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe); + for (i = 0;i < entityframe.numentities;i++) + { + // copy the states + ent = &cl_entities[entityframe.entitydata[i].number]; + ent->state_previous = ent->state_current; + ent->state_current = entityframe.entitydata[i]; + CL_MoveLerpEntityStates(ent); + // the entity lives again... + entlife[ent->state_current.number] = 2; + cl_entities_active[ent->state_current.number] = true; + } + VectorCopy(cl.viewentoriginnew, cl.viewentoriginold); + VectorCopy(entityframe.eye, cl.viewentoriginnew); } void CL_EntityUpdateSetup(void) { - memset(entkill, 1, MAX_EDICTS); } void CL_EntityUpdateEnd(void) { int i; + // disable entities that disappeared this frame for (i = 1;i < MAX_EDICTS;i++) - if (entkill[i]) - cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0; + { + // clear only the entities that were active last frame but not this + // frame, don't waste time clearing all entities (which would cause + // cache misses) + if (entlife[i]) + { + entlife[i]--; + if (!entlife[i]) + cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0; + } + } } /* @@ -1079,7 +758,7 @@ 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++) { @@ -1093,7 +772,7 @@ void CL_ParseClientdata (int bits) else cl.punchangle[i] = 0; if (bits & (SU_PUNCHVEC1<= 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 @@ -1157,11 +848,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--; } /* @@ -1181,7 +879,7 @@ void CL_ParseStaticSound (int large) sound_num = MSG_ReadByte (); vol = MSG_ReadByte (); atten = MSG_ReadByte (); - + S_StaticSound (cl.sound_precache[sound_num], org, vol, atten); } @@ -1213,22 +911,480 @@ void CL_ParseEffect2 (void) 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; + +/* +================= +CL_ParseTEnt +================= +*/ +void CL_InitTEnts (void) +{ + cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav", false); + cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav", false); + cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav", false); + cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav", false); + cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav", false); + cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav", false); + cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false); +} + +void CL_ParseBeam (model_t *m, int lightning) +{ + int i, ent; + vec3_t start, end; + beam_t *b; + + ent = MSG_ReadShort (); + MSG_ReadVector(start); + MSG_ReadVector(end); + + 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_Printf ("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; + + type = MSG_ReadByte (); + switch (type) + { + case TE_WIZSPIKE: + // spike hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_AllocDlight (NULL, pos, 50, 0.25f, 1.00f, 0.25f, 250, 0.2); + 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_AllocDlight (NULL, pos, 50, 1.0f, 0.60f, 0.20f, 250, 0.2); + 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + // LordHavoc: changed to spark shower + CL_SparkShower(pos, vec3_origin, 15); + 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + // LordHavoc: changed to spark shower + CL_SparkShower(pos, vec3_origin, 15); + CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); + 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + // LordHavoc: changed to dust shower + CL_SparkShower(pos, vec3_origin, 30); + 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + // LordHavoc: changed to dust shower + CL_SparkShower(pos, vec3_origin, 30); + CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); + 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + dir[0] = MSG_ReadChar (); + dir[1] = MSG_ReadChar (); + dir[2] = MSG_ReadChar (); + count = MSG_ReadByte (); + CL_BloodPuff(pos, dir, count); + break; + case TE_BLOOD2: + // blood puff + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_BloodPuff(pos, vec3_origin, 10); + break; + case TE_SPARK: + // spark shower + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + dir[0] = MSG_ReadChar (); + dir[1] = MSG_ReadChar (); + dir[2] = MSG_ReadChar (); + count = MSG_ReadByte (); + CL_SparkShower(pos, dir, count); + break; + case TE_PLASMABURN: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + CL_PlasmaBurn(pos); + break; + // LordHavoc: added for improved gore + case TE_BLOODSHOWER: + // vaporized body + MSG_ReadVector(pos); // mins + MSG_ReadVector(pos2); // maxs + velspeed = MSG_ReadCoord (); // speed + count = MSG_ReadShort (); // number of particles + CL_BloodShower(pos, pos2, velspeed, count); + break; + case TE_PARTICLECUBE: + // general purpose particle effect + MSG_ReadVector(pos); // mins + MSG_ReadVector(pos2); // maxs + MSG_ReadVector(dir); // dir + count = MSG_ReadShort (); // number of particles + colorStart = MSG_ReadByte (); // color + colorLength = MSG_ReadByte (); // gravity (1 or 0) + velspeed = MSG_ReadCoord (); // randomvel + CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed); + break; + + case TE_PARTICLERAIN: + // general purpose particle effect + MSG_ReadVector(pos); // mins + MSG_ReadVector(pos2); // maxs + MSG_ReadVector(dir); // dir + count = 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); // mins + MSG_ReadVector(pos2); // maxs + MSG_ReadVector(dir); // dir + count = 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + // LordHavoc: changed to dust shower + CL_SparkShower(pos, vec3_origin, 15); + break; + + case TE_GUNSHOTQUAD: + // quad bullet hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_SparkShower(pos, vec3_origin, 15); + CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); + break; + + case TE_EXPLOSION: + // rocket explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5 + CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_EXPLOSIONQUAD: + // quad rocket explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_EXPLOSION3: + // Nehahra movie colored lighting explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_EXPLOSIONRGB: + // colored lighting explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + color[0] = MSG_ReadByte() * (1.0 / 255.0); + color[1] = MSG_ReadByte() * (1.0 / 255.0); + color[2] = MSG_ReadByte() * (1.0 / 255.0); + CL_AllocDlight (NULL, pos, 350, color[0], color[1], color[2], 700, 0.5); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_TAREXPLOSION: + // tarbaby explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_BlobExplosion (pos); + + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + CL_AllocDlight (NULL, pos, 600, 0.8f, 0.4f, 1.0f, 1200, 0.5); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_SMALLFLASH: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + break; + + case TE_CUSTOMFLASH: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + radius = MSG_ReadByte() * 8; + velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0); + color[0] = MSG_ReadByte() * (1.0 / 255.0); + color[1] = MSG_ReadByte() * (1.0 / 255.0); + color[2] = MSG_ReadByte() * (1.0 / 255.0); + CL_AllocDlight (NULL, pos, radius, color[0], color[1], color[2], radius / velspeed, velspeed); + break; + + case TE_FLAMEJET: + MSG_ReadVector(pos); + MSG_ReadVector(dir); + 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", true, 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", true, 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: + pos[0] = MSG_ReadCoord (); + pos[1] = MSG_ReadCoord (); + pos[2] = MSG_ReadCoord (); + CL_LavaSplash (pos); + break; + + case TE_TELEPORT: + pos[0] = MSG_ReadCoord (); + pos[1] = MSG_ReadCoord (); + pos[2] = MSG_ReadCoord (); + CL_AllocDlight (NULL, pos, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f); +// CL_TeleportSplash (pos); + break; + + case TE_EXPLOSION2: + // color mapped explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + colorStart = MSG_ReadByte (); + colorLength = MSG_ReadByte (); + CL_ParticleExplosion2 (pos, colorStart, colorLength); + tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart]; + CL_AllocDlight (NULL, pos, 350, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_TEI_G3: + MSG_ReadVector(pos); + MSG_ReadVector(pos2); + MSG_ReadVector(dir); + 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); + MSG_ReadVector(dir); + count = MSG_ReadByte (); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_Tei_Smoke(pos, dir, count); + break; + + case TE_TEI_BIGEXPLOSION: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_TEI_PLASMAHIT: + MSG_ReadVector(pos); + MSG_ReadVector(dir); + count = MSG_ReadByte (); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 5); + CL_Tei_PlasmaHit(pos, dir, count); + CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999); + 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); +static qbyte cgamenetbuffer[65536]; + /* ===================== CL_ParseServerMessage ===================== */ +int parsingerror = false; void CL_ParseServerMessage (void) { int cmd; int i, entitiesupdated; - byte cmdlog[32]; + qbyte cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; - + // // if recording demos, copy the message out // @@ -1236,16 +1392,17 @@ void CL_ParseServerMessage (void) Con_Printf ("%i ",net_message.cursize); else if (cl_shownet.integer == 2) Con_Printf ("------------------\n"); - - cl.onground = false; // unless the server says otherwise + + cl.onground = false; // unless the server says otherwise // // parse the message // MSG_BeginReading (); entitiesupdated = false; - CL_EntityUpdateSetup(); - + + parsingerror = true; + while (1) { if (msg_badread) @@ -1270,6 +1427,12 @@ void CL_ParseServerMessage (void) temp = "entity"; cmdlogname[cmdindex] = temp; SHOWNET("fast update"); + if (cls.signon == SIGNONS - 1) + { + // first update is the final signon stage + cls.signon = SIGNONS; + CL_SignonReply (); + } CL_ParseUpdate (cmd&127); continue; } @@ -1282,7 +1445,7 @@ void CL_ParseServerMessage (void) temp = ""; cmdlogname[cmdindex] = temp; } - + // other commands switch (cmd) { @@ -1309,46 +1472,52 @@ void CL_ParseServerMessage (void) Host_Error ("CL_ParseServerMessage: Illegible server message\n"); } break; - + case svc_nop: -// Con_Printf ("svc_nop\n"); break; - + case svc_time: - // handle old protocols which do not have entity update ranges - entitiesupdated = true; + if (!entitiesupdated) + { + // this is a new frame, we'll be seeing entities, + // so prepare for entity updates + CL_EntityUpdateSetup(); + 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 (); 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); + if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) + Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); Nehahrademcompatibility = false; if (i == 250) Nehahrademcompatibility = true; if (cls.demoplayback && demo_nehahra.integer) Nehahrademcompatibility = true; - dpprotocol = i == DPPROTOCOL_VERSION; + dpprotocol = i; + if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) + dpprotocol = 0; break; - + case svc_disconnect: Host_EndGame ("Server disconnected\n"); case svc_print: Con_Printf ("%s", MSG_ReadString ()); break; - + case svc_centerprint: SCR_CenterPrint (MSG_ReadString ()); break; - + case svc_stufftext: Cbuf_AddText (MSG_ReadString ()); break; @@ -1359,18 +1528,20 @@ 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 (); break; - + case svc_setview: cl.viewentity = MSG_ReadShort (); + // 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) @@ -1379,7 +1550,7 @@ void CL_ParseServerMessage (void) 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; @@ -1396,24 +1567,24 @@ void CL_ParseServerMessage (void) case svc_updatename: i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD"); + Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients"); strcpy (cl.scores[i].name, MSG_ReadString ()); break; - + case svc_updatefrags: i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD"); + Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients"); cl.scores[i].frags = MSG_ReadShort (); - break; + 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; @@ -1428,13 +1599,15 @@ void CL_ParseServerMessage (void) case svc_spawnbaseline: i = MSG_ReadShort (); - // must use CL_EntityNum() to force cl.num_entities up - CL_ParseBaseline (CL_EntityNum(i), false); + 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); + 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); @@ -1443,7 +1616,7 @@ void CL_ParseServerMessage (void) CL_ParseStatic (true); break; case svc_temp_entity: - CL_ParseTEnt (); + CL_ParseTempEntity (); break; case svc_setpause: @@ -1453,7 +1626,7 @@ void CL_ParseServerMessage (void) else CDAudio_Resume (); break; - + case svc_signonnum: i = MSG_ReadByte (); if (i <= cls.signon) @@ -1476,7 +1649,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; @@ -1489,29 +1662,26 @@ 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 ()); 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: @@ -1526,9 +1696,47 @@ void CL_ParseServerMessage (void) 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 (); + } + CL_ReadEntityFrame(); + break; } } if (entitiesupdated) CL_EntityUpdateEnd(); + + parsingerror = false; +} + +void CL_Parse_DumpPacket(void) +{ + if (!parsingerror) + return; + Con_Printf("Packet dump:\n"); + SZ_HexDumpToConsole(&net_message); + parsingerror = false; +} + +void CL_Parse_Init(void) +{ + // LordHavoc: added demo_nehahra cvar + Cvar_RegisterVariable (&demo_nehahra); + if (gamemode == GAME_NEHAHRA) + Cvar_SetValue("demo_nehahra", 1); }