X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_main.c;h=79a6a1f2f87d3e97c8be8b02523cbb184c2f6784;hp=b7d65981b57ce105b5da5ad25538e17753ad1655;hb=8688df8a88c8f14d8f11fe73a151e5b53f94407c;hpb=5aea94fe7513a78fe1492c8ca38c617fd93cd023 diff --git a/cl_main.c b/cl_main.c index b7d65981..79a6a1f2 100644 --- a/cl_main.c +++ b/cl_main.c @@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "csprogs.h" #include "r_shadow.h" #include "libcurl.h" +#include "snd_main.h" // we need to declare some mouse variables here, because the menu system // references them even when on a unix system. @@ -51,10 +52,8 @@ cvar_t m_side = {CVAR_SAVE, "m_side","0.8","mouse side speed multiplier"}; cvar_t freelook = {CVAR_SAVE, "freelook", "1","mouse controls pitch instead of forward/back"}; -#ifdef AUTODEMO_BROKEN -cvar_t cl_autodemo = {0, "cl_autodemo", "0", "records every game played, using the date/time and map name to name the demo file" }; -cvar_t cl_autodemo_nameformat = {0, "cl_autodemo_nameformat", "%Y-%m-%d_%H-%M", "The format of the cl_autodemo filename, followed by the map name" }; -#endif +cvar_t cl_autodemo = {CVAR_SAVE, "cl_autodemo", "0", "records every game played, using the date/time and map name to name the demo file" }; +cvar_t cl_autodemo_nameformat = {CVAR_SAVE, "cl_autodemo_nameformat", "autodemos/%Y-%m-%d_%H-%M", "The format of the cl_autodemo filename, followed by the map name" }; cvar_t r_draweffects = {0, "r_draweffects", "1","renders temporary sprite effects"}; @@ -69,7 +68,7 @@ cvar_t cl_stainmaps_clearonload = {CVAR_SAVE, "cl_stainmaps_clearonload", "1","c cvar_t cl_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1","use beam polygons instead of models"}; cvar_t cl_beams_quakepositionhack = {CVAR_SAVE, "cl_beams_quakepositionhack", "1", "makes your lightning gun appear to fire from your waist (as in Quake and QuakeWorld)"}; -cvar_t cl_beams_instantaimhack = {CVAR_SAVE, "cl_beams_instantaimhack", "1", "makes your lightning gun aiming update instantly"}; +cvar_t cl_beams_instantaimhack = {CVAR_SAVE, "cl_beams_instantaimhack", "0", "makes your lightning gun aiming update instantly"}; cvar_t cl_beams_lightatend = {CVAR_SAVE, "cl_beams_lightatend", "0", "make a light at the end of the beam"}; cvar_t cl_noplayershadow = {CVAR_SAVE, "cl_noplayershadow", "0","hide player shadow"}; @@ -112,6 +111,14 @@ void CL_ClearState(void) // reset the view zoom interpolation cl.mviewzoom[0] = cl.mviewzoom[1] = 1; + // enable rendering of the world and such + cl.csqc_vidvars.drawworld = true; + cl.csqc_vidvars.drawenginesbar = true; + cl.csqc_vidvars.drawcrosshair = true; + + // set up the float version of the stats array for easier access to float stats + cl.statsf = (float *)cl.stats; + cl.num_entities = 0; cl.num_static_entities = 0; cl.num_temp_entities = 0; @@ -127,6 +134,7 @@ void CL_ClearState(void) cl.max_lightstyle = MAX_LIGHTSTYLES; cl.max_brushmodel_entities = MAX_EDICTS; cl.max_particles = MAX_PARTICLES; + cl.max_showlmps = 0; // COMMANDLINEOPTION: Client: -particles changes maximum number of particles at once, default 32768 i = COM_CheckParm ("-particles"); @@ -151,6 +159,7 @@ void CL_ClearState(void) cl.lightstyle = (lightstyle_t *)Mem_Alloc(cls.levelmempool, cl.max_lightstyle * sizeof(lightstyle_t)); cl.brushmodel_entities = (int *)Mem_Alloc(cls.levelmempool, cl.max_brushmodel_entities * sizeof(int)); cl.particles = (particle_t *) Mem_Alloc(cls.levelmempool, cl.max_particles * sizeof(particle_t)); + cl.showlmps = NULL; // LordHavoc: have to set up the baseline info for alpha and other stuff for (i = 0;i < cl.max_entities;i++) @@ -194,6 +203,9 @@ void CL_ClearState(void) // mark all frames invalid for delta memset(cl.qw_deltasequence, -1, sizeof(cl.qw_deltasequence)); + // set bestweapon data back to Quake data + IN_BestWeapon_ResetData(); + CL_Screen_NewMap(); } @@ -340,9 +352,9 @@ void CL_Disconnect(void) Con_DPrint("Sending clc_disconnect\n"); MSG_WriteByte(&buf, clc_disconnect); } - NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol); - NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol); - NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol); + NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, false); + NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, false); + NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, false); NetConn_Close(cls.netcon); cls.netcon = NULL; } @@ -379,7 +391,8 @@ void CL_EstablishConnection(const char *host) cls.demonum = -1; // stop demo loop in case this fails - CL_Disconnect(); + if (cls.demoplayback) + CL_StopPlayback(); // if downloads are running, cancel their finishing action Curl_Clear_forthismap(); @@ -433,7 +446,49 @@ static void CL_PrintEntities_f(void) modelname = ent->render.model->name; else modelname = "--no model--"; - Con_Printf("%3i: %-25s:%4i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, modelname, ent->render.frame, (int) ent->state_current.origin[0], (int) ent->state_current.origin[1], (int) ent->state_current.origin[2], (int) ent->state_current.angles[0] % 360, (int) ent->state_current.angles[1] % 360, (int) ent->state_current.angles[2] % 360, ent->render.scale, ent->render.alpha); + Con_Printf("%3i: %-25s:%4i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, modelname, ent->render.frame2, (int) ent->state_current.origin[0], (int) ent->state_current.origin[1], (int) ent->state_current.origin[2], (int) ent->state_current.angles[0] % 360, (int) ent->state_current.angles[1] % 360, (int) ent->state_current.angles[2] % 360, ent->render.scale, ent->render.alpha); + } +} + +/* +=============== +CL_ModelIndexList_f + +List information on all models in the client modelindex +=============== +*/ +static void CL_ModelIndexList_f(void) +{ + int i = 1; + + // Print Header + Con_Printf("%3s: %-30s %-8s %-8s\n", "ID", "Name", "Type", "Triangles"); + + while(cl.model_precache[i] && i != MAX_MODELS) + { // Valid Model + if(cl.model_precache[i]->loaded || cl.model_precache[i]->isworldmodel) + Con_Printf("%3i: %-30s %-8s %-10i\n", i, cl.model_precache[i]->name, cl.model_precache[i]->modeldatatypestring, cl.model_precache[i]->surfmesh.num_triangles); + else + Con_Printf("%3i: %-30s %-30s\n", i, cl.model_precache[i]->name, "--no local model found--"); + i++; + } +} + +/* +=============== +CL_SoundIndexList_f + +List all sounds in the client soundindex +=============== +*/ +static void CL_SoundIndexList_f(void) +{ + int i = 1; + + while(cl.sound_precache[i] && i != MAX_SOUNDS) + { // Valid Sound + Con_Printf("%i : %s\n", i, cl.sound_precache[i]->name); + i++; } } @@ -504,7 +559,7 @@ static float CL_LerpPoint(void) { float f; - if (cl_nettimesyncmode.integer == 3) + if (cl_nettimesyncboundmode.integer == 1) cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]); // LordHavoc: lerp in listen games as the server is being capped below the client (usually) @@ -784,7 +839,7 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat { const matrix4x4_t *matrix; matrix4x4_t blendmatrix, tempmatrix, matrix2; - int j, k, l; + int j, k, l, frame; float origin[3], angles[3], delta[3], lerp, d; entity_t *t; model_t *model; @@ -800,34 +855,29 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat e->render.flags = e->state_current.flags; e->render.effects = e->state_current.effects; VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod); + e->render.entitynumber = e - cl.entities; if (e->state_current.flags & RENDER_COLORMAPPED) { - int cb; unsigned char *cbcolor; e->render.colormap = e->state_current.colormap; - cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12; - cbcolor = (unsigned char *) (&palette_complete[cb]); + cbcolor = (unsigned char *) (&palette_pantscolormap[e->render.colormap & 0xF]); e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f); e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f); e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f); - cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12; - cbcolor = (unsigned char *) (&palette_complete[cb]); + cbcolor = (unsigned char *) (&palette_shirtcolormap[(e->render.colormap & 0xF0) >> 4]); e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f); e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f); e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f); } - else if (e->state_current.colormap && cl.scores != NULL) + else if (e->state_current.colormap && cl.scores != NULL && e->state_current.colormap <= cl.maxclients) { - int cb; unsigned char *cbcolor; e->render.colormap = cl.scores[e->state_current.colormap - 1].colors; // color it - cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12; - cbcolor = (unsigned char *) (&palette_complete[cb]); + cbcolor = (unsigned char *) (&palette_pantscolormap[e->render.colormap & 0xF]); e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f); e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f); e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f); - cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12; - cbcolor = (unsigned char *) (&palette_complete[cb]); + cbcolor = (unsigned char *) (&palette_shirtcolormap[(e->render.colormap & 0xF0) >> 4]); e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f); e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f); e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f); @@ -879,7 +929,10 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat else if (e->render.flags & RENDER_VIEWMODEL) { // view-relative entity (guns and such) - matrix = &viewmodelmatrix; + if (e->render.effects & EF_NOGUNBOB) + matrix = &r_view.matrix; // really attached to view + else + matrix = &viewmodelmatrix; // attached to gun bob matrix } else { @@ -893,11 +946,13 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat // also don't use the predicted location if fixangle was set on both of // the most recent server messages, as that cause means you are spectating // someone or watching a cutscene of some sort + if (cl_nolerp.integer || cls.timedemo) + interpolate = false; if (e == cl.entities + cl.playerentity && cl.movement_predicted && (!cl.fixangle[1] || !cl.fixangle[0])) { lerp = (cl.time - cl.movement_time[2]) / (cl.movement_time[0] - cl.movement_time[1]); lerp = bound(0, lerp, 1); - if (!interpolate || cl_nolerp.integer || cl.fixangle[0]) + if (!interpolate) lerp = 1; VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin); VectorSet(angles, 0, cl.viewangles[1], 0); @@ -921,21 +976,24 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat } // model setup and some modelflags - if(e->state_current.modelindex < MAX_MODELS) + frame = e->state_current.frame; + if (e->state_current.modelindex < MAX_MODELS) e->render.model = cl.model_precache[e->state_current.modelindex]; + else + e->render.model = NULL; if (e->render.model) { + if (e->render.skinnum >= e->render.model->numskins) + e->render.skinnum = 0; + if (frame >= e->render.model->numframes) + frame = 0; + // models can set flags such as EF_ROCKET + // this 0xFF800000 mask is EF_NOMODELFLAGS plus all the higher EF_ flags such as EF_ROCKET + if (!(e->render.effects & 0xFF800000)) + e->render.effects |= e->render.model->effects; // if model is alias or this is a tenebrae-like dlight, reverse pitch direction if (e->render.model->type == mod_alias) angles[0] = -angles[0]; - if ((e->render.model->flags & EF_ROTATE) && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL))) - { - angles[1] = ANGLEMOD(100*cl.time); - if (cl_itembobheight.value) - origin[2] += (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value; - } - // transfer certain model flags to effects - e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE); if ((e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e->state_current.number) VectorScale(e->render.colormod, 2, e->render.colormod); } @@ -943,8 +1001,15 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat else if (e->state_current.lightpflags & PFLAGS_FULLDYNAMIC) angles[0] = -angles[0]; + if ((e->render.effects & EF_ROTATE) && !(e->render.flags & RENDER_VIEWMODEL)) + { + angles[1] = ANGLEMOD(100*cl.time); + if (cl_itembobheight.value) + origin[2] += (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value; + } + // animation lerp - if (e->render.frame2 == e->state_current.frame) + if (e->render.frame2 == frame) { // update frame lerp fraction e->render.framelerp = 1; @@ -962,7 +1027,7 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat // begin a new frame lerp e->render.frame1 = e->render.frame2; e->render.frame1time = e->render.frame2time; - e->render.frame = e->render.frame2 = e->state_current.frame; + e->render.frame2 = frame; e->render.frame2time = cl.time; e->render.framelerp = 0; } @@ -1002,6 +1067,8 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat && !(e->render.flags & RENDER_VIEWMODEL) && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer))) e->render.flags |= RENDER_SHADOW; + if (e->render.flags & RENDER_VIEWMODEL) + e->render.flags |= RENDER_NOSELFSHADOW; } // creates light and trails from an entity @@ -1025,7 +1092,7 @@ void CL_UpdateNetworkEntityTrail(entity_t *e) // entity is in the world... trailtype = EFFECT_NONE; // LordHavoc: if the entity has no effects, don't check each - if (e->render.effects & (EF_BRIGHTFIELD | EF_FLAME | EF_STARDUST | EF_FLAG1QW | EF_FLAG2QW)) + if (e->render.effects & (EF_BRIGHTFIELD | EF_FLAME | EF_STARDUST)) { if (e->render.effects & EF_BRIGHTFIELD) { @@ -1038,40 +1105,41 @@ void CL_UpdateNetworkEntityTrail(entity_t *e) CL_ParticleTrail(EFFECT_EF_FLAME, bound(0, cl.time - cl.oldtime, 0.1), origin, origin, vec3_origin, vec3_origin, NULL, 0, false, true); if (e->render.effects & EF_STARDUST) CL_ParticleTrail(EFFECT_EF_STARDUST, bound(0, cl.time - cl.oldtime, 0.1), origin, origin, vec3_origin, vec3_origin, NULL, 0, false, true); - if (e->render.effects & (EF_FLAG1QW | EF_FLAG2QW)) - { - // these are only set on player entities - CL_AddQWCTFFlagModel(e, (e->render.effects & EF_FLAG2QW) != 0); - } + } + if (e->render.internaleffects & (INTEF_FLAG1QW | INTEF_FLAG2QW)) + { + // these are only set on player entities + CL_AddQWCTFFlagModel(e, (e->render.internaleffects & INTEF_FLAG2QW) != 0); } // muzzleflash fades over time if (e->persistent.muzzleflash > 0) e->persistent.muzzleflash -= bound(0, cl.time - cl.oldtime, 0.1) * 20; - // LordHavoc: if the model has no flags, don't check each - if (e->render.model && e->render.model->flags && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL))) + // LordHavoc: if the entity has no effects, don't check each + if (e->render.effects && !(e->render.flags & RENDER_VIEWMODEL)) { - if (e->render.model->flags & EF_GIB) + if (e->render.effects & EF_GIB) trailtype = EFFECT_TR_BLOOD; - else if (e->render.model->flags & EF_ZOMGIB) + else if (e->render.effects & EF_ZOMGIB) trailtype = EFFECT_TR_SLIGHTBLOOD; - else if (e->render.model->flags & EF_TRACER) + else if (e->render.effects & EF_TRACER) trailtype = EFFECT_TR_WIZSPIKE; - else if (e->render.model->flags & EF_TRACER2) + else if (e->render.effects & EF_TRACER2) trailtype = EFFECT_TR_KNIGHTSPIKE; - else if (e->render.model->flags & EF_ROCKET) + else if (e->render.effects & EF_ROCKET) trailtype = EFFECT_TR_ROCKET; - else if (e->render.model->flags & EF_GRENADE) + else if (e->render.effects & EF_GRENADE) { // LordHavoc: e->render.alpha == -1 is for Nehahra dem compatibility (cigar smoke) trailtype = e->render.alpha == -1 ? EFFECT_TR_NEHAHRASMOKE : EFFECT_TR_GRENADE; } - else if (e->render.model->flags & EF_TRACER3) + else if (e->render.effects & EF_TRACER3) trailtype = EFFECT_TR_VORESPIKE; } // do trails if (e->render.flags & RENDER_GLOWTRAIL) trailtype = EFFECT_TR_GLOWTRAIL; - if (trailtype) + // check if a trail is allowed (it is not after a teleport for example) + if (trailtype && e->persistent.trail_allowed) { float len; vec3_t vel; @@ -1082,6 +1150,9 @@ void CL_UpdateNetworkEntityTrail(entity_t *e) VectorScale(vel, len, vel); CL_ParticleTrail(trailtype, 1, e->persistent.trail_origin, origin, vel, vel, e, e->state_current.glowcolor, false, true); } + // now that the entity has survived one trail update it is allowed to + // leave a real trail on later frames + e->persistent.trail_allowed = true; VectorCopy(origin, e->persistent.trail_origin); } @@ -1120,7 +1191,7 @@ void CL_UpdateNetworkCollisionEntities(void) // start on the entity after the world cl.num_brushmodel_entities = 0; - for (i = 1;i < cl.num_entities;i++) + for (i = cl.maxclients + 1;i < cl.num_entities;i++) { if (cl.entities_active[i]) { @@ -1129,7 +1200,7 @@ void CL_UpdateNetworkCollisionEntities(void) { // do not interpolate the bmodels for this CL_UpdateNetworkEntity(ent, 32, false); - cl.brushmodel_entities[cl.num_brushmodel_entities++] = ent->state_current.number; + cl.brushmodel_entities[cl.num_brushmodel_entities++] = i; } } } @@ -1186,12 +1257,12 @@ void CL_UpdateViewModel(void) ent->state_current.modelindex = 0; } ent->state_current.alpha = cl.entities[cl.viewentity].state_current.alpha; - ent->state_current.effects = EF_NOSHADOW | (cl.entities[cl.viewentity].state_current.effects & (EF_ADDITIVE | EF_REFLECTIVE | EF_FULLBRIGHT | EF_NODEPTHTEST)); + ent->state_current.effects = EF_NOSHADOW | (cl.entities[cl.viewentity].state_current.effects & (EF_ADDITIVE | EF_FULLBRIGHT | EF_NODEPTHTEST | EF_NOGUNBOB)); // reset animation interpolation on weaponmodel if model changed if (ent->state_previous.modelindex != ent->state_current.modelindex) { - ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame; + ent->render.frame1 = ent->render.frame2 = ent->state_current.frame; ent->render.frame1time = ent->render.frame2time = cl.time; ent->render.framelerp = 1; } @@ -1209,12 +1280,7 @@ void CL_LinkNetworkEntity(entity_t *e) // skip inactive entities and world if (!e->state_current.active || e == cl.entities) return; - if (e->render.flags & RENDER_VIEWMODEL && !e->state_current.tagentity) - { - if (!r_drawviewmodel.integer || chase_active.integer || r_refdef.envmap) - return; - } - else + if (e->state_current.tagentity) { // if the tag entity is currently impossible, skip it if (e->state_current.tagentity >= cl.num_entities) @@ -1297,24 +1363,24 @@ void CL_LinkNetworkEntity(entity_t *e) R_RTLight_Update(&r_refdef.lights[r_refdef.numlights++], false, &tempmatrix, color, -1, NULL, true, 0, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); } // LordHavoc: if the model has no flags, don't check each - if (e->render.model && e->render.model->flags && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL))) + if (e->render.model && e->render.effects && !(e->render.flags & RENDER_VIEWMODEL)) { - if (e->render.model->flags & EF_GIB) + if (e->render.effects & EF_GIB) trailtype = EFFECT_TR_BLOOD; - else if (e->render.model->flags & EF_ZOMGIB) + else if (e->render.effects & EF_ZOMGIB) trailtype = EFFECT_TR_SLIGHTBLOOD; - else if (e->render.model->flags & EF_TRACER) + else if (e->render.effects & EF_TRACER) trailtype = EFFECT_TR_WIZSPIKE; - else if (e->render.model->flags & EF_TRACER2) + else if (e->render.effects & EF_TRACER2) trailtype = EFFECT_TR_KNIGHTSPIKE; - else if (e->render.model->flags & EF_ROCKET) + else if (e->render.effects & EF_ROCKET) trailtype = EFFECT_TR_ROCKET; - else if (e->render.model->flags & EF_GRENADE) + else if (e->render.effects & EF_GRENADE) { // LordHavoc: e->render.alpha == -1 is for Nehahra dem compatibility (cigar smoke) trailtype = e->render.alpha == -1 ? EFFECT_TR_NEHAHRASMOKE : EFFECT_TR_GRENADE; } - else if (e->render.model->flags & EF_TRACER3) + else if (e->render.effects & EF_TRACER3) trailtype = EFFECT_TR_VORESPIKE; } // LordHavoc: customizable glow @@ -1358,6 +1424,10 @@ void CL_LinkNetworkEntity(entity_t *e) if (trailtype) CL_ParticleTrail(trailtype, 0, origin, origin, vec3_origin, vec3_origin, NULL, e->state_current.glowcolor, true, false); + // don't show viewmodels in certain situations + if (e->render.flags & RENDER_VIEWMODEL) + if (!r_drawviewmodel.integer || chase_active.integer || r_refdef.envmap) + return; // don't show entities with no modelindex (note: this still shows // entities which have a modelindex that resolved to a NULL model) if (e->render.model && !(e->render.effects & EF_NODRAW) && r_refdef.numentities < r_refdef.maxentities) @@ -1369,7 +1439,6 @@ void CL_LinkNetworkEntity(entity_t *e) void CL_RelinkWorld(void) { entity_t *ent = &cl.entities[0]; - cl.brushmodel_entities[cl.num_brushmodel_entities++] = 0; // FIXME: this should be done at load ent->render.matrix = identitymatrix; CL_UpdateRenderEntity(&ent->render); @@ -1474,7 +1543,6 @@ static void CL_RelinkEffects(void) ent->render.model = cl.model_precache[e->modelindex]; else ent->render.model = cl.csqc_model_precache[-(e->modelindex+1)]; - ent->render.frame = ent->render.frame2; ent->render.colormap = -1; // no special coloring ent->render.alpha = 1; VectorSet(ent->render.colormod, 1, 1, 1); @@ -1526,7 +1594,7 @@ void CL_RelinkBeams(void) vec3_t dist, org, start, end; float d; entity_t *ent; - float yaw, pitch; + double yaw, pitch; float forward; matrix4x4_t tempmatrix; @@ -1569,12 +1637,12 @@ void CL_RelinkBeams(void) } else { - yaw = (int) (atan2(dist[1], dist[0]) * 180 / M_PI); + yaw = atan2(dist[1], dist[0]) * 180 / M_PI; if (yaw < 0) yaw += 360; forward = sqrt (dist[0]*dist[0] + dist[1]*dist[1]); - pitch = (int) (atan2(dist[2], forward) * 180 / M_PI); + pitch = atan2(dist[2], forward) * 180 / M_PI; if (pitch < 0) pitch += 360; } @@ -1680,17 +1748,13 @@ void CSQC_RelinkAllEntities (int drawmask) /* =============== -CL_ReadFromServer +CL_UpdateWorld -Read all incoming data from the server +Update client game world for a new frame =============== */ -int CL_ReadFromServer(void) +void CL_UpdateWorld(void) { - CL_ReadDemoMessage(); - CL_SendMove(); - - r_refdef.time = cl.time; r_refdef.extraupdate = !r_speeds.integer; r_refdef.numentities = 0; r_refdef.numlights = 0; @@ -1707,12 +1771,9 @@ int CL_ReadFromServer(void) V_DriftPitch(); V_FadeViewFlashs(); - if (cl.movement_predicted) - { - // if prediction is enabled we have to update all the collidable - // network entities before the prediction code can be run - CL_UpdateNetworkCollisionEntities(); - } + // if prediction is enabled we have to update all the collidable + // network entities before the prediction code can be run + CL_UpdateNetworkCollisionEntities(); // now update the player prediction CL_ClientMovement_Replay(); @@ -1736,13 +1797,9 @@ int CL_ReadFromServer(void) // move particles CL_MoveParticles(); R_MoveExplosions(); - - // update the r_refdef time again because cl.time may have changed in - // CL_LerpPoint() - r_refdef.time = cl.time; } - return 0; + r_refdef.time = cl.time; } // LordHavoc: pausedemo command @@ -1783,11 +1840,9 @@ For program optimization static void CL_TimeRefresh_f (void) { int i; - float timestart, timedelta, oldangles[3]; + float timestart, timedelta; r_refdef.extraupdate = false; - VectorCopy(cl.viewangles, oldangles); - VectorClear(cl.viewangles); timestart = Sys_DoubleTime(); for (i = 0;i < 128;i++) @@ -1797,7 +1852,6 @@ static void CL_TimeRefresh_f (void) } timedelta = Sys_DoubleTime() - timestart; - VectorCopy(oldangles, cl.viewangles); Con_Printf("%f seconds (%f fps)\n", timedelta, 128/timedelta); } @@ -1856,15 +1910,18 @@ void CL_Locs_FreeNode(cl_locnode_t *node) Con_Printf("CL_Locs_FreeNode: no such node! (%p)\n", node); } -void CL_Locs_AddNode(vec3_t mins, vec3_t maxs, const char *namestart, const char *nameend) +void CL_Locs_AddNode(vec3_t mins, vec3_t maxs, const char *name) { cl_locnode_t *node, **pointer; - int namelen = (int)(nameend - namestart); + int namelen; + if (!name) + name = ""; + namelen = strlen(name); node = Mem_Alloc(cls.levelmempool, sizeof(cl_locnode_t) + namelen + 1); VectorSet(node->mins, min(mins[0], maxs[0]), min(mins[1], maxs[1]), min(mins[2], maxs[2])); VectorSet(node->maxs, max(mins[0], maxs[0]), max(mins[1], maxs[1]), max(mins[2], maxs[2])); node->name = (char *)(node + 1); - memcpy(node->name, namestart, namelen); + memcpy(node->name, name, namelen); node->name[namelen] = 0; // link it into the tail of the list to preserve the order for (pointer = &cl.locnodes;*pointer;pointer = &(*pointer)->next) @@ -1888,10 +1945,10 @@ void CL_Locs_Add_f(void) maxs[0] = atof(Cmd_Argv(4)); maxs[1] = atof(Cmd_Argv(5)); maxs[2] = atof(Cmd_Argv(6)); - CL_Locs_AddNode(mins, maxs, Cmd_Argv(7), Cmd_Argv(7) + strlen(Cmd_Argv(7))); + CL_Locs_AddNode(mins, maxs, Cmd_Argv(7)); } else - CL_Locs_AddNode(mins, mins, Cmd_Argv(4), Cmd_Argv(4) + strlen(Cmd_Argv(4))); + CL_Locs_AddNode(mins, mins, Cmd_Argv(4)); } void CL_Locs_RemoveNearest_f(void) @@ -1948,7 +2005,36 @@ void CL_Locs_Save_f(void) for (loc = cl.locnodes;loc;loc = loc->next) { if (VectorCompare(loc->mins, loc->maxs)) - FS_Printf(outfile, "%.0f %.0f %.0f %s\n", loc->mins[0]*8, loc->mins[1]*8, loc->mins[2]*8, loc->name); + { + int len; + const char *s; + const char *in = loc->name; + char name[MAX_INPUTLINE]; + for (len = 0;len < (int)sizeof(name) - 1 && *in;) + { + if (*in == ' ') {s = "$loc_name_separator";in++;} + else if (!strncmp(in, "SSG", 3)) {s = "$loc_name_ssg";in += 3;} + else if (!strncmp(in, "NG", 2)) {s = "$loc_name_ng";in += 2;} + else if (!strncmp(in, "SNG", 3)) {s = "$loc_name_sng";in += 3;} + else if (!strncmp(in, "GL", 2)) {s = "$loc_name_gl";in += 2;} + else if (!strncmp(in, "RL", 2)) {s = "$loc_name_rl";in += 2;} + else if (!strncmp(in, "LG", 2)) {s = "$loc_name_lg";in += 2;} + else if (!strncmp(in, "GA", 2)) {s = "$loc_name_ga";in += 2;} + else if (!strncmp(in, "YA", 2)) {s = "$loc_name_ya";in += 2;} + else if (!strncmp(in, "RA", 2)) {s = "$loc_name_ra";in += 2;} + else if (!strncmp(in, "MEGA", 4)) {s = "$loc_name_mh";in += 4;} + else s = NULL; + if (s) + { + while (len < (int)sizeof(name) - 1 && *s) + name[len++] = *s++; + continue; + } + name[len++] = *in++; + } + name[len] = 0; + FS_Printf(outfile, "%.0f %.0f %.0f %s\n", loc->mins[0]*8, loc->mins[1]*8, loc->mins[2]*8, name); + } else FS_Printf(outfile, "%.1f,%.1f,%.1f,%.1f,%.1f,%.1f,\"%s\"\n", loc->mins[0], loc->mins[1], loc->mins[2], loc->maxs[0], loc->maxs[1], loc->maxs[2], loc->name); } @@ -1957,11 +2043,13 @@ void CL_Locs_Save_f(void) void CL_Locs_Reload_f(void) { - int i, linenumber, limit; + int i, linenumber, limit, len; + const char *s; char *filedata, *text, *textend, *linestart, *linetext, *lineend; fs_offset_t filesize; vec3_t mins, maxs; char locfilename[MAX_QPATH]; + char name[MAX_INPUTLINE]; if (cls.state != ca_connected || !cl.worldmodel) { @@ -2043,6 +2131,11 @@ void CL_Locs_Reload_f(void) continue; // proquake location names are always quoted lineend--; linetext++; + len = min(lineend - linetext, (int)sizeof(name) - 1); + memcpy(name, linetext, len); + name[len] = 0; + // add the box to the list + CL_Locs_AddNode(mins, maxs, name); } // if a point was parsed, it needs to be scaled down by 8 (since // point-based loc files were invented by a proxy which dealt @@ -2050,14 +2143,39 @@ void CL_Locs_Reload_f(void) // it into a box else if (i == 3) { + // interpret silly fuhquake macros + for (len = 0;len < (int)sizeof(name) - 1 && linetext < lineend;) + { + if (*linetext == '$') + { + if (linetext + 18 <= lineend && !strncmp(linetext, "$loc_name_separator", 19)) {s = " ";linetext += 19;} + else if (linetext + 13 <= lineend && !strncmp(linetext, "$loc_name_ssg", 13)) {s = "SSG";linetext += 13;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ng", 12)) {s = "NG";linetext += 12;} + else if (linetext + 13 <= lineend && !strncmp(linetext, "$loc_name_sng", 13)) {s = "SNG";linetext += 13;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_gl", 12)) {s = "GL";linetext += 12;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_rl", 12)) {s = "RL";linetext += 12;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_lg", 12)) {s = "LG";linetext += 12;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ga", 12)) {s = "GA";linetext += 12;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ya", 12)) {s = "YA";linetext += 12;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ra", 12)) {s = "RA";linetext += 12;} + else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_mh", 12)) {s = "MEGA";linetext += 12;} + else s = NULL; + if (s) + { + while (len < (int)sizeof(name) - 1 && *s) + name[len++] = *s++; + continue; + } + } + name[len++] = *linetext++; + } + name[len] = 0; + // add the point to the list VectorScale(mins, (1.0 / 8.0), mins); - VectorCopy(mins, maxs); + CL_Locs_AddNode(mins, mins, name); } else continue; - // valid line parsed - // add the point or box to the list - CL_Locs_AddNode(mins, maxs, linetext, lineend); } } @@ -2068,6 +2186,7 @@ CL_Shutdown */ void CL_Shutdown (void) { + CL_Screen_Shutdown(); CL_Particles_Shutdown(); CL_Parse_Shutdown(); @@ -2125,10 +2244,13 @@ void CL_Init (void) Cmd_AddCommand ("playdemo", CL_PlayDemo_f, "watch a demo file"); Cmd_AddCommand ("timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log"); -#ifdef AUTODEMO_BROKEN + // Support Client-side Model Index List + Cmd_AddCommand ("cl_modelindexlist", CL_ModelIndexList_f, "list information on all models in the client modelindex"); + // Support Client-side Sound Index List + Cmd_AddCommand ("cl_soundindexlist", CL_SoundIndexList_f, "list all sounds in the client soundindex"); + Cvar_RegisterVariable (&cl_autodemo); Cvar_RegisterVariable (&cl_autodemo_nameformat); -#endif Cmd_AddCommand ("fog", CL_Fog_f, "set global fog parameters (density red green blue)");