X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_main.c;h=5941b55e7ac76c83412ed492bda0b2d2e647bde3;hp=f873dfe03edc63515776278776fb92a898a581e5;hb=b1d01581aaa6e22fef1d66f8e4526b2125a00343;hpb=fd4d59bc222750df1c40ea1c7f1a8aebfecd2bd3 diff --git a/sv_main.c b/sv_main.c index f873dfe0..5941b55e 100644 --- a/sv_main.c +++ b/sv_main.c @@ -20,11 +20,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // sv_main.c -- server main program #include "quakedef.h" +#include "portals.h" 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"}; +static cvar_t sv_entpatch = {0, "sv_entpatch", "1"}; server_t sv; server_static_t svs; @@ -63,6 +65,7 @@ void SV_Init (void) Cvar_RegisterVariable (&sv_cullentities_portal); Cvar_RegisterVariable (&sv_cullentities_trace); Cvar_RegisterVariable (&sv_cullentities_stats); + Cvar_RegisterVariable (&sv_entpatch); SV_Phys_Init(); SV_World_Init(); @@ -195,31 +198,36 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, ent = NUM_FOR_EDICT(entity); - channel = (ent<<3) | channel; - field_mask = 0; if (volume != DEFAULT_SOUND_PACKET_VOLUME) field_mask |= SND_VOLUME; if (attenuation != DEFAULT_SOUND_PACKET_ATTENUATION) field_mask |= SND_ATTENUATION; + if (ent >= 8192) + field_mask |= SND_LARGEENTITY; + if (sound_num >= 256 || channel >= 8) + field_mask |= SND_LARGESOUND; // directed messages go only to the entity they are targeted on - if (sound_num >= 256) - MSG_WriteByte (&sv.datagram, svc_sound2); - else - MSG_WriteByte (&sv.datagram, svc_sound); + MSG_WriteByte (&sv.datagram, svc_sound); MSG_WriteByte (&sv.datagram, field_mask); if (field_mask & SND_VOLUME) MSG_WriteByte (&sv.datagram, volume); if (field_mask & SND_ATTENUATION) MSG_WriteByte (&sv.datagram, attenuation*64); - MSG_WriteShort (&sv.datagram, channel); - if (sound_num >= 256) + if (field_mask & SND_LARGEENTITY) + { + MSG_WriteShort (&sv.datagram, ent); + MSG_WriteByte (&sv.datagram, channel); + } + else + MSG_WriteShort (&sv.datagram, (ent<<3) | channel); + if (field_mask & SND_LARGESOUND) MSG_WriteShort (&sv.datagram, sound_num); else MSG_WriteByte (&sv.datagram, sound_num); - for (i=0 ; i<3 ; i++) - MSG_WriteDPCoord (&sv.datagram, entity->v.origin[i]+0.5*(entity->v.mins[i]+entity->v.maxs[i])); + for (i = 0;i < 3;i++) + MSG_WriteDPCoord (&sv.datagram, entity->v->origin[i]+0.5*(entity->v->mins[i]+entity->v->maxs[i])); } /* @@ -260,7 +268,7 @@ void SV_SendServerinfo (client_t *client) else MSG_WriteByte (&client->message, GAME_COOP); - sprintf (message, pr_strings+sv.edicts->v.message); + sprintf (message, PR_GetString(sv.edicts->v->message)); MSG_WriteString (&client->message,message); @@ -274,8 +282,8 @@ void SV_SendServerinfo (client_t *client) // send music MSG_WriteByte (&client->message, svc_cdtrack); - MSG_WriteByte (&client->message, sv.edicts->v.sounds); - MSG_WriteByte (&client->message, sv.edicts->v.sounds); + MSG_WriteByte (&client->message, sv.edicts->v->sounds); + MSG_WriteByte (&client->message, sv.edicts->v->sounds); // set view MSG_WriteByte (&client->message, svc_setview); @@ -383,6 +391,7 @@ void SV_CheckForNewClients (void) SV_ConnectClient (i); net_activeconnections++; + NET_Heartbeat (1); } } @@ -532,7 +541,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) Mod_CheckLoaded(sv.worldmodel); // find the client's PVS - VectorAdd (clent->v.origin, clent->v.view_ofs, testeye); + VectorAdd (clent->v->origin, clent->v->view_ofs, testeye); pvs = SV_FatPVS (testeye); culled_pvs = 0; @@ -585,9 +594,9 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (val->_float != 0) bits |= U_GLOWTRAIL; - if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model]) + if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && *PR_GetString(ent->v->model)) { - model = sv.models[(int)ent->v.modelindex]; + model = sv.models[(int)ent->v->modelindex]; Mod_CheckLoaded(model); } else @@ -598,17 +607,17 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) continue; } - VectorCopy(ent->v.angles, angles); - if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f) + VectorCopy(ent->v->angles, angles); + if (DotProduct(ent->v->velocity, ent->v->velocity) >= 1.0f) { - VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin); + 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); + 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); + VectorCopy(ent->v->origin, origin); } // ent has survived every check so far, check if it is visible @@ -624,12 +633,12 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // 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 + 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]) + else if (ent->v->angles[1]) { VectorAdd(entmins, model->yawmins, entmins); VectorAdd(entmaxs, model->yawmaxs, entmaxs); @@ -693,7 +702,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) alphaf = 255.0f; scale = 16; glowcolor = 254; - effects = ent->v.effects; + effects = ent->v->effects; if ((val = GETEDICTFIELDVALUE(ent, eval_alpha))) if (val->_float != 0) @@ -754,7 +763,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // send an update baseline = &ent->baseline; - if (((int)ent->v.effects & EF_DELTA) && sv_deltacompress.integer) + if (((int)ent->v->effects & EF_DELTA) && sv_deltacompress.integer) { // every half second a full update is forced if (realtime < client->nextfullupdate[e]) @@ -774,7 +783,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (e >= 256) bits |= U_LONGENTITY; - if (ent->v.movetype == MOVETYPE_STEP) + if (ent->v->movetype == MOVETYPE_STEP) bits |= U_STEP; // LordHavoc: old stuff, but rewritten to have more exact tolerances @@ -784,29 +793,29 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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 != (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; + 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; // LordHavoc: new stuff if (baseline->alpha != alpha) bits |= U_ALPHA; if (baseline->scale != scale) bits |= U_SCALE; - if (((int) baseline->effects & 0xFF00) != ((int) ent->v.effects & 0xFF00)) bits |= U_EFFECTS2; + if (((int) baseline->effects & 0xFF00) != ((int) ent->v->effects & 0xFF00)) bits |= U_EFFECTS2; if (baseline->glowsize != glowsize) bits |= U_GLOWSIZE; if (baseline->glowcolor != glowcolor) bits |= U_GLOWCOLOR; - if (((int) baseline->frame & 0xFF00) != ((int) ent->v.frame & 0xFF00)) bits |= U_FRAME2; - if (((int) baseline->frame & 0xFF00) != ((int) ent->v.modelindex & 0xFF00)) bits |= U_MODEL2; + if (((int) baseline->frame & 0xFF00) != ((int) ent->v->frame & 0xFF00)) bits |= U_FRAME2; + if (((int) baseline->frame & 0xFF00) != ((int) ent->v->modelindex & 0xFF00)) bits |= U_MODEL2; // update delta baseline - VectorCopy(ent->v.origin, ent->deltabaseline.origin); - VectorCopy(ent->v.angles, ent->deltabaseline.angles); - ent->deltabaseline.colormap = ent->v.colormap; - ent->deltabaseline.skin = ent->v.skin; - ent->deltabaseline.frame = ent->v.frame; - ent->deltabaseline.effects = ent->v.effects; - ent->deltabaseline.modelindex = ent->v.modelindex; + VectorCopy(ent->v->origin, ent->deltabaseline.origin); + VectorCopy(ent->v->angles, ent->deltabaseline.angles); + ent->deltabaseline.colormap = ent->v->colormap; + ent->deltabaseline.skin = ent->v->skin; + ent->deltabaseline.frame = ent->v->frame; + ent->deltabaseline.effects = ent->v->effects; + ent->deltabaseline.modelindex = ent->v->modelindex; ent->deltabaseline.alpha = alpha; ent->deltabaseline.scale = scale; ent->deltabaseline.glowsize = glowsize; @@ -835,11 +844,11 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) MSG_WriteShort (msg,e); else MSG_WriteByte (msg,e); - if (bits & U_MODEL) MSG_WriteByte (msg, ent->v.modelindex); - if (bits & U_FRAME) MSG_WriteByte (msg, ent->v.frame); - 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_MODEL) MSG_WriteByte (msg, ent->v->modelindex); + if (bits & U_FRAME) MSG_WriteByte (msg, ent->v->frame); + 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_WriteDPCoord (msg, origin[0]); if (bits & U_ANGLE1) MSG_WriteAngle(msg, angles[0]); if (bits & U_ORIGIN2) MSG_WriteDPCoord (msg, origin[1]); @@ -850,29 +859,29 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // LordHavoc: new stuff if (bits & U_ALPHA) MSG_WriteByte(msg, alpha); if (bits & U_SCALE) MSG_WriteByte(msg, scale); - if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v.effects >> 8); + if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v->effects >> 8); if (bits & U_GLOWSIZE) MSG_WriteByte(msg, glowsize); if (bits & U_GLOWCOLOR) MSG_WriteByte(msg, glowcolor); - if (bits & U_FRAME2) MSG_WriteByte(msg, (int)ent->v.frame >> 8); - if (bits & U_MODEL2) MSG_WriteByte(msg, (int)ent->v.modelindex >> 8); + if (bits & U_FRAME2) MSG_WriteByte(msg, (int)ent->v->frame >> 8); + if (bits & U_MODEL2) MSG_WriteByte(msg, (int)ent->v->modelindex >> 8); } 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 +static entity_frame_t sv_writeentitiestoclient_entityframe; void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) { - int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects; + int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects, modelindex; int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities; float alphaf, lightsize; qbyte *pvs; - vec3_t origin, angles, entmins, entmaxs, testorigin, testeye; + vec3_t origin, angles, entmins, entmaxs, lightmins, lightmaxs, 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) @@ -882,18 +891,18 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // find the client's PVS // the real place being tested from - VectorAdd (clent->v.origin, clent->v.view_ofs, testeye); + 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; + e = (int) clent->v->view_ofs[2] & 255; if (e >= 128) e -= 256; testorigin[2] -= (float) e; - EntityFrame_Clear(&entityframe, testorigin); + EntityFrame_Clear(&sv_writeentitiestoclient_entityframe, testorigin); culled_pvs = 0; culled_portal = 0; @@ -906,6 +915,8 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) ent = NEXT_EDICT(sv.edicts); for (e = 1;e < sv.num_edicts;e++, ent = NEXT_EDICT(ent)) { + if (ent->free) + continue; flags = 0; if (ent != clent) // LordHavoc: always send player @@ -931,7 +942,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } glowsize = 0; - effects = ent->v.effects; + effects = ent->v->effects; if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size))) glowsize = (int) val->_float >> 2; glowsize = bound(0, glowsize, 255); @@ -966,9 +977,11 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) lightsize = max(lightsize, 100); } - if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model]) + modelindex = 0; + if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && *PR_GetString(ent->v->model)) { - model = sv.models[(int)ent->v.modelindex]; + modelindex = ent->v->modelindex; + model = sv.models[(int)ent->v->modelindex]; Mod_CheckLoaded(model); } else @@ -979,17 +992,17 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) continue; } - VectorCopy(ent->v.angles, angles); - if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f && host_client->latency >= 0.01f) + 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); + 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); + 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); + VectorCopy(ent->v->origin, origin); } // ent has survived every check so far, check if it is visible @@ -1006,12 +1019,12 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // 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 + 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]) + else if (ent->v->angles[1]) { VectorAdd(entmins, model->yawmins, entmins); VectorAdd(entmaxs, model->yawmaxs, entmaxs); @@ -1022,27 +1035,24 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) VectorAdd(entmaxs, model->normalmaxs, entmaxs); } } - if (lightsize) - { - entmins[0] = min(entmins[0], origin[0] - lightsize); - entmins[1] = min(entmins[1], origin[1] - lightsize); - entmins[2] = min(entmins[2], origin[2] - lightsize); - entmaxs[0] = min(entmaxs[0], origin[0] + lightsize); - entmaxs[1] = min(entmaxs[1], origin[1] + lightsize); - entmaxs[2] = min(entmaxs[2], origin[2] + lightsize); - } + lightmins[0] = min(entmins[0], origin[0] - lightsize); + lightmins[1] = min(entmins[1], origin[1] - lightsize); + lightmins[2] = min(entmins[2], origin[2] - lightsize); + lightmaxs[0] = min(entmaxs[0], origin[0] + lightsize); + lightmaxs[1] = min(entmaxs[1], origin[1] + lightsize); + lightmaxs[2] = min(entmaxs[2], origin[2] + lightsize); totalentities++; // if not touching a visible leaf - if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, entmins, entmaxs, sv.worldmodel->nodes)) + if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, lightmins, lightmaxs, sv.worldmodel->nodes)) { culled_pvs++; continue; } // or not visible through the portals - if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs)) + if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, lightmins, lightmaxs)) { culled_portal++; continue; @@ -1050,21 +1060,50 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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]); - + // LordHavoc: test center first + testorigin[0] = (entmins[0] + entmaxs[0]) * 0.5f; + testorigin[1] = (entmins[1] + entmaxs[1]) * 0.5f; + testorigin[2] = (entmins[2] + entmaxs[2]) * 0.5f; 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]) + // 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 { - culled_trace++; - continue; + if (lightsize) + { + // LordHavoc: test random offsets, to maximize chance of detection + testorigin[0] = lhrandom(lightmins[0], lightmaxs[0]); + testorigin[1] = lhrandom(lightmins[1], lightmaxs[1]); + testorigin[2] = lhrandom(lightmins[2], lightmaxs[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; + } + } + } + else + { + if (realtime > client->visibletime[e]) + { + culled_trace++; + continue; + } + } } } } @@ -1074,7 +1113,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) alphaf = 255.0f; scale = 16; glowcolor = 254; - effects = ent->v.effects; + effects = ent->v->effects; if ((val = GETEDICTFIELDVALUE(ent, eval_alpha))) if (val->_float != 0) @@ -1120,24 +1159,24 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if ((val = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)) && val->edict == clentnum) flags |= RENDER_EXTERIORMODEL; - if (ent->v.movetype == MOVETYPE_STEP) + 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); + s = EntityFrame_NewEntity(&sv_writeentitiestoclient_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) + 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->colormap = ent->v->colormap; + s->skin = ent->v->skin; + s->frame = ent->v->frame; + s->modelindex = modelindex; s->effects = effects; s->alpha = alpha; s->scale = scale; @@ -1145,8 +1184,8 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) s->glowcolor = glowcolor; s->flags = flags; } - entityframe.framenum = ++client->entityframenumber; - EntityFrame_Write(&client->entitydatabase, &entityframe, msg); + sv_writeentitiestoclient_entityframe.framenum = ++client->entityframenumber; + EntityFrame_Write(&client->entitydatabase, &sv_writeentitiestoclient_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); @@ -1166,7 +1205,7 @@ void SV_CleanupEnts (void) ent = NEXT_EDICT(sv.edicts); for (e=1 ; ev.effects = (int)ent->v.effects & ~EF_MUZZLEFLASH; + ent->v->effects = (int)ent->v->effects & ~EF_MUZZLEFLASH; } /* @@ -1188,17 +1227,17 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) // // send a damage message // - if (ent->v.dmg_take || ent->v.dmg_save) + if (ent->v->dmg_take || ent->v->dmg_save) { - other = PROG_TO_EDICT(ent->v.dmg_inflictor); + other = PROG_TO_EDICT(ent->v->dmg_inflictor); MSG_WriteByte (msg, svc_damage); - MSG_WriteByte (msg, ent->v.dmg_save); - MSG_WriteByte (msg, ent->v.dmg_take); + MSG_WriteByte (msg, ent->v->dmg_save); + MSG_WriteByte (msg, ent->v->dmg_take); for (i=0 ; i<3 ; i++) - MSG_WriteDPCoord (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; + ent->v->dmg_take = 0; + ent->v->dmg_save = 0; } // @@ -1207,20 +1246,20 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) SV_SetIdealPitch (); // how much to look up / down ideally // a fixangle might get lost in a dropped packet. Oh well. - if ( ent->v.fixangle ) + if ( ent->v->fixangle ) { MSG_WriteByte (msg, svc_setangle); for (i=0 ; i < 3 ; i++) - MSG_WriteAngle (msg, ent->v.angles[i] ); - ent->v.fixangle = 0; + MSG_WriteAngle (msg, ent->v->angles[i] ); + ent->v->fixangle = 0; } bits = 0; - if (ent->v.view_ofs[2] != DEFAULT_VIEWHEIGHT) + if (ent->v->view_ofs[2] != DEFAULT_VIEWHEIGHT) bits |= SU_VIEWHEIGHT; - if (ent->v.idealpitch) + if (ent->v->idealpitch) bits |= SU_IDEALPITCH; // stuff the sigil bits into the high bits of items for sbar, or else @@ -1228,16 +1267,16 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) val = GETEDICTFIELDVALUE(ent, eval_items2); if (val) - items = (int)ent->v.items | ((int)val->_float << 23); + items = (int)ent->v->items | ((int)val->_float << 23); else - items = (int)ent->v.items | ((int)pr_global_struct->serverflags << 28); + items = (int)ent->v->items | ((int)pr_global_struct->serverflags << 28); bits |= SU_ITEMS; - if ( (int)ent->v.flags & FL_ONGROUND) + if ( (int)ent->v->flags & FL_ONGROUND) bits |= SU_ONGROUND; - if ( ent->v.waterlevel >= 2) + if ( ent->v->waterlevel >= 2) bits |= SU_INWATER; // dpprotocol @@ -1261,18 +1300,18 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) for (i=0 ; i<3 ; i++) { - if (ent->v.punchangle[i]) + if (ent->v->punchangle[i]) bits |= (SU_PUNCH1<v.velocity[i]) + if (ent->v->velocity[i]) bits |= (SU_VELOCITY1<v.weaponframe) + if (ent->v->weaponframe) bits |= SU_WEAPONFRAME; - if (ent->v.armorvalue) + if (ent->v->armorvalue) bits |= SU_ARMOR; bits |= SU_WEAPON; @@ -1292,43 +1331,43 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) MSG_WriteByte(msg, bits >> 24); if (bits & SU_VIEWHEIGHT) - MSG_WriteChar (msg, ent->v.view_ofs[2]); + MSG_WriteChar (msg, ent->v->view_ofs[2]); if (bits & SU_IDEALPITCH) - MSG_WriteChar (msg, ent->v.idealpitch); + MSG_WriteChar (msg, ent->v->idealpitch); for (i=0 ; i<3 ; i++) { if (bits & (SU_PUNCH1<v.punchangle[i]); // dpprotocol + MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // dpprotocol if (bits & (SU_PUNCHVEC1<v.velocity[i]/16); + MSG_WriteChar (msg, ent->v->velocity[i]/16); } // [always sent] if (bits & SU_ITEMS) MSG_WriteLong (msg, items); if (bits & SU_WEAPONFRAME) - MSG_WriteByte (msg, ent->v.weaponframe); + MSG_WriteByte (msg, ent->v->weaponframe); if (bits & SU_ARMOR) - MSG_WriteByte (msg, ent->v.armorvalue); + MSG_WriteByte (msg, ent->v->armorvalue); if (bits & SU_WEAPON) - MSG_WriteByte (msg, SV_ModelIndex(pr_strings+ent->v.weaponmodel)); + MSG_WriteByte (msg, SV_ModelIndex(PR_GetString(ent->v->weaponmodel))); - MSG_WriteShort (msg, ent->v.health); - MSG_WriteByte (msg, ent->v.currentammo); - MSG_WriteByte (msg, ent->v.ammo_shells); - MSG_WriteByte (msg, ent->v.ammo_nails); - MSG_WriteByte (msg, ent->v.ammo_rockets); - MSG_WriteByte (msg, ent->v.ammo_cells); + MSG_WriteShort (msg, ent->v->health); + MSG_WriteByte (msg, ent->v->currentammo); + MSG_WriteByte (msg, ent->v->ammo_shells); + MSG_WriteByte (msg, ent->v->ammo_nails); + MSG_WriteByte (msg, ent->v->ammo_rockets); + MSG_WriteByte (msg, ent->v->ammo_cells); if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE) { for(i=0;i<32;i++) { - if ( ((int)ent->v.weapon) & (1<v->weapon) & (1<v.weapon); + MSG_WriteByte (msg, ent->v->weapon); } if (bits & SU_VIEWZOOM) @@ -1349,13 +1388,13 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) SV_SendClientDatagram ======================= */ +static qbyte sv_sendclientdatagram_buf[MAX_DATAGRAM]; // FIXME? qboolean SV_SendClientDatagram (client_t *client) { - qbyte buf[MAX_DATAGRAM]; sizebuf_t msg; - msg.data = buf; - msg.maxsize = sizeof(buf); + msg.data = sv_sendclientdatagram_buf; + msg.maxsize = sizeof(sv_sendclientdatagram_buf); msg.cursize = 0; MSG_WriteByte (&msg, svc_time); @@ -1396,7 +1435,7 @@ void SV_UpdateToReliableMessages (void) // check for changes to be sent over the reliable streams for (i=0, host_client = svs.clients ; iold_frags != host_client->edict->v.frags) + if (host_client->old_frags != host_client->edict->v->frags) { for (j=0, client = svs.clients ; jmessage, svc_updatefrags); MSG_WriteByte (&client->message, i); - MSG_WriteShort (&client->message, host_client->edict->v.frags); + MSG_WriteShort (&client->message, host_client->edict->v->frags); } - host_client->old_frags = host_client->edict->v.frags; + host_client->old_frags = host_client->edict->v->frags; } } @@ -1568,7 +1607,7 @@ void SV_CreateBaseline (void) edict_t *svent; // LordHavoc: clear *all* states (note just active ones) - for (entnum = 0; entnum < MAX_EDICTS ; entnum++) + for (entnum = 0;entnum < sv.max_edicts;entnum++) { // get the current server version svent = EDICT_NUM(entnum); @@ -1578,14 +1617,14 @@ void SV_CreateBaseline (void) if (svent->free) continue; - if (entnum > svs.maxclients && !svent->v.modelindex) + if (entnum > svs.maxclients && !svent->v->modelindex) continue; // create entity baseline - VectorCopy (svent->v.origin, svent->baseline.origin); - VectorCopy (svent->v.angles, svent->baseline.angles); - svent->baseline.frame = svent->v.frame; - svent->baseline.skin = svent->v.skin; + VectorCopy (svent->v->origin, svent->baseline.origin); + VectorCopy (svent->v->angles, svent->baseline.angles); + svent->baseline.frame = svent->v->frame; + svent->baseline.skin = svent->v->skin; if (entnum > 0 && entnum <= svs.maxclients) { svent->baseline.colormap = entnum; @@ -1594,7 +1633,7 @@ void SV_CreateBaseline (void) else { svent->baseline.colormap = 0; - svent->baseline.modelindex = svent->v.modelindex; + svent->baseline.modelindex = svent->v->modelindex; } large = false; @@ -1649,7 +1688,7 @@ void SV_SendReconnect (void) MSG_WriteChar (&msg, svc_stufftext); MSG_WriteString (&msg, "reconnect\n"); NET_SendToAll (&msg, 5); - + if (cls.state != ca_dedicated) Cmd_ExecuteString ("reconnect\n", src_command); } @@ -1693,8 +1732,9 @@ extern float scr_centertime_off; void SV_SpawnServer (const char *server) { - edict_t *ent; - int i; + edict_t *ent; + int i; + qbyte *entities; // let's not have any servers with no name if (hostname.string[0] == 0) @@ -1736,7 +1776,20 @@ void SV_SpawnServer (const char *server) // clear the edict memory pool Mem_EmptyPool(sv_edicts_mempool); - sv.edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size); + // edict_t structures (hidden from progs) + sv.edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t)); + // progs fields, often accessed by server + sv.edictsfields = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size); + // table of edict pointers, for quicker lookup of edicts + sv.edictstable = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *)); + // used by PushMove to move back pushed entities + sv.moved_edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *)); + for (i = 0;i < sv.max_edicts;i++) + { + ent = sv.edicts + i; + ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size); + sv.edictstable[i] = ent; + } sv.datagram.maxsize = sizeof(sv.datagram_buf); sv.datagram.cursize = 0; @@ -1781,9 +1834,9 @@ void SV_SpawnServer (const char *server) // SV_ClearWorld (); - sv.sound_precache[0] = pr_strings; + sv.sound_precache[0] = ""; - sv.model_precache[0] = pr_strings; + sv.model_precache[0] = ""; sv.model_precache[1] = sv.modelname; for (i = 1;i < sv.worldmodel->numsubmodels;i++) { @@ -1795,26 +1848,39 @@ void SV_SpawnServer (const char *server) // load the rest of the entities // ent = EDICT_NUM(0); - memset (&ent->v, 0, progs->entityfields * 4); + memset (ent->v, 0, progs->entityfields * 4); ent->free = false; - ent->v.model = sv.worldmodel->name - pr_strings; - ent->v.modelindex = 1; // world model - ent->v.solid = SOLID_BSP; - ent->v.movetype = MOVETYPE_PUSH; + ent->v->model = PR_SetString(sv.modelname); + ent->v->modelindex = 1; // world model + ent->v->solid = SOLID_BSP; + ent->v->movetype = MOVETYPE_PUSH; if (coop.integer) pr_global_struct->coop = coop.integer; else pr_global_struct->deathmatch = deathmatch.integer; - pr_global_struct->mapname = sv.name - pr_strings; + pr_global_struct->mapname = PR_SetString(sv.name); // serverflags are for cross level information (sigils) pr_global_struct->serverflags = svs.serverflags; - ED_LoadFromFile (sv.worldmodel->entities); + // load replacement entity file if found + entities = NULL; + if (sv_entpatch.integer) + entities = FS_LoadFile(va("maps/%s.ent", sv.name), true); + if (entities) + { + Con_Printf("Loaded maps/%s.ent\n", sv.name); + ED_LoadFromFile (entities); + Mem_Free(entities); + } + else + ED_LoadFromFile (sv.worldmodel->entities); + + // LordHavoc: clear world angles (to fix e3m3.bsp) - VectorClear(sv.edicts->v.angles); + VectorClear(sv.edicts->v->angles); sv.active = true; @@ -1840,5 +1906,6 @@ void SV_SpawnServer (const char *server) SV_SendServerinfo (host_client); Con_DPrintf ("Server spawned.\n"); + NET_Heartbeat (2); }