X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_main.c;h=74fd70ba600a0c7890d3ca64926085a1901763e7;hb=93bce2dbe64b734e74d721164369943fffe7e397;hp=82318441daac5cf10e03f76f22e761c92bedc615;hpb=fb5638603d5fb14033bb41a99dbaba135b5e7985;p=xonotic%2Fdarkplaces.git diff --git a/sv_main.c b/sv_main.c index 82318441..74fd70ba 100644 --- a/sv_main.c +++ b/sv_main.c @@ -20,18 +20,20 @@ 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; +server_t sv; +server_static_t svs; static char localmodels[MAX_MODELS][5]; // inline model names for precache -static mempool_t *sv_edicts_mempool = NULL; +mempool_t *sv_edicts_mempool = NULL; //============================================================================ @@ -57,12 +59,12 @@ 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_portal); Cvar_RegisterVariable (&sv_cullentities_trace); Cvar_RegisterVariable (&sv_cullentities_stats); + Cvar_RegisterVariable (&sv_entpatch); SV_Phys_Init(); SV_World_Init(); @@ -161,13 +163,9 @@ Larger attenuations will drop off. (max 4 attenuation) ================== */ -void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, - float 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; + int sound_num, field_mask, i, ent; if (volume < 0 || volume > 255) Host_Error ("SV_StartSound: volume = %i", volume); @@ -182,43 +180,47 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, 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++) + for (i = 0;i < 3;i++) MSG_WriteDPCoord (&sv.datagram, entity->v->origin[i]+0.5*(entity->v->mins[i]+entity->v->maxs[i])); } @@ -241,7 +243,10 @@ 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 - svs.clients) + 1); // LordHavoc: clear entityframe tracking client->entityframenumber = 0; @@ -260,9 +265,7 @@ void SV_SendServerinfo (client_t *client) 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); @@ -296,35 +299,27 @@ 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->netconnection = netconnection; - strcpy (client->name, "unconnected"); + Con_DPrintf("Client %s connected\n", client->netconnection->address); + + strcpy(client->name, "unconnected"); + strcpy(client->old_name, "unconnected"); client->active = true; 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 @@ -333,62 +328,16 @@ 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]; } -#if NOROUTINGFIX SV_SendServerinfo (client); -#else - // send serverinfo on first nop - client->waitingforconnect = true; - client->sendsignon = true; - client->spawned = false; // need prespawn, spawn, etc -#endif -} - - -/* -=================== -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 != CONTENTS_SOLID) { - pvs = Mod_LeafPVS ( (mleaf_t *)node, sv.worldmodel); + pvs = sv.worldmodel->brushq1.LeafPVS(sv.worldmodel, (mleaf_t *)node); for (i=0 ; inumleafs+31)>>3; + fatbytes = (sv.worldmodel->brushq1.numleafs+31)>>3; memset (fatpvs, 0, fatbytes); - SV_AddToFatPVS (org, sv.worldmodel->nodes); + SV_AddToFatPVS (org, sv.worldmodel->brushq1.nodes); return fatpvs; } @@ -485,7 +434,7 @@ loc0: // leaf if (node->contents == CONTENTS_SOLID) return false; - leafnum = (mleaf_t *)node - sv.worldmodel->leafs - 1; + leafnum = (mleaf_t *)node - sv.worldmodel->brushq1.leafs - 1; return pvs[leafnum >> 3] & (1 << (leafnum & 7)); } @@ -586,7 +535,7 @@ 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]; Mod_CheckLoaded(model); @@ -600,17 +549,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } 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); - // LordHavoc: trace predicted movement to avoid putting things in walls - trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, origin, MOVE_NORMAL, ent); - VectorCopy(trace.endpos, origin); - } - else - { - VectorCopy(ent->v->origin, origin); - } + VectorCopy(ent->v->origin, origin); // ent has survived every check so far, check if it is visible if (ent != clent && ((bits & U_VIEWMODEL) == 0)) @@ -645,7 +584,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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, entmins, entmaxs, sv.worldmodel->brushq1.nodes)) { culled_pvs++; continue; @@ -666,7 +605,10 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) testorigin[1] = lhrandom(entmins[1], entmaxs[1]); testorigin[2] = lhrandom(entmins[2], entmaxs[2]); - Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); + if (sv.worldmodel && sv.worldmodel->brush.TraceBox) + sv.worldmodel->brush.TraceBox(sv.worldmodel, vec3_origin, vec3_origin, &trace, testeye, vec3_origin, vec3_origin, testorigin); + else + Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); if (trace.fraction == 1) client->visibletime[e] = realtime + 1; @@ -677,7 +619,10 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) testorigin[1] = bound(entmins[1], testeye[1], entmaxs[1]); testorigin[2] = bound(entmins[2], testeye[2], entmaxs[2]); - Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); + if (sv.worldmodel && sv.worldmodel->brush.TraceBox) + sv.worldmodel->brush.TraceBox(sv.worldmodel, vec3_origin, vec3_origin, &trace, testeye, vec3_origin, vec3_origin, testorigin); + else + Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); if (trace.fraction == 1) client->visibletime[e] = realtime + 1; @@ -753,7 +698,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) bits = bits | U_EXTERIORMODEL; // send an update - baseline = &ent->baseline; + baseline = &ent->e->baseline; if (((int)ent->v->effects & EF_DELTA) && sv_deltacompress.integer) { @@ -761,7 +706,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (realtime < client->nextfullupdate[e]) { bits |= U_DELTA; - baseline = &ent->deltabaseline; + baseline = &ent->e->deltabaseline; } else nextfullupdate = realtime + 0.5f; @@ -801,17 +746,17 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; + 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) @@ -862,6 +807,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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, modelindex; @@ -873,12 +819,8 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) eval_t *val; trace_t trace; model_t *model; - entity_frame_t entityframe; entity_state_t *s; - if (client->sendsignon) - return; - Mod_CheckLoaded(sv.worldmodel); // find the client's PVS @@ -894,7 +836,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -907,6 +849,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->e->free) + continue; flags = 0; if (ent != clent) // LordHavoc: always send player @@ -968,7 +912,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } modelindex = 0; - 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)) { modelindex = ent->v->modelindex; model = sv.models[(int)ent->v->modelindex]; @@ -983,17 +927,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } VectorCopy(ent->v->angles, angles); - if (DotProduct(ent->v->velocity, ent->v->velocity) >= 1.0f && host_client->latency >= 0.01f) - { - VectorMA(ent->v->origin, host_client->latency, ent->v->velocity, origin); - // LordHavoc: trace predicted movement to avoid putting things in walls - trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, origin, MOVE_NORMAL, ent); - VectorCopy(trace.endpos, origin); - } - else - { - VectorCopy(ent->v->origin, origin); - } + VectorCopy(ent->v->origin, origin); // ent has survived every check so far, check if it is visible // always send embedded brush models, they don't generate much traffic @@ -1035,7 +969,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) totalentities++; // if not touching a visible leaf - if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, lightmins, lightmaxs, sv.worldmodel->nodes)) + if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, lightmins, lightmaxs, sv.worldmodel->brushq1.nodes)) { culled_pvs++; continue; @@ -1054,7 +988,10 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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 (sv.worldmodel && sv.worldmodel->brush.TraceBox) + sv.worldmodel->brush.TraceBox(sv.worldmodel, vec3_origin, vec3_origin, &trace, NULL, testeye, vec3_origin, vec3_origin, testorigin); + else + 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 @@ -1063,7 +1000,10 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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 (sv.worldmodel && sv.worldmodel->brush.TraceBox) + sv.worldmodel->brush.TraceBox(sv.worldmodel, vec3_origin, vec3_origin, &trace, NULL, testeye, vec3_origin, vec3_origin, testorigin); + else + 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 @@ -1074,7 +1014,10 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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 (sv.worldmodel && sv.worldmodel->brush.TraceBox) + sv.worldmodel->brush.TraceBox(sv.worldmodel, vec3_origin, vec3_origin, &trace, NULL, testeye, vec3_origin, vec3_origin, testorigin); + else + 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 @@ -1155,7 +1098,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -1174,8 +1117,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); @@ -1344,7 +1287,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) if (bits & SU_ARMOR) 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); @@ -1378,32 +1321,29 @@ 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); MSG_WriteFloat (&msg, sv.time); - if (client->spawned) - { - // add the client specific data to the datagram - SV_WriteClientdataToMessage (client->edict, &msg); + // add the client specific data to the datagram + SV_WriteClientdataToMessage (client->edict, &msg); - SV_WriteEntitiesToClient (client, client->edict, &msg); + SV_WriteEntitiesToClient (client, client->edict, &msg); - // copy the server datagram if there is space - if (msg.cursize + sv.datagram.cursize < msg.maxsize) - SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize); - } + // copy the server datagram if there is space + if (msg.cursize + sv.datagram.cursize < msg.maxsize) + SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize); // send the datagram - if (NET_SendUnreliableMessage (client->netconnection, &msg) == -1) + if (NetConn_SendUnreliableMessage (client->netconnection, &msg) == -1) { SV_DropClient (true);// if the message couldn't send, kick off return false; @@ -1419,24 +1359,72 @@ 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) + // only update the client fields if they've spawned in + if (host_client->spawned) { - for (j=0, client = svs.clients ; jedict; + s = PR_GetString(sv_player->v->netname); + if (s != host_client->name) { - if (!client->active || !client->spawned) - continue; - MSG_WriteByte (&client->message, svc_updatefrags); - MSG_WriteByte (&client->message, i); - MSG_WriteShort (&client->message, host_client->edict->v->frags); + if (s == NULL) + s = ""; + // point the string back at host_client->name to keep it safe + strncpy(host_client->name, s, sizeof(host_client->name) - 1); + 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 ; jactive || !client->spawned) + 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 ; jactive || !client->spawned) + 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) + { + host_client->old_frags = host_client->frags; + for (j=0, client = svs.clients ; jactive || !client->spawned) + continue; + MSG_WriteByte (&client->message, svc_updatefrags); + MSG_WriteByte (&client->message, i); + MSG_WriteShort (&client->message, host_client->frags); + } } - - host_client->old_frags = host_client->edict->v->frags; } } @@ -1470,7 +1458,7 @@ void SV_SendNop (client_t *client) 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; } @@ -1493,13 +1481,11 @@ void SV_SendClientMessages (void) if (!host_client->active) continue; -#ifndef NOROUTINGFIX - if (host_client->sendserverinfo) + if (host_client->deadsocket) { - host_client->sendserverinfo = false; - SV_SendServerinfo (host_client); + SV_DropClient (true); // if the message couldn't send, kick off + continue; } -#endif if (host_client->spawned) { @@ -1526,21 +1512,21 @@ void SV_SendClientMessages (void) // changes level if (host_client->message.overflowed) { - SV_DropClient (true); + SV_DropClient (true); // overflowed host_client->message.overflowed = false; continue; } if (host_client->message.cursize || host_client->dropasap) { - if (!NET_CanSendMessage (host_client->netconnection)) + 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; @@ -1597,37 +1583,37 @@ 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); // LordHavoc: always clear state values, whether the entity is in use or not - ClearStateToDefault(&svent->baseline); + ClearStateToDefault(&svent->e->baseline); - if (svent->free) + if (svent->e->free) continue; 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->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 = svent->v->modelindex; + svent->e->baseline.colormap = 0; + svent->e->baseline.modelindex = svent->v->modelindex; } large = false; - if (svent->baseline.modelindex & 0xFF00 || svent->baseline.frame & 0xFF00) + if (svent->e->baseline.modelindex & 0xFF00 || svent->e->baseline.frame & 0xFF00) large = true; // add to the message @@ -1639,20 +1625,20 @@ void SV_CreateBaseline (void) if (large) { - MSG_WriteShort (&sv.signon, svent->baseline.modelindex); - MSG_WriteShort (&sv.signon, svent->baseline.frame); + MSG_WriteShort (&sv.signon, svent->e->baseline.modelindex); + MSG_WriteShort (&sv.signon, svent->e->baseline.frame); } else { - MSG_WriteByte (&sv.signon, svent->baseline.modelindex); - MSG_WriteByte (&sv.signon, svent->baseline.frame); + MSG_WriteByte (&sv.signon, svent->e->baseline.modelindex); + MSG_WriteByte (&sv.signon, svent->e->baseline.frame); } - MSG_WriteByte (&sv.signon, svent->baseline.colormap); - MSG_WriteByte (&sv.signon, svent->baseline.skin); + MSG_WriteByte (&sv.signon, svent->e->baseline.colormap); + MSG_WriteByte (&sv.signon, svent->e->baseline.skin); for (i=0 ; i<3 ; i++) { - MSG_WriteDPCoord(&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]); } } } @@ -1677,7 +1663,7 @@ 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); @@ -1711,6 +1697,49 @@ void SV_SaveSpawnparms (void) } } +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 + 32, 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); +} + /* ================ SV_SpawnServer @@ -1722,8 +1751,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) @@ -1738,6 +1768,8 @@ void SV_SpawnServer (const char *server) // if (sv.active) SV_SendReconnect (); + else + NetConn_OpenServerPorts(svs.maxclients > 1); // // make cvars consistant @@ -1761,18 +1793,25 @@ void SV_SpawnServer (const char *server) PR_LoadProgs (); // allocate server memory - sv.max_edicts = MAX_EDICTS; + // start out with just enough room for clients and a reasonable estimate of entities + sv.max_edicts = ((svs.maxclients + 128) + 31) & ~31; + sv.max_edicts = min(sv.max_edicts, MAX_EDICTS); // clear the edict memory pool Mem_EmptyPool(sv_edicts_mempool); - sv.edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t)); + // 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); - sv.edictstable = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *)); - for (i = 0;i < MAX_EDICTS;i++) + // 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.edictstable[i] = ent; } sv.datagram.maxsize = sizeof(sv.datagram_buf); @@ -1789,11 +1828,6 @@ void SV_SpawnServer (const char *server) // leave slots at start for clients only sv.num_edicts = svs.maxclients+1; - for (i=0 ; inumsubmodels;i++) + for (i = 1;i < sv.worldmodel->brushq1.numsubmodels;i++) { sv.model_precache[i+1] = localmodels[i]; sv.models[i+1] = Mod_ForName (localmodels[i], false, false, false); @@ -1833,23 +1867,36 @@ void SV_SpawnServer (const char *server) // ent = EDICT_NUM(0); memset (ent->v, 0, progs->entityfields * 4); - ent->free = false; - ent->v->model = sv.worldmodel->name - pr_strings; + 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.integer) + if (coop.value) 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->brush.entities); + + // LordHavoc: clear world angles (to fix e3m3.bsp) VectorClear(sv.edicts->v->angles); @@ -1859,10 +1906,11 @@ void SV_SpawnServer (const char *server) 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.frametime = pr_global_struct->frametime = host_frametime = 0.1; - SV_Physics (); + for (i = 0;i < 2;i++) + { + sv.frametime = pr_global_struct->frametime = host_frametime = 0.1; + SV_Physics (); + } Mod_PurgeUnused(); @@ -1877,6 +1925,6 @@ void SV_SpawnServer (const char *server) SV_SendServerinfo (host_client); Con_DPrintf ("Server spawned.\n"); - NET_Heartbeat (2); + NetConn_Heartbeat (2); }