X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_main.c;h=0a5b5bdf8c500f8de57c1d204f52d538106b5d40;hp=ddf57d3ee9059de44bd3381d0a4112fcb4f70e68;hb=700595596cc73b077db70faab83ae761bdd2e36c;hpb=b91033966317d4d6a2a6bdf2952291fc88e3f7c4 diff --git a/sv_main.c b/sv_main.c index ddf57d3e..0a5b5bdf 100644 --- a/sv_main.c +++ b/sv_main.c @@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -static cvar_t sv_pvscheckentities = {0, "sv_pvscheckentities", "1"}; -static cvar_t sv_vischeckentities = {0, "sv_vischeckentities", "0"}; // extremely accurate visibility checking, but too slow -static cvar_t sv_reportvischeckentities = {0, "sv_reportvischeckentities", "0"}; -static int sv_vischeckentitycullcount = 0; +static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "0"}; // fast but loose +static cvar_t sv_cullentities_portal = {0, "sv_cullentities_portal", "0"}; // extremely accurate visibility checking, but too slow +static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "1"}; // tends to get false negatives, uses a timeout to keep entities visible a short time after becoming hidden +static cvar_t sv_cullentities_stats = {0, "sv_cullentities_stats", "0"}; server_t sv; server_static_t svs; @@ -35,6 +35,9 @@ static mempool_t *sv_edicts_mempool = NULL; //============================================================================ +extern void SV_Phys_Init (void); +extern void SV_World_Init (void); + /* =============== SV_Init @@ -56,9 +59,13 @@ void SV_Init (void) Cvar_RegisterVariable (&sv_nostep); Cvar_RegisterVariable (&sv_predict); Cvar_RegisterVariable (&sv_deltacompress); - Cvar_RegisterVariable (&sv_pvscheckentities); - Cvar_RegisterVariable (&sv_vischeckentities); - Cvar_RegisterVariable (&sv_reportvischeckentities); + Cvar_RegisterVariable (&sv_cullentities_pvs); + Cvar_RegisterVariable (&sv_cullentities_portal); + Cvar_RegisterVariable (&sv_cullentities_trace); + Cvar_RegisterVariable (&sv_cullentities_stats); + + SV_Phys_Init(); + SV_World_Init(); for (i = 0;i < MAX_MODELS;i++) sprintf (localmodels[i], "*%i", i); @@ -88,9 +95,9 @@ void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count) if (sv.datagram.cursize > MAX_DATAGRAM-16) return; MSG_WriteByte (&sv.datagram, svc_particle); - MSG_WriteFloatCoord (&sv.datagram, org[0]); - MSG_WriteFloatCoord (&sv.datagram, org[1]); - MSG_WriteFloatCoord (&sv.datagram, org[2]); + MSG_WriteDPCoord (&sv.datagram, org[0]); + MSG_WriteDPCoord (&sv.datagram, org[1]); + MSG_WriteDPCoord (&sv.datagram, org[2]); for (i=0 ; i<3 ; i++) { v = dir[i]*16; @@ -118,9 +125,9 @@ void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, if (modelindex >= 256 || startframe >= 256) { MSG_WriteByte (&sv.datagram, svc_effect2); - MSG_WriteFloatCoord (&sv.datagram, org[0]); - MSG_WriteFloatCoord (&sv.datagram, org[1]); - MSG_WriteFloatCoord (&sv.datagram, org[2]); + MSG_WriteDPCoord (&sv.datagram, org[0]); + MSG_WriteDPCoord (&sv.datagram, org[1]); + MSG_WriteDPCoord (&sv.datagram, org[2]); MSG_WriteShort (&sv.datagram, modelindex); MSG_WriteShort (&sv.datagram, startframe); MSG_WriteByte (&sv.datagram, framecount); @@ -129,9 +136,9 @@ void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, else { MSG_WriteByte (&sv.datagram, svc_effect); - MSG_WriteFloatCoord (&sv.datagram, org[0]); - MSG_WriteFloatCoord (&sv.datagram, org[1]); - MSG_WriteFloatCoord (&sv.datagram, org[2]); + MSG_WriteDPCoord (&sv.datagram, org[0]); + MSG_WriteDPCoord (&sv.datagram, org[1]); + MSG_WriteDPCoord (&sv.datagram, org[2]); MSG_WriteByte (&sv.datagram, modelindex); MSG_WriteByte (&sv.datagram, startframe); MSG_WriteByte (&sv.datagram, framecount); @@ -212,7 +219,7 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, else MSG_WriteByte (&sv.datagram, sound_num); for (i=0 ; i<3 ; i++) - MSG_WriteFloatCoord (&sv.datagram, entity->v.origin[i]+0.5*(entity->v.mins[i]+entity->v.maxs[i])); + MSG_WriteDPCoord (&sv.datagram, entity->v.origin[i]+0.5*(entity->v.mins[i]+entity->v.maxs[i])); } /* @@ -236,12 +243,16 @@ void SV_SendServerinfo (client_t *client) char **s; char message[2048]; + // LordHavoc: clear entityframe tracking + client->entityframenumber = 0; + EntityFrame_ClearDatabase(&client->entitydatabase); + MSG_WriteByte (&client->message, svc_print); - sprintf (message, "\002\nServer: %s build %i (progs %i crc)", gamename, buildnumber, pr_crc); + sprintf (message, "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc); MSG_WriteString (&client->message,message); MSG_WriteByte (&client->message, svc_serverinfo); - MSG_WriteLong (&client->message, DPPROTOCOL_VERSION); + MSG_WriteLong (&client->message, DPPROTOCOL_VERSION3); MSG_WriteByte (&client->message, svs.maxclients); if (!coop.integer && deathmatch.integer) @@ -328,7 +339,14 @@ void SV_ConnectClient (int clientnum) client->spawn_parms[i] = (&pr_global_struct->parm1)[i]; } +#if NOROUTINGFIX SV_SendServerinfo (client); +#else + // send serverinfo on first nop + client->waitingforconnect = true; + client->sendsignon = true; + client->spawned = false; // need prespawn, spawn, etc +#endif } @@ -401,12 +419,12 @@ crosses a waterline. */ int fatbytes; -byte fatpvs[MAX_MAP_LEAFS/8]; +qbyte fatpvs[MAX_MAP_LEAFS/8]; void SV_AddToFatPVS (vec3_t org, mnode_t *node) { int i; - byte *pvs; + qbyte *pvs; mplane_t *plane; float d; @@ -446,7 +464,7 @@ Calculates a PVS that is the inclusive or of all leafs within 8 pixels of the given point. ============= */ -byte *SV_FatPVS (vec3_t org) +qbyte *SV_FatPVS (vec3_t org) { fatbytes = (sv.worldmodel->numleafs+31)>>3; memset (fatpvs, 0, fatbytes); @@ -457,7 +475,7 @@ byte *SV_FatPVS (vec3_t org) //============================================================================= -int SV_BoxTouchingPVS (byte *pvs, vec3_t mins, vec3_t maxs, mnode_t *node) +int SV_BoxTouchingPVS (qbyte *pvs, vec3_t mins, vec3_t maxs, mnode_t *node) { int leafnum; loc0: @@ -497,30 +515,31 @@ SV_WriteEntitiesToClient ============= */ +#ifdef QUAKEENTITIES void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) { - int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects; - byte *pvs; - vec3_t org, origin, angles, entmins, entmaxs; - float nextfullupdate; - edict_t *ent; - eval_t *val; - entity_state_t *baseline; // LordHavoc: delta or startup baseline - trace_t trace; - model_t *model; + int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects; + int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities; + qbyte *pvs; + vec3_t origin, angles, entmins, entmaxs, testorigin, testeye; + float nextfullupdate, alphaf; + edict_t *ent; + eval_t *val; + entity_state_t *baseline; // LordHavoc: delta or startup baseline + trace_t trace; + model_t *model; Mod_CheckLoaded(sv.worldmodel); // find the client's PVS - VectorAdd (clent->v.origin, clent->v.view_ofs, org); - pvs = SV_FatPVS (org); - /* - // dp protocol - MSG_WriteByte(msg, svc_playerposition); - MSG_WriteFloat(msg, org[0]); - MSG_WriteFloat(msg, org[1]); - MSG_WriteFloat(msg, org[2]); - */ + VectorAdd (clent->v.origin, clent->v.view_ofs, testeye); + pvs = SV_FatPVS (testeye); + + culled_pvs = 0; + culled_portal = 0; + culled_trace = 0; + visibleentities = 0; + totalentities = 0; clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes // send all entities that touch the pvs @@ -622,35 +641,72 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } } + totalentities++; + // if not touching a visible leaf - if (sv_pvscheckentities.integer && !SV_BoxTouchingPVS(pvs, entmins, entmaxs, sv.worldmodel->nodes)) + if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, entmins, entmaxs, sv.worldmodel->nodes)) + { + culled_pvs++; continue; + } // or not visible through the portals - if (sv_vischeckentities.integer && !Portal_CheckBox(sv.worldmodel, org, entmins, entmaxs)) + if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs)) { - sv_vischeckentitycullcount++; + culled_portal++; continue; } + + // don't try to cull embedded brush models with this, they're sometimes huge (spanning several rooms) + if (sv_cullentities_trace.integer && (model == NULL || model->type != mod_brush || model->name[0] != '*')) + { + // LordHavoc: test random offsets, to maximize chance of detection + testorigin[0] = lhrandom(entmins[0], entmaxs[0]); + testorigin[1] = lhrandom(entmins[1], entmaxs[1]); + testorigin[2] = lhrandom(entmins[2], entmaxs[2]); + + Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); + + if (trace.fraction == 1) + client->visibletime[e] = realtime + 1; + else + { + //test nearest point on bbox + testorigin[0] = bound(entmins[0], testeye[0], entmaxs[0]); + testorigin[1] = bound(entmins[1], testeye[1], entmaxs[1]); + testorigin[2] = bound(entmins[2], testeye[2], entmaxs[2]); + + Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); + + if (trace.fraction == 1) + client->visibletime[e] = realtime + 1; + else if (realtime > client->visibletime[e]) + { + culled_trace++; + continue; + } + } + } + visibleentities++; } - alpha = 255; + alphaf = 255.0f; scale = 16; glowcolor = 254; effects = ent->v.effects; if ((val = GETEDICTFIELDVALUE(ent, eval_alpha))) if (val->_float != 0) - alpha = (int) (val->_float * 255.0); + alphaf = val->_float * 255.0f; // HalfLife support if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt))) if (val->_float != 0) - alpha = (int) val->_float; + alphaf = val->_float; - if (alpha == 0) - alpha = 255; - alpha = bound(0, alpha, 255); + if (alphaf == 0.0f) + alphaf = 255.0f; + alpha = bound(0, alphaf, 255); if ((val = GETEDICTFIELDVALUE(ent, eval_scale))) if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16; @@ -685,7 +741,10 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) Con_Printf ("packet overflow\n"); // mark the rest of the entities so they can't be delta compressed against this frame for (;e < sv.num_edicts;e++) + { client->nextfullupdate[e] = -1; + client->visibletime[e] = -1; + } return; } @@ -719,17 +778,14 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) bits |= U_STEP; // LordHavoc: old stuff, but rewritten to have more exact tolerances -// if ((int)(origin[0]*8.0) != (int)(baseline->origin[0]*8.0)) bits |= U_ORIGIN1; -// if ((int)(origin[1]*8.0) != (int)(baseline->origin[1]*8.0)) bits |= U_ORIGIN2; -// if ((int)(origin[2]*8.0) != (int)(baseline->origin[2]*8.0)) bits |= U_ORIGIN3; if (origin[0] != baseline->origin[0]) bits |= U_ORIGIN1; if (origin[1] != baseline->origin[1]) bits |= U_ORIGIN2; if (origin[2] != baseline->origin[2]) bits |= U_ORIGIN3; if (((int)(angles[0]*(256.0/360.0)) & 255) != ((int)(baseline->angles[0]*(256.0/360.0)) & 255)) bits |= U_ANGLE1; if (((int)(angles[1]*(256.0/360.0)) & 255) != ((int)(baseline->angles[1]*(256.0/360.0)) & 255)) bits |= U_ANGLE2; if (((int)(angles[2]*(256.0/360.0)) & 255) != ((int)(baseline->angles[2]*(256.0/360.0)) & 255)) bits |= U_ANGLE3; - if (baseline->colormap != (byte) ent->v.colormap) bits |= U_COLORMAP; - if (baseline->skin != (byte) ent->v.skin) bits |= U_SKIN; + if (baseline->colormap != (qbyte) ent->v.colormap) bits |= U_COLORMAP; + if (baseline->skin != (qbyte) ent->v.skin) bits |= U_SKIN; if ((baseline->frame & 0x00FF) != ((int) ent->v.frame & 0x00FF)) bits |= U_FRAME; if ((baseline->effects & 0x00FF) != ((int) ent->v.effects & 0x00FF)) bits |= U_EFFECTS; if ((baseline->modelindex & 0x00FF) != ((int) ent->v.modelindex & 0x00FF)) bits |= U_MODEL; @@ -784,11 +840,11 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (bits & U_COLORMAP) MSG_WriteByte (msg, ent->v.colormap); if (bits & U_SKIN) MSG_WriteByte (msg, ent->v.skin); if (bits & U_EFFECTS) MSG_WriteByte (msg, ent->v.effects); - if (bits & U_ORIGIN1) MSG_WriteFloatCoord (msg, origin[0]); + if (bits & U_ORIGIN1) MSG_WriteDPCoord (msg, origin[0]); if (bits & U_ANGLE1) MSG_WriteAngle(msg, angles[0]); - if (bits & U_ORIGIN2) MSG_WriteFloatCoord (msg, origin[1]); + if (bits & U_ORIGIN2) MSG_WriteDPCoord (msg, origin[1]); if (bits & U_ANGLE2) MSG_WriteAngle(msg, angles[1]); - if (bits & U_ORIGIN3) MSG_WriteFloatCoord (msg, origin[2]); + if (bits & U_ORIGIN3) MSG_WriteDPCoord (msg, origin[2]); if (bits & U_ANGLE3) MSG_WriteAngle(msg, angles[2]); // LordHavoc: new stuff @@ -801,10 +857,266 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (bits & U_MODEL2) MSG_WriteByte(msg, (int)ent->v.modelindex >> 8); } - if (sv_reportvischeckentities.integer) - Con_Printf("sv_vischeck culled entities: %d\n", sv_vischeckentitycullcount); - sv_vischeckentitycullcount = 0; + if (sv_cullentities_stats.integer) + Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d portal %d trace\n", client->name, totalentities, visibleentities, culled_pvs + culled_portal + culled_trace, culled_pvs, culled_portal, culled_trace); +} +#else +void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) +{ + int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects; + int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities; + float alphaf; + qbyte *pvs; + vec3_t origin, angles, entmins, entmaxs, testorigin, testeye; + edict_t *ent; + eval_t *val; + trace_t trace; + model_t *model; + entity_frame_t entityframe; + entity_state_t *s; + + if (client->sendsignon) + return; + + Mod_CheckLoaded(sv.worldmodel); + +// find the client's PVS + // the real place being tested from + VectorAdd (clent->v.origin, clent->v.view_ofs, testeye); + pvs = SV_FatPVS (testeye); + + // the place being reported (to consider the fact the client still + // applies the view_ofs[2], so we have to only send the fractional part + // of view_ofs[2], undoing what the client will redo) + VectorCopy (testeye, testorigin); + e = (int) clent->v.view_ofs[2] & 255; + if (e >= 128) + e -= 256; + testorigin[2] -= (float) e; + EntityFrame_Clear(&entityframe, testorigin); + + culled_pvs = 0; + culled_portal = 0; + culled_trace = 0; + visibleentities = 0; + totalentities = 0; + + clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes + // send all entities that touch the pvs + ent = NEXT_EDICT(sv.edicts); + for (e = 1;e < sv.num_edicts;e++, ent = NEXT_EDICT(ent)) + { + flags = 0; + + if (ent != clent) // LordHavoc: always send player + { + if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict) + { + if (val->edict == clentnum) + flags |= RENDER_VIEWMODEL; // show relative to the view + else + { + // don't show to anyone else + continue; + } + } + else + { + // LordHavoc: never draw something told not to display to this client + if ((val = GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)) && val->edict == clentnum) + continue; + if ((val = GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)) && val->edict && val->edict != clentnum) + continue; + } + } + + glowsize = 0; + + if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size))) + glowsize = (int) val->_float >> 2; + glowsize = bound(0, glowsize, 255); + + if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail))) + if (val->_float != 0) + flags |= RENDER_GLOWTRAIL; + + if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model]) + { + model = sv.models[(int)ent->v.modelindex]; + Mod_CheckLoaded(model); + } + else + { + model = NULL; + if (ent != clent) // LordHavoc: always send player + if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects + continue; + } + + VectorCopy(ent->v.angles, angles); + if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f && host_client->latency >= 0.01f) + { + VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin); + // LordHavoc: trace predicted movement to avoid putting things in walls + trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, origin, MOVE_NORMAL, ent); + VectorCopy(trace.endpos, origin); + } + else + { + VectorCopy(ent->v.origin, origin); + } + + // ent has survived every check so far, check if it is visible + // always send embedded brush models, they don't generate much traffic + if (ent != clent && ((flags & RENDER_VIEWMODEL) == 0) && (model == NULL || model->type != mod_brush || model->name[0] != '*')) + { + // use the predicted origin + entmins[0] = origin[0] - 1.0f; + entmins[1] = origin[1] - 1.0f; + entmins[2] = origin[2] - 1.0f; + entmaxs[0] = origin[0] + 1.0f; + entmaxs[1] = origin[1] + 1.0f; + entmaxs[2] = origin[2] + 1.0f; + // using the model's bounding box to ensure things are visible regardless of their physics box + if (model) + { + if (ent->v.angles[0] || ent->v.angles[2]) // pitch and roll + { + VectorAdd(entmins, model->rotatedmins, entmins); + VectorAdd(entmaxs, model->rotatedmaxs, entmaxs); + } + else if (ent->v.angles[1]) + { + VectorAdd(entmins, model->yawmins, entmins); + VectorAdd(entmaxs, model->yawmaxs, entmaxs); + } + else + { + VectorAdd(entmins, model->normalmins, entmins); + VectorAdd(entmaxs, model->normalmaxs, entmaxs); + } + } + + totalentities++; + + // if not touching a visible leaf + if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, entmins, entmaxs, sv.worldmodel->nodes)) + { + culled_pvs++; + continue; + } + + // or not visible through the portals + if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs)) + { + culled_portal++; + continue; + } + + if (sv_cullentities_trace.integer) + { + // LordHavoc: test random offsets, to maximize chance of detection + testorigin[0] = lhrandom(entmins[0], entmaxs[0]); + testorigin[1] = lhrandom(entmins[1], entmaxs[1]); + testorigin[2] = lhrandom(entmins[2], entmaxs[2]); + + Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); + + if (trace.fraction == 1) + client->visibletime[e] = realtime + 1; + else + { + if (realtime > client->visibletime[e]) + { + culled_trace++; + continue; + } + } + } + visibleentities++; + } + + alphaf = 255.0f; + scale = 16; + glowcolor = 254; + effects = ent->v.effects; + + if ((val = GETEDICTFIELDVALUE(ent, eval_alpha))) + if (val->_float != 0) + alphaf = val->_float * 255.0; + + // HalfLife support + if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt))) + if (val->_float != 0) + alphaf = val->_float; + + if (alphaf == 0.0f) + alphaf = 255.0f; + alpha = bound(0, alphaf, 255); + + if ((val = GETEDICTFIELDVALUE(ent, eval_scale))) + if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16; + if (scale < 0) scale = 0; + if (scale > 255) scale = 255; + + if ((val = GETEDICTFIELDVALUE(ent, eval_glow_color))) + if (val->_float != 0) + glowcolor = (int) val->_float; + + if ((val = GETEDICTFIELDVALUE(ent, eval_fullbright))) + if (val->_float != 0) + effects |= EF_FULLBRIGHT; + + if (ent != clent) + { + if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects + { + if (model) // model + { + // don't send if flagged for NODRAW and there are no effects + if (model->flags == 0 && ((effects & EF_NODRAW) || scale <= 0 || alpha <= 0)) + continue; + } + else // no model and no effects + continue; + } + } + + if ((val = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)) && val->edict == clentnum) + flags |= RENDER_EXTERIORMODEL; + + if (ent->v.movetype == MOVETYPE_STEP) + flags |= RENDER_STEP; + // don't send an entity if it's coordinates would wrap around + if ((effects & EF_LOWPRECISION) && origin[0] >= -32768 && origin[1] >= -32768 && origin[2] >= -32768 && origin[0] <= 32767 && origin[1] <= 32767 && origin[2] <= 32767) + flags |= RENDER_LOWPRECISION; + + s = EntityFrame_NewEntity(&entityframe, e); + // if we run out of space, abort + if (!s) + break; + VectorCopy(origin, s->origin); + VectorCopy(angles, s->angles); + if (ent->v.colormap >= 1024) + flags |= RENDER_COLORMAPPED; + s->colormap = ent->v.colormap; + s->skin = ent->v.skin; + s->frame = ent->v.frame; + s->modelindex = ent->v.modelindex; + s->effects = effects; + s->alpha = alpha; + s->scale = scale; + s->glowsize = glowsize; + s->glowcolor = glowcolor; + s->flags = flags; + } + entityframe.framenum = ++client->entityframenumber; + EntityFrame_Write(&client->entitydatabase, &entityframe, msg); + + if (sv_cullentities_stats.integer) + Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d portal %d trace\n", client->name, totalentities, visibleentities, culled_pvs + culled_portal + culled_trace, culled_pvs, culled_portal, culled_trace); } +#endif /* ============= @@ -836,6 +1148,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) int items; eval_t *val; vec3_t punchvector; + qbyte viewzoom; // // send a damage message @@ -847,7 +1160,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) MSG_WriteByte (msg, ent->v.dmg_save); MSG_WriteByte (msg, ent->v.dmg_take); for (i=0 ; i<3 ; i++) - MSG_WriteFloatCoord (msg, other->v.origin[i] + 0.5*(other->v.mins[i] + other->v.maxs[i])); + MSG_WriteDPCoord (msg, other->v.origin[i] + 0.5*(other->v.mins[i] + other->v.maxs[i])); ent->v.dmg_take = 0; ent->v.dmg_save = 0; @@ -897,6 +1210,20 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) if ((val = GETEDICTFIELDVALUE(ent, eval_punchvector))) VectorCopy(val->vector, punchvector); + i = 255; + if ((val = GETEDICTFIELDVALUE(ent, eval_viewzoom))) + { + i = val->_float * 255.0f; + if (i == 0) + i = 255; + else + i = bound(0, i, 255); + } + viewzoom = i; + + if (viewzoom != 255) + bits |= SU_VIEWZOOM; + for (i=0 ; i<3 ; i++) { if (ent->v.punchangle[i]) @@ -913,8 +1240,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) if (ent->v.armorvalue) bits |= SU_ARMOR; -// if (ent->v.weapon) - bits |= SU_WEAPON; + bits |= SU_WEAPON; if (bits >= 65536) bits |= SU_EXTEND1; @@ -941,7 +1267,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) if (bits & (SU_PUNCH1<v.punchangle[i]); // dpprotocol if (bits & (SU_PUNCHVEC1<v.velocity[i]/16); } @@ -978,6 +1304,9 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) { MSG_WriteByte (msg, ent->v.weapon); } + + if (bits & SU_VIEWZOOM) + MSG_WriteByte (msg, viewzoom); } /* @@ -987,7 +1316,7 @@ SV_SendClientDatagram */ qboolean SV_SendClientDatagram (client_t *client) { - byte buf[MAX_DATAGRAM]; + qbyte buf[MAX_DATAGRAM]; sizebuf_t msg; msg.data = buf; @@ -997,14 +1326,17 @@ qboolean SV_SendClientDatagram (client_t *client) MSG_WriteByte (&msg, svc_time); MSG_WriteFloat (&msg, sv.time); -// add the client specific data to the datagram - SV_WriteClientdataToMessage (client->edict, &msg); + if (client->spawned) + { + // add the client specific data to the datagram + SV_WriteClientdataToMessage (client->edict, &msg); - SV_WriteEntitiesToClient (client, client->edict, &msg); + SV_WriteEntitiesToClient (client, client->edict, &msg); -// copy the server datagram if there is space - if (msg.cursize + sv.datagram.cursize < msg.maxsize) - SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize); + // copy the server datagram if there is space + if (msg.cursize + sv.datagram.cursize < msg.maxsize) + SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize); + } // send the datagram if (NET_SendUnreliableMessage (client->netconnection, &msg) == -1) @@ -1033,7 +1365,7 @@ void SV_UpdateToReliableMessages (void) { for (j=0, client = svs.clients ; jactive) + if (!client->active || !client->spawned) continue; MSG_WriteByte (&client->message, svc_updatefrags); MSG_WriteByte (&client->message, i); @@ -1066,7 +1398,7 @@ message buffer void SV_SendNop (client_t *client) { sizebuf_t msg; - byte buf[4]; + qbyte buf[4]; msg.data = buf; msg.maxsize = sizeof(buf); @@ -1097,6 +1429,14 @@ void SV_SendClientMessages (void) if (!host_client->active) continue; +#ifndef NOROUTINGFIX + if (host_client->sendserverinfo) + { + host_client->sendserverinfo = false; + SV_SendServerinfo (host_client); + } +#endif + if (host_client->spawned) { if (!SV_SendClientDatagram (host_client)) @@ -1130,10 +1470,7 @@ void SV_SendClientMessages (void) if (host_client->message.cursize || host_client->dropasap) { if (!NET_CanSendMessage (host_client->netconnection)) - { -// I_Printf ("can't write\n"); continue; - } if (host_client->dropasap) SV_DropClient (false); // went to another level @@ -1183,6 +1520,7 @@ int SV_ModelIndex (char *name) return i; } +#ifdef SV_QUAKEENTITIES /* ================ SV_CreateBaseline @@ -1221,7 +1559,7 @@ void SV_CreateBaseline (void) else { svent->baseline.colormap = 0; - svent->baseline.modelindex = svent->v.modelindex; //SV_ModelIndex(pr_strings + svent->v.model); + svent->baseline.modelindex = svent->v.modelindex; } large = false; @@ -1249,11 +1587,12 @@ void SV_CreateBaseline (void) MSG_WriteByte (&sv.signon, svent->baseline.skin); for (i=0 ; i<3 ; i++) { - MSG_WriteFloatCoord(&sv.signon, svent->baseline.origin[i]); + MSG_WriteDPCoord(&sv.signon, svent->baseline.origin[i]); MSG_WriteAngle(&sv.signon, svent->baseline.angles[i]); } } } +#endif /* @@ -1437,7 +1776,7 @@ void SV_SpawnServer (char *server) // serverflags are for cross level information (sigils) pr_global_struct->serverflags = svs.serverflags; - + ED_LoadFromFile (sv.worldmodel->entities); // LordHavoc: clear world angles (to fix e3m3.bsp) VectorClear(sv.edicts->v.angles); @@ -1450,12 +1789,15 @@ void SV_SpawnServer (char *server) // run two frames to allow everything to settle sv.frametime = pr_global_struct->frametime = host_frametime = 0.1; SV_Physics (); + sv.frametime = pr_global_struct->frametime = host_frametime = 0.1; SV_Physics (); Mod_PurgeUnused(); +#ifdef QUAKEENTITIES // create a baseline for more efficient communications SV_CreateBaseline (); +#endif // send serverinfo to all connected clients for (i=0,host_client = svs.clients ; i