X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_main.c;h=8332e7351d658b79f4e02bf11fa921f04d427e7b;hp=59da2be28ad1fa1485a1892741c9b30e1c965919;hb=29de7088f191d21a0c7dd5396cb5cead032c2ac2;hpb=f9605292b17719532eac0b3c7ccd6341b671d684 diff --git a/sv_main.c b/sv_main.c index 59da2be2..8332e735 100644 --- a/sv_main.c +++ b/sv_main.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -21,13 +21,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -server_t sv; -server_static_t svs; +static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "0"}; // fast but loose +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"}; -char localmodels[MAX_MODELS][5]; // inline model names for precache +server_t sv; +server_static_t svs; + +static char localmodels[MAX_MODELS][5]; // inline model names for precache + +mempool_t *sv_edicts_mempool = NULL; //============================================================================ +extern void SV_Phys_Init (void); +extern void SV_World_Init (void); + /* =============== SV_Init @@ -35,18 +45,7 @@ SV_Init */ void SV_Init (void) { - int i; - extern cvar_t sv_maxvelocity; - extern cvar_t sv_gravity; - extern cvar_t sv_nostep; - extern cvar_t sv_friction; - extern cvar_t sv_edgefriction; - extern cvar_t sv_stopspeed; - extern cvar_t sv_maxspeed; - extern cvar_t sv_accelerate; - extern cvar_t sv_idealpitchscale; - extern cvar_t sv_aim; - extern cvar_t sv_predict; + int i; Cvar_RegisterVariable (&sv_maxvelocity); Cvar_RegisterVariable (&sv_gravity); @@ -58,10 +57,19 @@ void SV_Init (void) Cvar_RegisterVariable (&sv_idealpitchscale); Cvar_RegisterVariable (&sv_aim); Cvar_RegisterVariable (&sv_nostep); - Cvar_RegisterVariable (&sv_predict); + Cvar_RegisterVariable (&sv_deltacompress); + Cvar_RegisterVariable (&sv_cullentities_pvs); + Cvar_RegisterVariable (&sv_cullentities_trace); + Cvar_RegisterVariable (&sv_cullentities_stats); + Cvar_RegisterVariable (&sv_entpatch); + + SV_Phys_Init(); + SV_World_Init(); - for (i=0 ; i MAX_DATAGRAM-16) - return; + if (sv.datagram.cursize > MAX_PACKETFRAGMENT-18) + 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; @@ -100,9 +108,9 @@ void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count) } MSG_WriteByte (&sv.datagram, count); MSG_WriteByte (&sv.datagram, color); -} +} -/* +/* ================== SV_StartEffect @@ -111,33 +119,35 @@ Make sure the event gets sent to all clients */ void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate) { - if (sv.datagram.cursize > MAX_DATAGRAM-18) - return; - if (modelindex >= 256) + if (modelindex >= 256 || startframe >= 256) { + if (sv.datagram.cursize > MAX_PACKETFRAGMENT-19) + return; 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_WriteByte (&sv.datagram, startframe); + MSG_WriteShort (&sv.datagram, startframe); MSG_WriteByte (&sv.datagram, framecount); MSG_WriteByte (&sv.datagram, framerate); } else { + if (sv.datagram.cursize > MAX_PACKETFRAGMENT-17) + return; 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); MSG_WriteByte (&sv.datagram, framerate); } -} +} -/* +/* ================== SV_StartSound @@ -151,15 +161,11 @@ An attenuation of 0 will play full volume everywhere in the level. Larger attenuations will drop off. (max 4 attenuation) ================== -*/ -void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, - float attenuation) -{ - int sound_num; - int field_mask; - int i; - int ent; - +*/ +void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, float attenuation) +{ + int sound_num, field_mask, i, ent; + if (volume < 0 || volume > 255) Host_Error ("SV_StartSound: volume = %i", volume); @@ -169,49 +175,53 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, if (channel < 0 || channel > 7) Host_Error ("SV_StartSound: channel = %i", channel); - if (sv.datagram.cursize > MAX_DATAGRAM-16) - return; + if (sv.datagram.cursize > MAX_PACKETFRAGMENT-21) + return; // find precache number for sound - for (sound_num=1 ; sound_num= 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_WriteFloatCoord (&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])); +} /* ============================================================================== @@ -232,24 +242,31 @@ This will be sent on the initial connection and upon each server load. void SV_SendServerinfo (client_t *client) { char **s; - char message[2048]; + char message[128]; + + // edicts get reallocated on level changes, so we need to update it here + client->edict = EDICT_NUM(client->number + 1); + + // LordHavoc: clear entityframe tracking + client->entityframenumber = 0; + if (client->entitydatabase4) + EntityFrame4_FreeDatabase(client->entitydatabase4); + client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool); MSG_WriteByte (&client->message, svc_print); - sprintf (message, "%c\nDARKPLACES VERSION %4.2f BUILD %i SERVER (%i CRC)", 2, VERSION, buildnumber, pr_crc); + snprintf (message, sizeof (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, PROTOCOL_DARKPLACES4); MSG_WriteByte (&client->message, svs.maxclients); - if (!coop.value && deathmatch.value) + if (!coop.integer && deathmatch.integer) MSG_WriteByte (&client->message, GAME_DEATHMATCH); else MSG_WriteByte (&client->message, GAME_COOP); - sprintf (message, pr_strings+sv.edicts->v.message); - - MSG_WriteString (&client->message,message); + MSG_WriteString (&client->message,PR_GetString(sv.edicts->v->message)); for (s = sv.model_precache+1 ; *s ; s++) MSG_WriteString (&client->message, *s); @@ -261,10 +278,10 @@ 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 +// set view MSG_WriteByte (&client->message, svc_setview); MSG_WriteShort (&client->message, NUM_FOR_EDICT(client->edict)); @@ -283,35 +300,28 @@ Initializes a client_t for a new net connection. This will only be called once for a player each game, not once for each level change. ================ */ -void SV_ConnectClient (int clientnum) +void SV_ConnectClient (int clientnum, netconn_t *netconnection) { - edict_t *ent; client_t *client; - int edictnum; - struct qsocket_s *netconnection; int i; float spawn_parms[NUM_SPAWN_PARMS]; client = svs.clients + clientnum; - Con_DPrintf ("Client %s connected\n", client->netconnection->address); - - edictnum = clientnum+1; - - ent = EDICT_NUM(edictnum); - // set up the client_t - netconnection = client->netconnection; - if (sv.loadgame) memcpy (spawn_parms, client->spawn_parms, sizeof(spawn_parms)); memset (client, 0, sizeof(*client)); + client->active = true; client->netconnection = netconnection; - strcpy (client->name, "unconnected"); - client->active = true; + Con_DPrintf("Client %s connected\n", client->netconnection->address); + + strcpy(client->name, "unconnected"); + strcpy(client->old_name, "unconnected"); + client->number = clientnum; client->spawned = false; - client->edict = ent; + client->edict = EDICT_NUM(clientnum+1); client->message.data = client->msgbuf; client->message.maxsize = sizeof(client->msgbuf); client->message.allowoverflow = true; // we can catch it @@ -320,7 +330,7 @@ void SV_ConnectClient (int clientnum) memcpy (client->spawn_parms, spawn_parms, sizeof(spawn_parms)); else { - // call the progs to get default spawn parms for the new client + // call the progs to get default spawn parms for the new client PR_ExecuteProgram (pr_global_struct->SetNewParms, "QC function SetNewParms is missing"); for (i=0 ; ispawn_parms[i] = (&pr_global_struct->parm1)[i]; @@ -330,44 +340,6 @@ void SV_ConnectClient (int clientnum) } -/* -=================== -SV_CheckForNewClients - -=================== -*/ -void SV_CheckForNewClients (void) -{ - struct qsocket_s *ret; - int i; - -// -// check for new connections -// - while (1) - { - ret = NET_CheckNewConnections (); - if (!ret) - break; - - // - // init a new client structure - // - for (i=0 ; icontents < 0) - { - if (node->contents != CONTENTS_SOLID) - { - pvs = Mod_LeafPVS ( (mleaf_t *)node, sv.worldmodel); - for (i=0 ; iplane; - d = DotProduct (org, plane->normal) - plane->dist; - if (d > 8) - node = node->children[0]; - else if (d < -8) - node = node->children[1]; - else - { // go down both - SV_AddToFatPVS (org, node->children[0]); - node = node->children[1]; - } - } -} - -/* -============= -SV_FatPVS - -Calculates a PVS that is the inclusive or of all leafs within 8 pixels of the -given point. -============= -*/ -byte *SV_FatPVS (vec3_t org) -{ - fatbytes = (sv.worldmodel->numleafs+31)>>3; - memset (fatpvs, 0, fatbytes); - SV_AddToFatPVS (org, sv.worldmodel->nodes); - return fatpvs; -} - -//============================================================================= - +int sv_writeentitiestoclient_pvsbytes; +qbyte sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8]; /* ============= @@ -461,43 +379,52 @@ SV_WriteEntitiesToClient ============= */ +#ifdef QUAKEENTITIES void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) { - int e, i, clentnum, bits, alpha, glowcolor, glowsize, scale, colormod, modred, modgreen, modblue, dodelta, effects; - byte *pvs; - vec3_t org, origin, angles; - float movelerp, moveilerp; - edict_t *ent; - eval_t *val; + int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize; + int culled_pvs, 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 + 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); - /* - if (dpprotocol) - { - MSG_WriteByte(msg, svc_playerposition); - MSG_WriteFloat(msg, org[0]); - MSG_WriteFloat(msg, org[1]); - MSG_WriteFloat(msg, org[2]); - } - */ - MSG_WriteByte(msg, svc_entitiesbegin); - MSG_WriteShort(msg, 1); + VectorAdd (clent->v->origin, clent->v->view_ofs, testeye); + fatbytes = 0; + if (sv.worldmodel && sv.worldmodel->brush.FatPVS) + fatbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, testeye, 8, sv_writeentitiestoclient_pvs, sizeof(sv_writeentitiestoclient_pvs)); + + culled_pvs = 0; + culled_trace = 0; + visibleentities = 0; + totalentities = 0; clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes -// send over all entities (except the client) that touch the pvs + // send all entities that touch the pvs ent = NEXT_EDICT(sv.edicts); - for (e=1 ; enextfullupdate[e]; + client->nextfullupdate[e] = -1; + if (ent != clent) // LordHavoc: always send player { if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict) { if (val->edict != clentnum) - continue; // don't show to anyone else + { + // don't show to anyone else + continue; + } else bits |= U_VIEWMODEL; // show relative to the view } @@ -508,46 +435,129 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) continue; if ((val = GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)) && val->edict && val->edict != clentnum) continue; - // ignore if not touching a PV leaf - for (i=0 ; i < ent->num_leafs ; i++) - if (pvs[ent->leafnums[i] >> 3] & (1 << (ent->leafnums[i]&7) )) - break; - - if (i == ent->num_leafs) - continue; // not visible } } - // don't send if flagged for NODRAW and there are no effects - alpha = 255; - scale = 16; glowsize = 0; - glowcolor = 254; - colormod = 255; - effects = ent->v.effects; - - if ((val = GETEDICTFIELDVALUE(ent, eval_alpha))) - if ((alpha = (int) (val->_float * 255.0)) == 0) - alpha = 255; - if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)) && val->_float != 0) // HalfLife support - alpha = (int) val->_float; - if (alpha < 0) alpha = 0; - if (alpha > 255) alpha = 255; if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size))) glowsize = (int) val->_float >> 2; if (glowsize > 255) glowsize = 255; if (glowsize < 0) glowsize = 0; + if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail))) + if (val->_float != 0) + bits |= U_GLOWTRAIL; + + if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && *PR_GetString(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 && (bits & U_GLOWTRAIL) == 0) // no effects + continue; + } + + VectorCopy(ent->v->angles, angles); + VectorCopy(ent->v->origin, origin); + + // ent has survived every check so far, check if it is visible + if (ent != clent && ((bits & U_VIEWMODEL) == 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 && fatbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, entmins, entmaxs)) + { + culled_pvs++; + 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->brush.TraceBox == NULL || 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]); + + sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID); + 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]); + + sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID); + 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.0f; + + // 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_trail))) - if (val->_float != 0) - bits |= U_GLOWTRAIL; - if ((val = GETEDICTFIELDVALUE(ent, eval_glow_color))) if (val->_float != 0) glowcolor = (int) val->_float; @@ -556,22 +566,14 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (val->_float != 0) effects |= EF_FULLBRIGHT; - if ((val = GETEDICTFIELDVALUE(ent, eval_colormod))) - if (val->vector[0] != 0 || val->vector[1] != 0 || val->vector[2] != 0) - { - modred = val->vector[0] * 8.0;if (modred < 0) modred = 0;if (modred > 7) modred = 7; - modgreen = val->vector[1] * 8.0;if (modgreen < 0) modgreen = 0;if (modgreen > 7) modgreen = 7; - modblue = val->vector[2] * 4.0;if (modblue < 0) modblue = 0;if (modblue > 3) modblue = 3; - colormod = (modred << 5) | (modgreen << 2) | modblue; - } - if (ent != clent) { - if (glowsize == 0 && bits == 0) // no effects + if (glowsize == 0 && (bits & U_GLOWTRAIL) == 0) // no effects { - if (ent->v.modelindex && pr_strings[ent->v.model]) // model + if (model) // model { - if (sv.models[ (int)ent->v.modelindex ]->flags == 0 && (ent->v.effects == EF_NODRAW || scale <= 0 || alpha <= 0)) + // 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 @@ -582,124 +584,78 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (msg->maxsize - msg->cursize < 32) // LordHavoc: increased check from 16 to 32 { 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; } -// send an update - bits = 0; + if ((val = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)) && val->edict == clentnum) + bits = bits | U_EXTERIORMODEL; - dodelta = false; - if ((int)ent->v.effects & EF_DELTA) - dodelta = realtime < client->nextfullupdate[e]; // every half second a full update is forced +// send an update + baseline = &ent->e->baseline; - if (dodelta) + if (((int)ent->v->effects & EF_DELTA) && sv_deltacompress.integer) { - bits |= U_DELTA; - baseline = &ent->deltabaseline; + // every half second a full update is forced + if (realtime < client->nextfullupdate[e]) + { + bits |= U_DELTA; + baseline = &ent->e->deltabaseline; + } + else + nextfullupdate = realtime + 0.5f; } else - { - client->nextfullupdate[e] = realtime + 0.5; - baseline = &ent->baseline; - } + nextfullupdate = realtime + 0.5f; + + // restore nextfullupdate since this is being sent for real + client->nextfullupdate[e] = nextfullupdate; if (e >= 256) bits |= U_LONGENTITY; - if (ent->v.movetype == MOVETYPE_STEP) + + if (ent->v->movetype == MOVETYPE_STEP) bits |= U_STEP; - - if (ent->v.movetype == MOVETYPE_STEP && ((int) ent->v.flags & (FL_ONGROUND | FL_FLY | FL_SWIM))) // monsters have smoothed walking/flying/swimming movement - { - if (!ent->steplerptime || ent->steplerptime > sv.time) // when the level just started... - { - ent->steplerptime = sv.time; - VectorCopy(ent->v.origin, ent->stepoldorigin); - VectorCopy(ent->v.angles, ent->stepoldangles); - VectorCopy(ent->v.origin, ent->steporigin); - VectorCopy(ent->v.angles, ent->stepangles); - } - VectorSubtract(ent->v.origin, ent->steporigin, origin); - VectorSubtract(ent->v.angles, ent->stepangles, angles); - if (DotProduct(origin, origin) >= 0.125 || DotProduct(angles, angles) >= 1.4) - { - // update lerp positions - ent->steplerptime = sv.time; - VectorCopy(ent->steporigin, ent->stepoldorigin); - VectorCopy(ent->stepangles, ent->stepoldangles); - VectorCopy(ent->v.origin, ent->steporigin); - VectorCopy(ent->v.angles, ent->stepangles); - } - movelerp = (sv.time - ent->steplerptime) * 10.0; - if (movelerp > 1) movelerp = 1; - moveilerp = 1 - movelerp; - origin[0] = ent->stepoldorigin[0] * moveilerp + ent->steporigin[0] * movelerp; - origin[1] = ent->stepoldorigin[1] * moveilerp + ent->steporigin[1] * movelerp; - origin[2] = ent->stepoldorigin[2] * moveilerp + ent->steporigin[2] * movelerp; - // choose shortest rotate (to avoid 'spin around' situations) - VectorSubtract(ent->stepangles, ent->stepoldangles, angles); - if (angles[0] < -180) angles[0] += 360;if (angles[0] >= 180) angles[0] -= 360; - if (angles[1] < -180) angles[1] += 360;if (angles[1] >= 180) angles[1] -= 360; - if (angles[2] < -180) angles[2] += 360;if (angles[2] >= 180) angles[2] -= 360; - angles[0] = angles[0] * movelerp + ent->stepoldangles[0]; - angles[1] = angles[1] * movelerp + ent->stepoldangles[1]; - angles[2] = angles[2] * movelerp + ent->stepoldangles[2]; - VectorMA(origin, host_client->latency, ent->v.velocity, origin); - } - else // copy as they are - { -// VectorCopy(ent->v.origin, origin); - VectorCopy(ent->v.angles, angles); - VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin); - if (ent->v.movetype == MOVETYPE_STEP) // monster, but airborn, update lerp info - { - // update lerp positions - ent->steplerptime = sv.time; - VectorCopy(ent->v.origin, ent->stepoldorigin); - VectorCopy(ent->v.angles, ent->stepoldangles); - VectorCopy(ent->v.origin, ent->steporigin); - VectorCopy(ent->v.angles, ent->stepangles); - } - } // 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)) != (int)(baseline->angles[0]*(256.0/360.0))) bits |= U_ANGLE1; - if ((int)(angles[1]*(256.0/360.0)) != (int)(baseline->angles[1]*(256.0/360.0))) bits |= U_ANGLE2; - if ((int)(angles[2]*(256.0/360.0)) != (int)(baseline->angles[2]*(256.0/360.0))) 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->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 != (byte) ent->v.modelindex) bits |= U_MODEL; + 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; // 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 (baseline->colormod != colormod) bits |= U_COLORMOD; - 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; - ent->deltabaseline.alpha = alpha; - ent->deltabaseline.scale = scale; - ent->deltabaseline.glowsize = glowsize; - ent->deltabaseline.glowcolor = glowcolor; - ent->deltabaseline.colormod = colormod; + VectorCopy(ent->v->origin, ent->e->deltabaseline.origin); + VectorCopy(ent->v->angles, ent->e->deltabaseline.angles); + ent->e->deltabaseline.colormap = ent->v->colormap; + ent->e->deltabaseline.skin = ent->v->skin; + ent->e->deltabaseline.frame = ent->v->frame; + ent->e->deltabaseline.effects = ent->v->effects; + ent->e->deltabaseline.modelindex = ent->v->modelindex; + ent->e->deltabaseline.alpha = alpha; + ent->e->deltabaseline.scale = scale; + ent->e->deltabaseline.glowsize = glowsize; + ent->e->deltabaseline.glowcolor = glowcolor; // write the message if (bits >= 16777216) @@ -724,33 +680,446 @@ 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_ORIGIN1) MSG_WriteFloatCoord (msg, origin[0]); + 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_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 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_COLORMOD) MSG_WriteByte(msg, colormod); - 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); } - MSG_WriteByte(msg, svc_entitiesend); - MSG_WriteShort(msg, MAX_EDICTS); + if (sv_cullentities_stats.integer) + Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, totalentities, visibleentities, culled_pvs + culled_trace, culled_pvs, culled_trace); +} +#else +static int numsendentities; +static entity_state_t sendentities[MAX_EDICTS]; +static entity_state_t *sendentitiesindex[MAX_EDICTS]; + +void SV_PrepareEntitiesForSending(void) +{ + int e, i; + float f; + edict_t *ent; + entity_state_t cs; + // send all entities that touch the pvs + numsendentities = 0; + sendentitiesindex[0] = NULL; + for (e = 1, ent = NEXT_EDICT(sv.edicts);e < sv.num_edicts;e++, ent = NEXT_EDICT(ent)) + { + sendentitiesindex[e] = NULL; + if (ent->e->free) + continue; + + ClearStateToDefault(&cs); + cs.active = true; + cs.number = e; + VectorCopy(ent->v->origin, cs.origin); + VectorCopy(ent->v->angles, cs.angles); + cs.flags = 0; + cs.effects = (int)ent->v->effects; + cs.colormap = (qbyte)ent->v->colormap; + cs.skin = (qbyte)ent->v->skin; + cs.frame = (qbyte)ent->v->frame; + cs.viewmodelforclient = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)->edict; + cs.exteriormodelforclient = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)->edict; + cs.nodrawtoclient = GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)->edict; + cs.drawonlytoclient = GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)->edict; + cs.tagentity = GETEDICTFIELDVALUE(ent, eval_tag_entity)->edict; + cs.tagindex = (qbyte)GETEDICTFIELDVALUE(ent, eval_tag_index)->_float; + i = (int)(GETEDICTFIELDVALUE(ent, eval_glow_size)->_float * 0.25f); + cs.glowsize = (qbyte)bound(0, i, 255); + if (GETEDICTFIELDVALUE(ent, eval_glow_trail)->_float) + cs.flags |= RENDER_GLOWTRAIL; + + cs.modelindex = 0; + i = (int)ent->v->modelindex; + if (i >= 1 && i < MAX_MODELS && *PR_GetString(ent->v->model)) + cs.modelindex = i; + + cs.alpha = 255; + f = (GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f); + if (f) + { + i = (int)f; + cs.alpha = (qbyte)bound(0, i, 255); + } + // halflife + f = (GETEDICTFIELDVALUE(ent, eval_renderamt)->_float); + if (f) + { + i = (int)f; + cs.alpha = (qbyte)bound(0, i, 255); + } + + cs.scale = 16; + f = (GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f); + if (f) + { + i = (int)f; + cs.scale = (qbyte)bound(0, i, 255); + } + + cs.glowcolor = 254; + f = (GETEDICTFIELDVALUE(ent, eval_glow_color)->_float); + if (f) + cs.glowcolor = (int)f; + + if (GETEDICTFIELDVALUE(ent, eval_fullbright)->_float) + cs.effects |= EF_FULLBRIGHT; + + if (ent->v->movetype == MOVETYPE_STEP) + cs.flags |= RENDER_STEP; + if ((cs.effects & EF_LOWPRECISION) && cs.origin[0] >= -32768 && cs.origin[1] >= -32768 && cs.origin[2] >= -32768 && cs.origin[0] <= 32767 && cs.origin[1] <= 32767 && cs.origin[2] <= 32767) + cs.flags |= RENDER_LOWPRECISION; + if (ent->v->colormap >= 1024) + cs.flags |= RENDER_COLORMAPPED; + if (cs.viewmodelforclient) + cs.flags |= RENDER_VIEWMODEL; // show relative to the view + + cs.specialvisibilityradius = 0; + if (cs.glowsize) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.glowsize * 4); + if (cs.flags & RENDER_GLOWTRAIL) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100); + if (cs.effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST)) + { + if (cs.effects & EF_BRIGHTFIELD) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 80); + if (cs.effects & EF_MUZZLEFLASH) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100); + if (cs.effects & EF_BRIGHTLIGHT) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 400); + if (cs.effects & EF_DIMLIGHT) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200); + if (cs.effects & EF_RED) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200); + if (cs.effects & EF_BLUE) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200); + if (cs.effects & EF_FLAME) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 250); + if (cs.effects & EF_STARDUST) + cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100); + } + + if (numsendentities >= MAX_EDICTS) + continue; + // we can omit invisible entities with no effects that are not clients + // LordHavoc: this could kill tags attached to an invisible entity, I + // just hope we never have to support that case + if (cs.number > svs.maxclients && ((cs.effects & EF_NODRAW) || (!cs.modelindex && !cs.specialvisibilityradius))) + continue; + sendentitiesindex[e] = sendentities + numsendentities; + sendentities[numsendentities++] = cs; + } } +static int sententitiesmark = 0; +static int sententities[MAX_EDICTS]; +static int sententitiesconsideration[MAX_EDICTS]; +static int sv_writeentitiestoclient_culled_pvs; +static int sv_writeentitiestoclient_culled_trace; +static int sv_writeentitiestoclient_visibleentities; +static int sv_writeentitiestoclient_totalentities; +//static entity_frame_t sv_writeentitiestoclient_entityframe; +static int sv_writeentitiestoclient_clentnum; +static vec3_t sv_writeentitiestoclient_testeye; +static client_t *sv_writeentitiestoclient_client; + +void SV_MarkWriteEntityStateToClient(entity_state_t *s) +{ + vec3_t entmins, entmaxs, lightmins, lightmaxs, testorigin; + model_t *model; + trace_t trace; + if (sententitiesconsideration[s->number] == sententitiesmark) + return; + sententitiesconsideration[s->number] = sententitiesmark; + // viewmodels don't have visibility checking + if (s->viewmodelforclient) + { + if (s->viewmodelforclient != sv_writeentitiestoclient_clentnum) + return; + } + // never reject player + else if (s->number != sv_writeentitiestoclient_clentnum) + { + // check various rejection conditions + if (s->nodrawtoclient == sv_writeentitiestoclient_clentnum) + return; + if (s->drawonlytoclient && s->drawonlytoclient != sv_writeentitiestoclient_clentnum) + return; + if (s->effects & EF_NODRAW) + return; + // LordHavoc: only send entities with a model or important effects + if (!s->modelindex && s->specialvisibilityradius == 0) + return; + if (s->tagentity) + { + // tag attached entities simply check their parent + if (!sendentitiesindex[s->tagentity]) + return; + SV_MarkWriteEntityStateToClient(sendentitiesindex[s->tagentity]); + if (sententities[s->tagentity] != sententitiesmark) + return; + } + // always send world submodels, they don't generate much traffic + else if ((model = sv.models[s->modelindex]) == NULL || model->name[0] != '*') + { + Mod_CheckLoaded(model); + // entity has survived every check so far, check if visible + // enlarged box to account for prediction (not that there is + // any currently, but still helps the 'run into a room and + // watch items pop up' problem) + entmins[0] = s->origin[0] - 32.0f; + entmins[1] = s->origin[1] - 32.0f; + entmins[2] = s->origin[2] - 32.0f; + entmaxs[0] = s->origin[0] + 32.0f; + entmaxs[1] = s->origin[1] + 32.0f; + entmaxs[2] = s->origin[2] + 32.0f; + // using the model's bounding box to ensure things are visible regardless of their physics box + if (model) + { + if (s->angles[0] || s->angles[2]) // pitch and roll + { + VectorAdd(entmins, model->rotatedmins, entmins); + VectorAdd(entmaxs, model->rotatedmaxs, entmaxs); + } + else if (s->angles[1]) + { + VectorAdd(entmins, model->yawmins, entmins); + VectorAdd(entmaxs, model->yawmaxs, entmaxs); + } + else + { + VectorAdd(entmins, model->normalmins, entmins); + VectorAdd(entmaxs, model->normalmaxs, entmaxs); + } + } + lightmins[0] = min(entmins[0], s->origin[0] - s->specialvisibilityradius); + lightmins[1] = min(entmins[1], s->origin[1] - s->specialvisibilityradius); + lightmins[2] = min(entmins[2], s->origin[2] - s->specialvisibilityradius); + lightmaxs[0] = min(entmaxs[0], s->origin[0] + s->specialvisibilityradius); + lightmaxs[1] = min(entmaxs[1], s->origin[1] + s->specialvisibilityradius); + lightmaxs[2] = min(entmaxs[2], s->origin[2] + s->specialvisibilityradius); + sv_writeentitiestoclient_totalentities++; + // if not touching a visible leaf + if (sv_cullentities_pvs.integer && sv_writeentitiestoclient_pvsbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, lightmins, lightmaxs)) + { + sv_writeentitiestoclient_culled_pvs++; + return; + } + // or not seen by random tracelines + if (sv_cullentities_trace.integer) + { + // 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; + sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID); + if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs)) + sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1; + else + { + // 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]); + sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID); + if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs)) + sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1; + else + { + if (s->specialvisibilityradius) + { + // 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]); + sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID); + if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs)) + sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1; + } + } + } + if (realtime > sv_writeentitiestoclient_client->visibletime[s->number]) + { + sv_writeentitiestoclient_culled_trace++; + return; + } + } + sv_writeentitiestoclient_visibleentities++; + } + } + // this just marks it for sending + // FIXME: it would be more efficient to send here, but the entity + // compressor isn't that flexible + sententities[s->number] = sententitiesmark; +} + +void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg) +{ + int i; + vec3_t testorigin; + entity_state_t *s; + entity_database4_t *d; + int maxbytes, n, startnumber; + entity_state_t *e, inactiveentitystate; + sizebuf_t buf; + qbyte data[128]; + // prepare the buffer + memset(&buf, 0, sizeof(buf)); + buf.data = data; + buf.maxsize = sizeof(data); + + d = client->entitydatabase4; + + for (i = 0;i < MAX_ENTITY_HISTORY;i++) + if (!d->commit[i].numentities) + break; + // if commit buffer full, just don't bother writing an update this frame + if (i == MAX_ENTITY_HISTORY) + return; + d->currentcommit = d->commit + i; + + // this state's number gets played around with later + ClearStateToDefault(&inactiveentitystate); + //inactiveentitystate = defaultstate; + + sv_writeentitiestoclient_client = client; + + sv_writeentitiestoclient_culled_pvs = 0; + sv_writeentitiestoclient_culled_trace = 0; + sv_writeentitiestoclient_visibleentities = 0; + sv_writeentitiestoclient_totalentities = 0; + + Mod_CheckLoaded(sv.worldmodel); + +// find the client's PVS + // the real place being tested from + VectorAdd(clent->v->origin, clent->v->view_ofs, sv_writeentitiestoclient_testeye); + sv_writeentitiestoclient_pvsbytes = 0; + if (sv.worldmodel && sv.worldmodel->brush.FatPVS) + sv_writeentitiestoclient_pvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, sv_writeentitiestoclient_testeye, 8, sv_writeentitiestoclient_pvs, sizeof(sv_writeentitiestoclient_pvs)); + + sv_writeentitiestoclient_clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes + + sententitiesmark++; + + // 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(sv_writeentitiestoclient_testeye, testorigin); + i = (int) clent->v->view_ofs[2] & 255; + if (i >= 128) + i -= 256; + testorigin[2] -= (float) i; + + for (i = 0;i < numsendentities;i++) + SV_MarkWriteEntityStateToClient(sendentities + i); + + // calculate maximum bytes to allow in this packet + // deduct 4 to account for the end data + maxbytes = min(msg->maxsize, MAX_PACKETFRAGMENT) - 4; + + d->currentcommit->numentities = 0; + d->currentcommit->framenum = ++client->entityframenumber; + MSG_WriteByte(msg, svc_entities); + MSG_WriteLong(msg, d->referenceframenum); + MSG_WriteLong(msg, d->currentcommit->framenum); + if (developer_networkentities.integer >= 1) + { + Con_Printf("send svc_entities ref:%i num:%i (database: ref:%i commits:", d->referenceframenum, d->currentcommit->framenum, d->referenceframenum); + for (i = 0;i < MAX_ENTITY_HISTORY;i++) + if (d->commit[i].numentities) + Con_Printf(" %i", d->commit[i].framenum); + Con_Printf(")\n"); + } + if (d->currententitynumber >= sv.max_edicts) + startnumber = 1; + else + startnumber = bound(1, d->currententitynumber, sv.max_edicts - 1); + MSG_WriteShort(msg, startnumber); + // reset currententitynumber so if the loop does not break it we will + // start at beginning next frame (if it does break, it will set it) + d->currententitynumber = 1; + for (i = 0, n = startnumber;n < sv.max_edicts;n++) + { + // find the old state to delta from + e = EntityFrame4_GetReferenceEntity(d, n); + // prepare the buffer + SZ_Clear(&buf); + // make the message + if (sententities[n] == sententitiesmark) + { + // entity exists, build an update (if empty there is no change) + // find the state in the list + for (;i < numsendentities && sendentities[i].number < n;i++); + s = sendentities + i; + if (s->number != n) + Sys_Error("SV_WriteEntitiesToClient: s->number != n\n"); + // build the update + if (s->exteriormodelforclient && s->exteriormodelforclient == sv_writeentitiestoclient_clentnum) + { + s->flags |= RENDER_EXTERIORMODEL; + EntityState_Write(s, &buf, e); + s->flags &= ~RENDER_EXTERIORMODEL; + } + else + EntityState_Write(s, &buf, e); + } + else + { + s = &inactiveentitystate; + s->number = n; + if (e->active) + { + // entity used to exist but doesn't anymore, send remove + MSG_WriteShort(&buf, n | 0x8000); + } + } + // if the commit is full, we're done this frame + if (msg->cursize + buf.cursize > maxbytes) + { + // next frame we will continue where we left off + break; + } + // add the entity to the commit + EntityFrame4_AddCommitEntity(d, s); + // if the message is empty, skip out now + if (buf.cursize) + { + // write the message to the packet + SZ_Write(msg, buf.data, buf.cursize); + } + } + d->currententitynumber = n; + + // remove world message (invalid, and thus a good terminator) + MSG_WriteShort(msg, 0x8000); + // write the number of the end entity + MSG_WriteShort(msg, d->currententitynumber); + // just to be sure + d->currentcommit = NULL; + + if (sv_cullentities_stats.integer) + Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, sv_writeentitiestoclient_totalentities, sv_writeentitiestoclient_visibleentities, sv_writeentitiestoclient_culled_pvs + sv_writeentitiestoclient_culled_trace, sv_writeentitiestoclient_culled_pvs, sv_writeentitiestoclient_culled_trace); +} +#endif + /* ============= SV_CleanupEnts @@ -761,13 +1130,10 @@ void SV_CleanupEnts (void) { int e; edict_t *ent; - + 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; } /* @@ -784,21 +1150,22 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) int items; eval_t *val; vec3_t punchvector; + qbyte viewzoom; // // 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_WriteFloatCoord (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; + 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; } // @@ -807,20 +1174,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 @@ -828,41 +1195,54 @@ 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 + + // PROTOCOL_DARKPLACES VectorClear(punchvector); 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]) + if (ent->v->punchangle[i]) bits |= (SU_PUNCH1<v.velocity[i]) + if (punchvector[i]) // PROTOCOL_DARKPLACES + bits |= (SU_PUNCHVEC1<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; -// if (ent->v.weapon) - bits |= SU_WEAPON; + bits |= SU_WEAPON; if (bits >= 65536) bits |= SU_EXTEND1; @@ -879,53 +1259,56 @@ 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 - if (bits & (SU_PUNCHVEC1<v->punchangle[i]); // PROTOCOL_DARKPLACES + 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_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 (standard_quake) - { - MSG_WriteByte (msg, ent->v.weapon); - } - else + 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); + + if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ) { for(i=0;i<32;i++) { - if ( ((int)ent->v.weapon) & (1<v->weapon) & (1<v->weapon); + } + + if (bits & SU_VIEWZOOM) + MSG_WriteByte (msg, viewzoom); } /* @@ -933,34 +1316,34 @@ 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) { - byte 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); MSG_WriteFloat (&msg, sv.time); -// add the client specific data to the datagram + // add the client specific data to the datagram SV_WriteClientdataToMessage (client->edict, &msg); SV_WriteEntitiesToClient (client, client->edict, &msg); -// copy the server datagram if there is space + // 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) + if (NetConn_SendUnreliableMessage (client->netconnection, &msg) == -1) { SV_DropClient (true);// if the message couldn't send, kick off return false; } - + return true; } @@ -971,33 +1354,74 @@ SV_UpdateToReliableMessages */ void SV_UpdateToReliableMessages (void) { - int i, j; + int i, j; client_t *client; + eval_t *val; + char *s; // check for changes to be sent over the reliable streams - for (i=0, host_client = svs.clients ; iold_frags != host_client->edict->v.frags) + // update the host_client fields we care about according to the entity fields + sv_player = EDICT_NUM(i+1); + s = PR_GetString(sv_player->v->netname); + if (s != host_client->name) + { + if (s == NULL) + s = ""; + // point the string back at host_client->name to keep it safe + strlcpy (host_client->name, s, sizeof (host_client->name)); + sv_player->v->netname = PR_SetString(host_client->name); + } + if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)) && host_client->colors != val->_float) + host_client->colors = val->_float; + host_client->frags = sv_player->v->frags; + if (gamemode == GAME_NEHAHRA) + if ((val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)) && host_client->pmodel != val->_float) + host_client->pmodel = val->_float; + + // if the fields changed, send messages about the changes + if (strcmp(host_client->old_name, host_client->name)) + { + strcpy(host_client->old_name, host_client->name); + for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) + { + if (!client->spawned || !client->netconnection) + continue; + MSG_WriteByte (&client->message, svc_updatename); + MSG_WriteByte (&client->message, i); + MSG_WriteString (&client->message, host_client->name); + } + } + if (host_client->old_colors != host_client->colors) + { + host_client->old_colors = host_client->colors; + for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) + { + if (!client->spawned || !client->netconnection) + continue; + MSG_WriteByte (&client->message, svc_updatecolors); + MSG_WriteByte (&client->message, i); + MSG_WriteByte (&client->message, host_client->colors); + } + } + if (host_client->old_frags != host_client->frags) { - for (j=0, client = svs.clients ; jold_frags = host_client->frags; + for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) { - if (!client->active) + if (!client->spawned || !client->netconnection) continue; MSG_WriteByte (&client->message, svc_updatefrags); MSG_WriteByte (&client->message, i); - MSG_WriteShort (&client->message, host_client->edict->v.frags); + MSG_WriteShort (&client->message, host_client->frags); } - - host_client->old_frags = host_client->edict->v.frags; } } - - for (j=0, client = svs.clients ; jactive) - continue; - SZ_Write (&client->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize); - } + + for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) + if (client->netconnection) + SZ_Write (&client->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize); SZ_Clear (&sv.reliable_datagram); } @@ -1014,15 +1438,15 @@ message buffer void SV_SendNop (client_t *client) { sizebuf_t msg; - byte buf[4]; - + qbyte buf[4]; + msg.data = buf; msg.maxsize = sizeof(buf); msg.cursize = 0; MSG_WriteChar (&msg, svc_nop); - if (NET_SendUnreliableMessage (client->netconnection, &msg) == -1) + if (NetConn_SendUnreliableMessage (client->netconnection, &msg) == -1) SV_DropClient (true); // if the message couldn't send, kick off client->last_message = realtime; } @@ -1034,19 +1458,36 @@ SV_SendClientMessages */ void SV_SendClientMessages (void) { - int i; - + int i, prepared = false; + // update frags, names, etc - SV_UpdateToReliableMessages (); + SV_UpdateToReliableMessages(); // build individual updates - for (i=0, host_client = svs.clients ; iactive) continue; + if (!host_client->netconnection) + { + SZ_Clear(&host_client->message); + continue; + } + + if (host_client->deadsocket || host_client->message.overflowed) + { + SV_DropClient (true); // if the message couldn't send, kick off + continue; + } if (host_client->spawned) { + if (!prepared) + { + prepared = true; + // only prepare entities once per frame + SV_PrepareEntitiesForSending(); + } if (!SV_SendClientDatagram (host_client)) continue; } @@ -1055,7 +1496,7 @@ void SV_SendClientMessages (void) // the player isn't totally in the game yet // send small keepalive messages if too much time has passed // send a full message when the next signon stage has been requested - // some other message data (name changes, etc) may accumulate + // some other message data (name changes, etc) may accumulate // between signon stages if (!host_client->sendsignon) { @@ -1065,29 +1506,16 @@ void SV_SendClientMessages (void) } } - // check for an overflowed message. Should only happen - // on a very fucked up connection that backs up a lot, then - // changes level - if (host_client->message.overflowed) - { - SV_DropClient (true); - host_client->message.overflowed = false; - continue; - } - if (host_client->message.cursize || host_client->dropasap) { - if (!NET_CanSendMessage (host_client->netconnection)) - { -// I_Printf ("can't write\n"); + if (!NetConn_CanSendMessage (host_client->netconnection)) continue; - } if (host_client->dropasap) SV_DropClient (false); // went to another level else { - if (NET_SendMessage (host_client->netconnection, &host_client->message) == -1) + if (NetConn_SendReliableMessage (host_client->netconnection, &host_client->message) == -1) SV_DropClient (true); // if the message couldn't send, kick off SZ_Clear (&host_client->message); host_client->last_message = realtime; @@ -1095,10 +1523,9 @@ void SV_SendClientMessages (void) } } } - - + // clear muzzle flashes - SV_CleanupEnts (); + SV_CleanupEnts(); } @@ -1116,10 +1543,10 @@ SV_ModelIndex ================ */ -int SV_ModelIndex (char *name) +int SV_ModelIndex (const char *name) { - int i; - + int i; + if (!name || !name[0]) return 0; @@ -1131,6 +1558,7 @@ int SV_ModelIndex (char *name) return i; } +#ifdef SV_QUAKEENTITIES /* ================ SV_CreateBaseline @@ -1139,60 +1567,70 @@ SV_CreateBaseline */ void SV_CreateBaseline (void) { - int i; - edict_t *svent; - int entnum; - - for (entnum = 0; entnum < sv.num_edicts ; entnum++) + int i, entnum, large; + edict_t *svent; + + // LordHavoc: clear *all* states (note just active ones) + for (entnum = 0;entnum < sv.max_edicts;entnum++) { - // get the current server version + // get the current server version svent = EDICT_NUM(entnum); - if (svent->free) + + // LordHavoc: always clear state values, whether the entity is in use or not + ClearStateToDefault(&svent->e->baseline); + + if (svent->e->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; + // create entity baseline + VectorCopy (svent->v->origin, svent->e->baseline.origin); + VectorCopy (svent->v->angles, svent->e->baseline.angles); + svent->e->baseline.frame = svent->v->frame; + svent->e->baseline.skin = svent->v->skin; if (entnum > 0 && entnum <= svs.maxclients) { - svent->baseline.colormap = entnum; - svent->baseline.modelindex = SV_ModelIndex("progs/player.mdl"); + svent->e->baseline.colormap = entnum; + svent->e->baseline.modelindex = SV_ModelIndex("progs/player.mdl"); } else { - svent->baseline.colormap = 0; - svent->baseline.modelindex = - SV_ModelIndex(pr_strings + svent->v.model); + svent->e->baseline.colormap = 0; + svent->e->baseline.modelindex = svent->v->modelindex; } - svent->baseline.alpha = 255; - svent->baseline.scale = 16; - svent->baseline.glowsize = 0; - svent->baseline.glowcolor = 254; - svent->baseline.colormod = 255; - - // - // add to the message - // - MSG_WriteByte (&sv.signon,svc_spawnbaseline); - MSG_WriteShort (&sv.signon,entnum); - - MSG_WriteByte (&sv.signon, svent->baseline.modelindex); - MSG_WriteByte (&sv.signon, svent->baseline.frame); - MSG_WriteByte (&sv.signon, svent->baseline.colormap); - MSG_WriteByte (&sv.signon, svent->baseline.skin); + + large = false; + if (svent->e->baseline.modelindex & 0xFF00 || svent->e->baseline.frame & 0xFF00) + large = true; + + // add to the message + if (large) + MSG_WriteByte (&sv.signon, svc_spawnbaseline2); + else + MSG_WriteByte (&sv.signon, svc_spawnbaseline); + MSG_WriteShort (&sv.signon, entnum); + + if (large) + { + MSG_WriteShort (&sv.signon, svent->e->baseline.modelindex); + MSG_WriteShort (&sv.signon, svent->e->baseline.frame); + } + else + { + MSG_WriteByte (&sv.signon, svent->e->baseline.modelindex); + MSG_WriteByte (&sv.signon, svent->e->baseline.frame); + } + MSG_WriteByte (&sv.signon, svent->e->baseline.colormap); + MSG_WriteByte (&sv.signon, svent->e->baseline.skin); for (i=0 ; i<3 ; i++) { - MSG_WriteFloatCoord(&sv.signon, svent->baseline.origin[i]); - MSG_WriteAngle(&sv.signon, svent->baseline.angles[i]); + MSG_WriteDPCoord(&sv.signon, svent->e->baseline.origin[i]); + MSG_WriteAngle(&sv.signon, svent->e->baseline.angles[i]); } } } +#endif /* @@ -1213,8 +1651,8 @@ void SV_SendReconnect (void) MSG_WriteChar (&msg, svc_stufftext); MSG_WriteString (&msg, "reconnect\n"); - NET_SendToAll (&msg, 5); - + NetConn_SendToAll (&msg, 5); + if (cls.state != ca_dedicated) Cmd_ExecuteString ("reconnect\n", src_command); } @@ -1234,7 +1672,7 @@ void SV_SaveSpawnparms (void) svs.serverflags = pr_global_struct->serverflags; - for (i=0, host_client = svs.clients ; iactive) continue; @@ -1247,7 +1685,48 @@ void SV_SaveSpawnparms (void) } } -qboolean isworldmodel; +void SV_IncreaseEdicts(void) +{ + int i; + edict_t *ent; + int oldmax_edicts = sv.max_edicts; + void *oldedictsengineprivate = sv.edictsengineprivate; + void *oldedictsfields = sv.edictsfields; + void *oldmoved_edicts = sv.moved_edicts; + + if (sv.max_edicts >= MAX_EDICTS) + return; + + // links don't survive the transition, so unlink everything + for (i = 0, ent = sv.edicts;i < sv.max_edicts;i++, ent++) + { + if (!ent->e->free) + SV_UnlinkEdict(sv.edicts + i); + memset(&ent->e->areagrid, 0, sizeof(ent->e->areagrid)); + } + SV_ClearWorld(); + + sv.max_edicts = min(sv.max_edicts + 256, MAX_EDICTS); + sv.edictsengineprivate = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_engineprivate_t)); + sv.edictsfields = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size); + sv.moved_edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *)); + + memcpy(sv.edictsengineprivate, oldedictsengineprivate, oldmax_edicts * sizeof(edict_engineprivate_t)); + memcpy(sv.edictsfields, oldedictsfields, oldmax_edicts * pr_edict_size); + + for (i = 0, ent = sv.edicts;i < sv.max_edicts;i++, ent++) + { + ent->e = sv.edictsengineprivate + i; + ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size); + // link every entity except world + if (!ent->e->free) + SV_LinkEdict(ent, false); + } + + Mem_Free(oldedictsengineprivate); + Mem_Free(oldedictsfields); + Mem_Free(oldmoved_edicts); +} /* ================ @@ -1258,10 +1737,11 @@ This is called at the start of each level */ extern float scr_centertime_off; -void SV_SpawnServer (char *server) +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) @@ -1275,23 +1755,19 @@ void SV_SpawnServer (char *server) // tell all connected clients that we are going to a new level // if (sv.active) - { - SV_SendReconnect (); - } + SV_SendReconnect(); + else + NetConn_OpenServerPorts(true); // // make cvars consistant // - if (coop.value) + if (coop.integer) Cvar_SetValue ("deathmatch", 0); - current_skill = (int)(skill.value + 0.5); - if (current_skill < 0) - current_skill = 0; - if (current_skill > 3) - current_skill = 3; + current_skill = bound(0, (int)(skill.value + 0.5), 3); Cvar_SetValue ("skill", (float)current_skill); - + // // set up the new server // @@ -1299,46 +1775,58 @@ void SV_SpawnServer (char *server) memset (&sv, 0, sizeof(sv)); - strcpy (sv.name, server); + strlcpy (sv.name, server, sizeof (sv.name)); // load progs to get entity field count PR_LoadProgs (); // allocate server memory - sv.max_edicts = MAX_EDICTS; - - sv.edicts = Hunk_AllocName (sv.max_edicts*pr_edict_size, "edicts"); + // start out with just enough room for clients and a reasonable estimate of entities + sv.max_edicts = max(svs.maxclients + 1, 512); + sv.max_edicts = min(sv.max_edicts, MAX_EDICTS); + + // clear the edict memory pool + Mem_EmptyPool(sv_edicts_mempool); + // edict_t structures (hidden from progs) + sv.edicts = Mem_Alloc(sv_edicts_mempool, MAX_EDICTS * sizeof(edict_t)); + // engine private structures (hidden from progs) + sv.edictsengineprivate = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_engineprivate_t)); + // progs fields, often accessed by server + sv.edictsfields = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size); + // 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->e = sv.edictsengineprivate + i; + ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size); + } sv.datagram.maxsize = sizeof(sv.datagram_buf); sv.datagram.cursize = 0; sv.datagram.data = sv.datagram_buf; - + sv.reliable_datagram.maxsize = sizeof(sv.reliable_datagram_buf); sv.reliable_datagram.cursize = 0; sv.reliable_datagram.data = sv.reliable_datagram_buf; - + sv.signon.maxsize = sizeof(sv.signon_buf); sv.signon.cursize = 0; sv.signon.data = sv.signon_buf; - + // leave slots at start for clients only sv.num_edicts = svs.maxclients+1; - for (i=0 ; inumsubmodels ; i++) + for (i = 1;i < sv.worldmodel->brush.numsubmodels;i++) { - sv.model_precache[1+i] = localmodels[i]; - sv.models[i+1] = Mod_ForName (localmodels[i], false); + sv.model_precache[i+1] = localmodels[i]; + sv.models[i+1] = Mod_ForName (localmodels[i], false, false, false); } // // load the rest of the entities -// +// ent = EDICT_NUM(0); - 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.angles[0] = ent->v.angles[1] = ent->v.angles[2] = 0; + memset (ent->v, 0, progs->entityfields * 4); + ent->e->free = false; + 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.value) - pr_global_struct->coop = coop.value; + pr_global_struct->coop = coop.integer; else - pr_global_struct->deathmatch = deathmatch.value; + 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->brush.entities); + + // LordHavoc: clear world angles (to fix e3m3.bsp) - sv.edicts->v.angles[0] = sv.edicts->v.angles[1] = sv.edicts->v.angles[2] = 0; + VectorClear(sv.edicts->v->angles); sv.active = true; // all setup is completed, any further precache statements are errors sv.state = ss_active; - + // run two frames to allow everything to settle - sv.frametime = pr_global_struct->frametime = host_frametime = 0.1; - SV_Physics (); - SV_Physics (); + for (i = 0;i < 2;i++) + { + 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 ; iactive) - SV_SendServerinfo (host_client); - + for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) + if (host_client->netconnection) + SV_SendServerinfo(host_client); + Con_DPrintf ("Server spawned.\n"); + NetConn_Heartbeat (2); } +