X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=3cba5cb7256aeb4bd8369eee436c2968953a7dc7;hb=fc39109e7d165c83de276dbd5e9fcbbdfcd12c3d;hp=8c41941d31afc609eecec93b01c38b07d2a6c943;hpb=6ccde0dc042d5f25cbc58f9d0ca1b0b6b76a43e1;p=xonotic%2Fdarkplaces.git diff --git a/cl_main.c b/cl_main.c index 8c41941d..3cba5cb7 100644 --- a/cl_main.c +++ b/cl_main.c @@ -201,6 +201,53 @@ void CL_ClearState(void) CL_Screen_NewMap(); } +void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allowstarkey, qboolean allowmodel, qboolean quiet) +{ + if (strchr(key, '\"') || strchr(value, '\"') || (!allowstarkey && key[0] == '*') || (!allowmodel && (!strcasecmp(Cmd_Argv(1), "pmodel") || !strcasecmp(Cmd_Argv(1), "emodel")))) + { + if (!quiet) + Con_Printf("Can't setinfo \"%s\" \"%s\"\n"); + return; + } + InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), key, value); + if (cls.state == ca_connected) + { + if (cls.protocol == PROTOCOL_QUAKEWORLD) + { + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("setinfo \"%s\" \"%s\"", key, value)); + } + else if (!strcasecmp(key, "name")) + { + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("name \"%s\"", value)); + } + else if (!strcasecmp(key, "playermodel")) + { + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("playermodel \"%s\"", value)); + } + else if (!strcasecmp(key, "playerskin")) + { + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("playerskin \"%s\"", value)); + } + else if (!strcasecmp(key, "topcolor")) + { + // don't send anything, the combined color code will be updated manually + } + else if (!strcasecmp(key, "bottomcolor")) + { + // don't send anything, the combined color code will be updated manually + } + else if (!strcasecmp(key, "rate")) + { + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("rate \"%s\"", value)); + } + } +} + void CL_ExpandEntities(int num) { int i, oldmaxentities; @@ -239,7 +286,7 @@ void CL_ExpandCSQCEntities(int num) oldmaxentities = cl.max_csqcentities; oldentities = cl.csqcentities; cl.max_csqcentities = (num & ~255) + 256; - cl.csqcentities = Mem_Alloc(cls.levelmempool, cl.max_csqcentities * sizeof(entity_t)); + cl.csqcentities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_csqcentities * sizeof(entity_t)); memcpy(cl.csqcentities, oldentities, oldmaxentities * sizeof(entity_t)); Mem_Free(oldentities); for (i = oldmaxentities;i < cl.max_csqcentities;i++) @@ -664,7 +711,7 @@ void CL_UpdateLights(void) l = (i-1) % cl.lightstyle[j].length; k = cl.lightstyle[j].map[k] - 'a'; l = cl.lightstyle[j].map[l] - 'a'; - r_refdef.lightstylevalue[j] = ((k*frac)+(l*(1-frac)))*22; + r_refdef.lightstylevalue[j] = (unsigned short)(((k*frac)+(l*(1-frac)))*22); } } @@ -743,8 +790,9 @@ void CL_LinkNetworkEntity(entity_t *e) { matrix4x4_t *matrix, blendmatrix, tempmatrix, matrix2; //matrix4x4_t dlightmatrix; - int j, k, l, trailtype, temp; - float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, mins[3], maxs[3], v2[3], d; + int j, k, l; + effectnameindex_t trailtype; + float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, v2[3], d; entity_t *t; model_t *model; trace_t trace; @@ -866,7 +914,7 @@ void CL_LinkNetworkEntity(entity_t *e) // if it's the player entity, update according to client movement if (e == cl.entities + cl.playerentity && cl.movement)// && !e->csqc) { - lerp = (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]); + lerp = (cl.time - cl.movement_time[1]) / (cl.movement_time[0] - cl.movement_time[1]); lerp = bound(0, lerp, 1); VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin); VectorSet(angles, 0, cl.viewangles[1], 0); @@ -961,7 +1009,7 @@ void CL_LinkNetworkEntity(entity_t *e) origin[1] = e->render.matrix.m[1][3]; origin[2] = e->render.matrix.m[2][3]; } - trailtype = -1; + trailtype = EFFECT_NONE; dlightradius = 0; dlightcolor[0] = 0; dlightcolor[1] = 0; @@ -972,13 +1020,7 @@ void CL_LinkNetworkEntity(entity_t *e) if (e->render.effects & EF_BRIGHTFIELD) { if (gamemode == GAME_NEXUIZ) - { - dlightradius = max(dlightradius, 200); - dlightcolor[0] += 0.75f; - dlightcolor[1] += 1.50f; - dlightcolor[2] += 3.00f; - trailtype = 8; - } + trailtype = EFFECT_TR_NEXUIZPLASMA; else CL_EntityParticles(e); } @@ -1014,38 +1056,9 @@ void CL_LinkNetworkEntity(entity_t *e) dlightcolor[2] += 1.50f; } if (e->render.effects & EF_FLAME) - { - mins[0] = origin[0] - 16.0f; - mins[1] = origin[1] - 16.0f; - mins[2] = origin[2] - 16.0f; - maxs[0] = origin[0] + 16.0f; - maxs[1] = origin[1] + 16.0f; - maxs[2] = origin[2] + 16.0f; - // how many flames to make - temp = (int) (cl.time * 300) - (int) (cl.oldtime * 300); - CL_FlameCube(mins, maxs, temp); - d = lhrandom(0.75f, 1); - dlightradius = max(dlightradius, 200); - dlightcolor[0] += d * 2.0f; - dlightcolor[1] += d * 1.5f; - dlightcolor[2] += d * 0.5f; - } + CL_ParticleEffect(EFFECT_EF_FLAME, cl.time - cl.oldtime, origin, origin, vec3_origin, vec3_origin, NULL, 0); if (e->render.effects & EF_STARDUST) - { - mins[0] = origin[0] - 16.0f; - mins[1] = origin[1] - 16.0f; - mins[2] = origin[2] - 16.0f; - maxs[0] = origin[0] + 16.0f; - maxs[1] = origin[1] + 16.0f; - maxs[2] = origin[2] + 16.0f; - // how many particles to make - temp = (int) (cl.time * 200) - (int) (cl.oldtime * 200); - CL_Stardust(mins, maxs, temp); - dlightradius = max(dlightradius, 200); - dlightcolor[0] += 1.0f; - dlightcolor[1] += 0.7f; - dlightcolor[2] += 0.3f; - } + CL_ParticleEffect(EFFECT_EF_STARDUST, cl.time - cl.oldtime, origin, origin, vec3_origin, vec3_origin, NULL, 0); if (e->render.effects & (EF_FLAG1QW | EF_FLAG2QW)) { // these are only set on player entities @@ -1062,62 +1075,28 @@ void CL_LinkNetworkEntity(entity_t *e) tempmatrix.m[1][3] = trace.endpos[1]; tempmatrix.m[2][3] = trace.endpos[2]; CL_AllocDlight(NULL, &tempmatrix, 100, e->persistent.muzzleflash, e->persistent.muzzleflash, e->persistent.muzzleflash, 0, 0, 0, -1, true, 0, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - e->persistent.muzzleflash -= cl.frametime * 10; + e->persistent.muzzleflash -= (cl.time - cl.oldtime) * 10; } // 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->flags & EF_GIB) - trailtype = 2; + trailtype = EFFECT_TR_BLOOD; else if (e->render.model->flags & EF_ZOMGIB) - trailtype = 4; + trailtype = EFFECT_TR_SLIGHTBLOOD; else if (e->render.model->flags & EF_TRACER) - { - trailtype = 3; - //dlightradius = max(dlightradius, 100); - //dlightcolor[0] += 0.25f; - //dlightcolor[1] += 1.00f; - //dlightcolor[2] += 0.25f; - } + trailtype = EFFECT_TR_WIZSPIKE; else if (e->render.model->flags & EF_TRACER2) - { - trailtype = 5; - //dlightradius = max(dlightradius, 100); - //dlightcolor[0] += 1.00f; - //dlightcolor[1] += 0.60f; - //dlightcolor[2] += 0.20f; - } + trailtype = EFFECT_TR_KNIGHTSPIKE; else if (e->render.model->flags & EF_ROCKET) - { - trailtype = 0; - dlightradius = max(dlightradius, 200); - dlightcolor[0] += 3.00f; - dlightcolor[1] += 1.50f; - dlightcolor[2] += 0.50f; - } + trailtype = EFFECT_TR_ROCKET; else if (e->render.model->flags & EF_GRENADE) { // LordHavoc: e->render.alpha == -1 is for Nehahra dem compatibility (cigar smoke) - trailtype = e->render.alpha == -1 ? 7 : 1; + trailtype = e->render.alpha == -1 ? EFFECT_TR_NEHAHRASMOKE : EFFECT_TR_GRENADE; } else if (e->render.model->flags & EF_TRACER3) - { - trailtype = 6; - if (gamemode == GAME_PRYDON) - { - dlightradius = max(dlightradius, 100); - dlightcolor[0] += 0.30f; - dlightcolor[1] += 0.60f; - dlightcolor[2] += 1.20f; - } - else - { - dlightradius = max(dlightradius, 200); - dlightcolor[0] += 1.20f; - dlightcolor[1] += 0.50f; - dlightcolor[2] += 1.00f; - } - } + trailtype = EFFECT_TR_VORESPIKE; } // LordHavoc: customizable glow if (e->state_current.glowsize) @@ -1151,9 +1130,18 @@ void CL_LinkNetworkEntity(entity_t *e) } // do trails if (e->render.flags & RENDER_GLOWTRAIL) - trailtype = 9; - if (trailtype >= 0) - CL_RocketTrail(e->persistent.trail_origin, origin, trailtype, e->state_current.glowcolor, e); + trailtype = EFFECT_TR_GLOWTRAIL; + if (trailtype) + { + float len; + vec3_t vel; + VectorSubtract(e->state_current.origin, e->state_previous.origin, vel); + len = e->state_current.time - e->state_previous.time; + if (len > 0) + len = 1.0f / len; + VectorScale(vel, len, vel); + CL_ParticleEffect(trailtype, 1, e->persistent.trail_origin, origin, vel, vel, e, e->state_current.glowcolor); + } VectorCopy(origin, e->persistent.trail_origin); // tenebrae's sprites are all additive mode (weird) if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite) @@ -1345,7 +1333,7 @@ static void CL_RelinkEffects(void) if (e->active) { frame = (cl.time - e->starttime) * e->framerate + e->startframe; - intframe = frame; + intframe = (int)frame; if (intframe < 0 || intframe >= e->endframe) { memset(e, 0, sizeof(*e)); @@ -1417,7 +1405,7 @@ void CL_RelinkBeams(void) // if coming from the player, update the start position //if (b->entity == cl.viewentity) // Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, b->start); - if (cl_beams_relative.integer && b->entity && cl.entities[b->entity].state_current.active && b->relativestartvalid) + if (cl_beams_relative.integer >= 1 && b->entity && (b->entity == cl.viewentity || cl_beams_relative.integer >= 2) && cl.entities[b->entity].state_current.active && b->relativestartvalid) { entity_render_t *r = &cl.entities[b->entity].render; //Matrix4x4_OriginFromMatrix(&r->matrix, origin); @@ -1519,7 +1507,6 @@ static void CL_RelinkQWNails(void) void CL_LerpPlayer(float frac) { int i; - float d; cl.viewzoom = cl.mviewzoom[1] + frac * (cl.mviewzoom[0] - cl.mviewzoom[1]); for (i = 0;i < 3;i++) @@ -1528,24 +1515,11 @@ void CL_LerpPlayer(float frac) cl.punchvector[i] = cl.mpunchvector[1][i] + frac * (cl.mpunchvector[0][i] - cl.mpunchvector[1][i]); cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]); } - - if (cls.demoplayback) - { - // interpolate the angles - for (i = 0;i < 3;i++) - { - d = cl.mviewangles[0][i] - cl.mviewangles[1][i]; - if (d > 180) - d -= 360; - else if (d < -180) - d += 360; - cl.viewangles[i] = cl.mviewangles[1][i] + frac * d; - } - } } void CSQC_RelinkAllEntities (int drawmask) { + cl.num_brushmodel_entities = 0; CL_RelinkNetworkEntities(drawmask); if(drawmask & ENTMASK_ENGINE) { @@ -1584,7 +1558,6 @@ int CL_ReadFromServer(void) r_refdef.extraupdate = !r_speeds.integer; r_refdef.numentities = 0; r_refdef.viewentitymatrix = identitymatrix; - cl.num_brushmodel_entities = 0; if (cls.state == ca_connected && cls.signon == SIGNONS) { @@ -1599,6 +1572,7 @@ int CL_ReadFromServer(void) CL_ClientMovement_Replay(); if(!csqc_loaded) //[515]: csqc { + cl.num_brushmodel_entities = 0; CL_RelinkNetworkEntities(65535); // move particles @@ -1620,6 +1594,9 @@ int CL_ReadFromServer(void) // update view blend V_CalcViewBlend(); + + // update the r_refdef time again because cl.time may have changed + r_refdef.time = cl.time; } return 0;