// 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;
static char localmodels[MAX_MODELS][5]; // inline model names for precache
-static mempool_t *sv_edicts_mempool = NULL;
+mempool_t *sv_edicts_mempool = NULL;
//============================================================================
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();
ent = NUM_FOR_EDICT(entity);
- channel = (ent<<3) | channel;
-
field_mask = 0;
if (volume != DEFAULT_SOUND_PACKET_VOLUME)
field_mask |= SND_VOLUME;
if (attenuation != DEFAULT_SOUND_PACKET_ATTENUATION)
field_mask |= SND_ATTENUATION;
+ if (ent >= 8192)
+ field_mask |= SND_LARGEENTITY;
+ if (sound_num >= 256 || channel >= 8)
+ field_mask |= SND_LARGESOUND;
// directed messages go only to the entity they are targeted on
- if (sound_num >= 256)
- MSG_WriteByte (&sv.datagram, svc_sound2);
- else
- MSG_WriteByte (&sv.datagram, svc_sound);
+ MSG_WriteByte (&sv.datagram, svc_sound);
MSG_WriteByte (&sv.datagram, field_mask);
if (field_mask & SND_VOLUME)
MSG_WriteByte (&sv.datagram, volume);
if (field_mask & SND_ATTENUATION)
MSG_WriteByte (&sv.datagram, attenuation*64);
- MSG_WriteShort (&sv.datagram, channel);
- if (sound_num >= 256)
+ if (field_mask & SND_LARGEENTITY)
+ {
+ MSG_WriteShort (&sv.datagram, ent);
+ MSG_WriteByte (&sv.datagram, channel);
+ }
+ else
+ MSG_WriteShort (&sv.datagram, (ent<<3) | channel);
+ if (field_mask & SND_LARGESOUND)
MSG_WriteShort (&sv.datagram, sound_num);
else
MSG_WriteByte (&sv.datagram, sound_num);
- for (i=0 ; i<3 ; i++)
- MSG_WriteDPCoord (&sv.datagram, entity->v.origin[i]+0.5*(entity->v.mins[i]+entity->v.maxs[i]));
+ for (i = 0;i < 3;i++)
+ MSG_WriteDPCoord (&sv.datagram, entity->v->origin[i]+0.5*(entity->v->mins[i]+entity->v->maxs[i]));
}
/*
void SV_SendServerinfo (client_t *client)
{
char **s;
- char message[2048];
+ char message[128];
// LordHavoc: clear entityframe tracking
client->entityframenumber = 0;
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);
// send music
MSG_WriteByte (&client->message, svc_cdtrack);
- MSG_WriteByte (&client->message, sv.edicts->v.sounds);
- MSG_WriteByte (&client->message, sv.edicts->v.sounds);
+ MSG_WriteByte (&client->message, sv.edicts->v->sounds);
+ MSG_WriteByte (&client->message, sv.edicts->v->sounds);
// set view
MSG_WriteByte (&client->message, svc_setview);
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;
+ Con_DPrintf ("Client %s connected\n", client->netconnection->address);
+
strcpy (client->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
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 ; i<NUM_SPAWN_PARMS ; i++)
client->spawn_parms[i] = (&pr_global_struct->parm1)[i];
+ // set up the edict a bit
+ ED_ClearEdict(client->edict);
+ client->edict->v->colormap = NUM_FOR_EDICT(client->edict);
+ client->edict->v->netname = PR_SetString(client->name);
}
-#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 ; i<svs.maxclients ; i++)
- if (!svs.clients[i].active)
- break;
- if (i == svs.maxclients)
- Sys_Error ("Host_CheckForNewClients: no free clients");
-
- svs.clients[i].netconnection = ret;
- SV_ConnectClient (i);
-
- net_activeconnections++;
- }
-}
-
-
-
/*
===============================================================================
{
if (node->contents != CONTENTS_SOLID)
{
- pvs = Mod_LeafPVS ( (mleaf_t *)node, sv.worldmodel);
+ pvs = sv.worldmodel->LeafPVS(sv.worldmodel, (mleaf_t *)node);
for (i=0 ; i<fatbytes ; i++)
fatpvs[i] |= pvs[i];
}
}
// node - recurse down the BSP tree
- switch (BOX_ON_PLANE_SIDE(mins, maxs, node->plane))
+ switch (BoxOnPlaneSide(mins, maxs, node->plane))
{
case 1: // front
node = node->children[0];
#ifdef QUAKEENTITIES
void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
{
- int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects;
+ int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize;
int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
qbyte *pvs;
vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
Mod_CheckLoaded(sv.worldmodel);
// find the client's PVS
- VectorAdd (clent->v.origin, clent->v.view_ofs, testeye);
+ VectorAdd (clent->v->origin, clent->v->view_ofs, testeye);
pvs = SV_FatPVS (testeye);
culled_pvs = 0;
if (val->_float != 0)
bits |= U_GLOWTRAIL;
- if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model])
+ if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && *PR_GetString(ent->v->model))
{
- model = sv.models[(int)ent->v.modelindex];
+ model = sv.models[(int)ent->v->modelindex];
Mod_CheckLoaded(model);
}
else
continue;
}
- VectorCopy(ent->v.angles, angles);
- if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f)
+ VectorCopy(ent->v->angles, angles);
+ if (DotProduct(ent->v->velocity, ent->v->velocity) >= 1.0f)
{
- VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin);
+ VectorMA(ent->v->origin, host_client->latency, ent->v->velocity, origin);
// LordHavoc: trace predicted movement to avoid putting things in walls
- trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, origin, MOVE_NORMAL, ent);
+ trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, origin, MOVE_NORMAL, ent);
VectorCopy(trace.endpos, origin);
}
else
{
- VectorCopy(ent->v.origin, origin);
+ VectorCopy(ent->v->origin, origin);
}
// ent has survived every check so far, check if it is visible
// using the model's bounding box to ensure things are visible regardless of their physics box
if (model)
{
- if (ent->v.angles[0] || ent->v.angles[2]) // pitch and roll
+ if (ent->v->angles[0] || ent->v->angles[2]) // pitch and roll
{
VectorAdd(entmins, model->rotatedmins, entmins);
VectorAdd(entmaxs, model->rotatedmaxs, entmaxs);
}
- else if (ent->v.angles[1])
+ else if (ent->v->angles[1])
{
VectorAdd(entmins, model->yawmins, entmins);
VectorAdd(entmaxs, model->yawmaxs, entmaxs);
alphaf = 255.0f;
scale = 16;
glowcolor = 254;
- effects = ent->v.effects;
+ effects = ent->v->effects;
if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
if (val->_float != 0)
bits = bits | U_EXTERIORMODEL;
// send an update
- baseline = &ent->baseline;
+ baseline = &ent->e->baseline;
- if (((int)ent->v.effects & EF_DELTA) && sv_deltacompress.integer)
+ if (((int)ent->v->effects & EF_DELTA) && sv_deltacompress.integer)
{
// every half second a full update is forced
if (realtime < client->nextfullupdate[e])
{
bits |= U_DELTA;
- baseline = &ent->deltabaseline;
+ baseline = &ent->e->deltabaseline;
}
else
nextfullupdate = realtime + 0.5f;
if (e >= 256)
bits |= U_LONGENTITY;
- if (ent->v.movetype == MOVETYPE_STEP)
+ if (ent->v->movetype == MOVETYPE_STEP)
bits |= U_STEP;
// LordHavoc: old stuff, but rewritten to have more exact tolerances
if (((int)(angles[0]*(256.0/360.0)) & 255) != ((int)(baseline->angles[0]*(256.0/360.0)) & 255)) bits |= U_ANGLE1;
if (((int)(angles[1]*(256.0/360.0)) & 255) != ((int)(baseline->angles[1]*(256.0/360.0)) & 255)) bits |= U_ANGLE2;
if (((int)(angles[2]*(256.0/360.0)) & 255) != ((int)(baseline->angles[2]*(256.0/360.0)) & 255)) bits |= U_ANGLE3;
- if (baseline->colormap != (qbyte) ent->v.colormap) bits |= U_COLORMAP;
- if (baseline->skin != (qbyte) ent->v.skin) bits |= U_SKIN;
- if ((baseline->frame & 0x00FF) != ((int) ent->v.frame & 0x00FF)) bits |= U_FRAME;
- if ((baseline->effects & 0x00FF) != ((int) ent->v.effects & 0x00FF)) bits |= U_EFFECTS;
- if ((baseline->modelindex & 0x00FF) != ((int) ent->v.modelindex & 0x00FF)) bits |= U_MODEL;
+ if (baseline->colormap != (qbyte) ent->v->colormap) bits |= U_COLORMAP;
+ if (baseline->skin != (qbyte) ent->v->skin) bits |= U_SKIN;
+ if ((baseline->frame & 0x00FF) != ((int) ent->v->frame & 0x00FF)) bits |= U_FRAME;
+ if ((baseline->effects & 0x00FF) != ((int) ent->v->effects & 0x00FF)) bits |= U_EFFECTS;
+ if ((baseline->modelindex & 0x00FF) != ((int) ent->v->modelindex & 0x00FF)) bits |= U_MODEL;
// LordHavoc: new stuff
if (baseline->alpha != alpha) bits |= U_ALPHA;
if (baseline->scale != scale) bits |= U_SCALE;
- if (((int) baseline->effects & 0xFF00) != ((int) ent->v.effects & 0xFF00)) bits |= U_EFFECTS2;
+ if (((int) baseline->effects & 0xFF00) != ((int) ent->v->effects & 0xFF00)) bits |= U_EFFECTS2;
if (baseline->glowsize != glowsize) bits |= U_GLOWSIZE;
if (baseline->glowcolor != glowcolor) bits |= U_GLOWCOLOR;
- if (((int) baseline->frame & 0xFF00) != ((int) ent->v.frame & 0xFF00)) bits |= U_FRAME2;
- if (((int) baseline->frame & 0xFF00) != ((int) ent->v.modelindex & 0xFF00)) bits |= U_MODEL2;
+ if (((int) baseline->frame & 0xFF00) != ((int) ent->v->frame & 0xFF00)) bits |= U_FRAME2;
+ if (((int) baseline->frame & 0xFF00) != ((int) ent->v->modelindex & 0xFF00)) bits |= U_MODEL2;
// update delta baseline
- VectorCopy(ent->v.origin, ent->deltabaseline.origin);
- VectorCopy(ent->v.angles, ent->deltabaseline.angles);
- ent->deltabaseline.colormap = ent->v.colormap;
- ent->deltabaseline.skin = ent->v.skin;
- ent->deltabaseline.frame = ent->v.frame;
- ent->deltabaseline.effects = ent->v.effects;
- ent->deltabaseline.modelindex = ent->v.modelindex;
- 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)
MSG_WriteShort (msg,e);
else
MSG_WriteByte (msg,e);
- if (bits & U_MODEL) MSG_WriteByte (msg, ent->v.modelindex);
- if (bits & U_FRAME) MSG_WriteByte (msg, ent->v.frame);
- if (bits & U_COLORMAP) MSG_WriteByte (msg, ent->v.colormap);
- if (bits & U_SKIN) MSG_WriteByte (msg, ent->v.skin);
- if (bits & U_EFFECTS) MSG_WriteByte (msg, ent->v.effects);
+ if (bits & U_MODEL) MSG_WriteByte (msg, ent->v->modelindex);
+ if (bits & U_FRAME) MSG_WriteByte (msg, ent->v->frame);
+ if (bits & U_COLORMAP) MSG_WriteByte (msg, ent->v->colormap);
+ if (bits & U_SKIN) MSG_WriteByte (msg, ent->v->skin);
+ if (bits & U_EFFECTS) MSG_WriteByte (msg, ent->v->effects);
if (bits & U_ORIGIN1) MSG_WriteDPCoord (msg, origin[0]);
if (bits & U_ANGLE1) MSG_WriteAngle(msg, angles[0]);
if (bits & U_ORIGIN2) MSG_WriteDPCoord (msg, origin[1]);
// LordHavoc: new stuff
if (bits & U_ALPHA) MSG_WriteByte(msg, alpha);
if (bits & U_SCALE) MSG_WriteByte(msg, scale);
- if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v.effects >> 8);
+ if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v->effects >> 8);
if (bits & U_GLOWSIZE) MSG_WriteByte(msg, glowsize);
if (bits & U_GLOWCOLOR) MSG_WriteByte(msg, glowcolor);
- if (bits & U_FRAME2) MSG_WriteByte(msg, (int)ent->v.frame >> 8);
- if (bits & U_MODEL2) MSG_WriteByte(msg, (int)ent->v.modelindex >> 8);
+ if (bits & U_FRAME2) MSG_WriteByte(msg, (int)ent->v->frame >> 8);
+ if (bits & U_MODEL2) MSG_WriteByte(msg, (int)ent->v->modelindex >> 8);
}
if (sv_cullentities_stats.integer)
Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d portal %d trace\n", client->name, totalentities, visibleentities, culled_pvs + culled_portal + culled_trace, culled_pvs, culled_portal, culled_trace);
}
#else
+static entity_frame_t sv_writeentitiestoclient_entityframe;
void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
{
- int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects;
+ int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects, modelindex;
int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
- float alphaf;
+ float alphaf, lightsize;
qbyte *pvs;
- vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
+ vec3_t origin, angles, entmins, entmaxs, lightmins, lightmaxs, testorigin, testeye;
edict_t *ent;
eval_t *val;
trace_t trace;
model_t *model;
- entity_frame_t entityframe;
entity_state_t *s;
- if (client->sendsignon)
- return;
-
Mod_CheckLoaded(sv.worldmodel);
// find the client's PVS
// the real place being tested from
- VectorAdd (clent->v.origin, clent->v.view_ofs, testeye);
+ VectorAdd (clent->v->origin, clent->v->view_ofs, testeye);
pvs = SV_FatPVS (testeye);
// the place being reported (to consider the fact the client still
// applies the view_ofs[2], so we have to only send the fractional part
// of view_ofs[2], undoing what the client will redo)
VectorCopy (testeye, testorigin);
- e = (int) clent->v.view_ofs[2] & 255;
+ e = (int) clent->v->view_ofs[2] & 255;
if (e >= 128)
e -= 256;
testorigin[2] -= (float) e;
- EntityFrame_Clear(&entityframe, testorigin);
+ EntityFrame_Clear(&sv_writeentitiestoclient_entityframe, testorigin);
culled_pvs = 0;
culled_portal = 0;
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
}
glowsize = 0;
-
+ effects = ent->v->effects;
if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size)))
glowsize = (int) val->_float >> 2;
glowsize = bound(0, glowsize, 255);
+ lightsize = 0;
+ if (effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
+ {
+ if (effects & EF_BRIGHTFIELD)
+ lightsize = max(lightsize, 80);
+ if (effects & EF_MUZZLEFLASH)
+ lightsize = max(lightsize, 100);
+ if (effects & EF_BRIGHTLIGHT)
+ lightsize = max(lightsize, 400);
+ if (effects & EF_DIMLIGHT)
+ lightsize = max(lightsize, 200);
+ if (effects & EF_RED)
+ lightsize = max(lightsize, 200);
+ if (effects & EF_BLUE)
+ lightsize = max(lightsize, 200);
+ if (effects & EF_FLAME)
+ lightsize = max(lightsize, 250);
+ if (effects & EF_STARDUST)
+ lightsize = max(lightsize, 100);
+ }
+ if (glowsize)
+ lightsize = max(lightsize, glowsize << 2);
+
if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail)))
if (val->_float != 0)
+ {
flags |= RENDER_GLOWTRAIL;
+ lightsize = max(lightsize, 100);
+ }
- if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model])
+ modelindex = 0;
+ if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && *PR_GetString(ent->v->model))
{
- model = sv.models[(int)ent->v.modelindex];
+ modelindex = ent->v->modelindex;
+ model = sv.models[(int)ent->v->modelindex];
Mod_CheckLoaded(model);
}
else
{
model = NULL;
if (ent != clent) // LordHavoc: always send player
- if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+ if (lightsize == 0) // no effects
continue;
}
- VectorCopy(ent->v.angles, angles);
- if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f && host_client->latency >= 0.01f)
+ VectorCopy(ent->v->angles, angles);
+ if (DotProduct(ent->v->velocity, ent->v->velocity) >= 1.0f && host_client->latency >= 0.01f)
{
- VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin);
+ VectorMA(ent->v->origin, host_client->latency, ent->v->velocity, origin);
// LordHavoc: trace predicted movement to avoid putting things in walls
- trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, origin, MOVE_NORMAL, ent);
+ trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, origin, MOVE_NORMAL, ent);
VectorCopy(trace.endpos, origin);
}
else
{
- VectorCopy(ent->v.origin, origin);
+ VectorCopy(ent->v->origin, origin);
}
// ent has survived every check so far, check if it is visible
// using the model's bounding box to ensure things are visible regardless of their physics box
if (model)
{
- if (ent->v.angles[0] || ent->v.angles[2]) // pitch and roll
+ if (ent->v->angles[0] || ent->v->angles[2]) // pitch and roll
{
VectorAdd(entmins, model->rotatedmins, entmins);
VectorAdd(entmaxs, model->rotatedmaxs, entmaxs);
}
- else if (ent->v.angles[1])
+ else if (ent->v->angles[1])
{
VectorAdd(entmins, model->yawmins, entmins);
VectorAdd(entmaxs, model->yawmaxs, entmaxs);
VectorAdd(entmaxs, model->normalmaxs, entmaxs);
}
}
+ lightmins[0] = min(entmins[0], origin[0] - lightsize);
+ lightmins[1] = min(entmins[1], origin[1] - lightsize);
+ lightmins[2] = min(entmins[2], origin[2] - lightsize);
+ lightmaxs[0] = min(entmaxs[0], origin[0] + lightsize);
+ lightmaxs[1] = min(entmaxs[1], origin[1] + lightsize);
+ lightmaxs[2] = min(entmaxs[2], origin[2] + lightsize);
totalentities++;
// if not touching a visible leaf
- if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, entmins, entmaxs, sv.worldmodel->nodes))
+ if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, lightmins, lightmaxs, sv.worldmodel->nodes))
{
culled_pvs++;
continue;
}
// or not visible through the portals
- if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs))
+ if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, lightmins, lightmaxs))
{
culled_portal++;
continue;
if (sv_cullentities_trace.integer)
{
- // LordHavoc: test random offsets, to maximize chance of detection
- testorigin[0] = lhrandom(entmins[0], entmaxs[0]);
- testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
- testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
-
+ // LordHavoc: test center first
+ testorigin[0] = (entmins[0] + entmaxs[0]) * 0.5f;
+ testorigin[1] = (entmins[1] + entmaxs[1]) * 0.5f;
+ testorigin[2] = (entmins[2] + entmaxs[2]) * 0.5f;
Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
-
if (trace.fraction == 1)
client->visibletime[e] = realtime + 1;
else
{
- if (realtime > client->visibletime[e])
+ // LordHavoc: test random offsets, to maximize chance of detection
+ testorigin[0] = lhrandom(entmins[0], entmaxs[0]);
+ testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
+ testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
+ Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
+ if (trace.fraction == 1)
+ client->visibletime[e] = realtime + 1;
+ else
{
- culled_trace++;
- continue;
+ if (lightsize)
+ {
+ // LordHavoc: test random offsets, to maximize chance of detection
+ testorigin[0] = lhrandom(lightmins[0], lightmaxs[0]);
+ testorigin[1] = lhrandom(lightmins[1], lightmaxs[1]);
+ testorigin[2] = lhrandom(lightmins[2], lightmaxs[2]);
+ Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
+ if (trace.fraction == 1)
+ client->visibletime[e] = realtime + 1;
+ else
+ {
+ if (realtime > client->visibletime[e])
+ {
+ culled_trace++;
+ continue;
+ }
+ }
+ }
+ else
+ {
+ if (realtime > client->visibletime[e])
+ {
+ culled_trace++;
+ continue;
+ }
+ }
}
}
}
alphaf = 255.0f;
scale = 16;
glowcolor = 254;
- effects = ent->v.effects;
+ effects = ent->v->effects;
if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
if (val->_float != 0)
if (ent != clent)
{
- if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+ if (lightsize == 0) // no effects
{
if (model) // model
{
if ((val = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)) && val->edict == clentnum)
flags |= RENDER_EXTERIORMODEL;
- if (ent->v.movetype == MOVETYPE_STEP)
+ if (ent->v->movetype == MOVETYPE_STEP)
flags |= RENDER_STEP;
// don't send an entity if it's coordinates would wrap around
if ((effects & EF_LOWPRECISION) && origin[0] >= -32768 && origin[1] >= -32768 && origin[2] >= -32768 && origin[0] <= 32767 && origin[1] <= 32767 && origin[2] <= 32767)
flags |= RENDER_LOWPRECISION;
- s = EntityFrame_NewEntity(&entityframe, e);
+ s = EntityFrame_NewEntity(&sv_writeentitiestoclient_entityframe, e);
// if we run out of space, abort
if (!s)
break;
VectorCopy(origin, s->origin);
VectorCopy(angles, s->angles);
- s->colormap = ent->v.colormap;
- s->skin = ent->v.skin;
- s->frame = ent->v.frame;
- s->modelindex = ent->v.modelindex;
+ if (ent->v->colormap >= 1024)
+ flags |= RENDER_COLORMAPPED;
+ s->colormap = ent->v->colormap;
+ s->skin = ent->v->skin;
+ s->frame = ent->v->frame;
+ s->modelindex = modelindex;
s->effects = effects;
s->alpha = alpha;
s->scale = scale;
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);
ent = NEXT_EDICT(sv.edicts);
for (e=1 ; e<sv.num_edicts ; e++, ent = NEXT_EDICT(ent))
- ent->v.effects = (int)ent->v.effects & ~EF_MUZZLEFLASH;
+ ent->v->effects = (int)ent->v->effects & ~EF_MUZZLEFLASH;
}
/*
//
// send a damage message
//
- if (ent->v.dmg_take || ent->v.dmg_save)
+ if (ent->v->dmg_take || ent->v->dmg_save)
{
- other = PROG_TO_EDICT(ent->v.dmg_inflictor);
+ other = PROG_TO_EDICT(ent->v->dmg_inflictor);
MSG_WriteByte (msg, svc_damage);
- MSG_WriteByte (msg, ent->v.dmg_save);
- MSG_WriteByte (msg, ent->v.dmg_take);
+ MSG_WriteByte (msg, ent->v->dmg_save);
+ MSG_WriteByte (msg, ent->v->dmg_take);
for (i=0 ; i<3 ; i++)
- MSG_WriteDPCoord (msg, other->v.origin[i] + 0.5*(other->v.mins[i] + other->v.maxs[i]));
+ MSG_WriteDPCoord (msg, other->v->origin[i] + 0.5*(other->v->mins[i] + other->v->maxs[i]));
- ent->v.dmg_take = 0;
- ent->v.dmg_save = 0;
+ ent->v->dmg_take = 0;
+ ent->v->dmg_save = 0;
}
//
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
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
for (i=0 ; i<3 ; i++)
{
- if (ent->v.punchangle[i])
+ if (ent->v->punchangle[i])
bits |= (SU_PUNCH1<<i);
if (punchvector[i]) // dpprotocol
bits |= (SU_PUNCHVEC1<<i); // dpprotocol
- if (ent->v.velocity[i])
+ if (ent->v->velocity[i])
bits |= (SU_VELOCITY1<<i);
}
- if (ent->v.weaponframe)
+ if (ent->v->weaponframe)
bits |= SU_WEAPONFRAME;
- if (ent->v.armorvalue)
+ if (ent->v->armorvalue)
bits |= SU_ARMOR;
bits |= SU_WEAPON;
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<<i))
- MSG_WritePreciseAngle(msg, ent->v.punchangle[i]); // dpprotocol
+ MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // dpprotocol
if (bits & (SU_PUNCHVEC1<<i)) // dpprotocol
MSG_WriteDPCoord(msg, punchvector[i]); // dpprotocol
if (bits & (SU_VELOCITY1<<i))
- MSG_WriteChar (msg, ent->v.velocity[i]/16);
+ MSG_WriteChar (msg, ent->v->velocity[i]/16);
}
// [always sent] if (bits & SU_ITEMS)
MSG_WriteLong (msg, items);
if (bits & SU_WEAPONFRAME)
- MSG_WriteByte (msg, ent->v.weaponframe);
+ MSG_WriteByte (msg, ent->v->weaponframe);
if (bits & SU_ARMOR)
- MSG_WriteByte (msg, ent->v.armorvalue);
+ MSG_WriteByte (msg, ent->v->armorvalue);
if (bits & SU_WEAPON)
- MSG_WriteByte (msg, SV_ModelIndex(pr_strings+ent->v.weaponmodel));
+ MSG_WriteByte (msg, SV_ModelIndex(PR_GetString(ent->v->weaponmodel)));
- MSG_WriteShort (msg, ent->v.health);
- MSG_WriteByte (msg, ent->v.currentammo);
- MSG_WriteByte (msg, ent->v.ammo_shells);
- MSG_WriteByte (msg, ent->v.ammo_nails);
- MSG_WriteByte (msg, ent->v.ammo_rockets);
- MSG_WriteByte (msg, ent->v.ammo_cells);
+ MSG_WriteShort (msg, ent->v->health);
+ MSG_WriteByte (msg, ent->v->currentammo);
+ MSG_WriteByte (msg, ent->v->ammo_shells);
+ MSG_WriteByte (msg, ent->v->ammo_nails);
+ MSG_WriteByte (msg, ent->v->ammo_rockets);
+ MSG_WriteByte (msg, ent->v->ammo_cells);
if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
{
for(i=0;i<32;i++)
{
- if ( ((int)ent->v.weapon) & (1<<i) )
+ if ( ((int)ent->v->weapon) & (1<<i) )
{
MSG_WriteByte (msg, i);
break;
}
else
{
- MSG_WriteByte (msg, ent->v.weapon);
+ MSG_WriteByte (msg, ent->v->weapon);
}
if (bits & SU_VIEWZOOM)
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;
*/
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 ; i<svs.maxclients ; i++, host_client++)
{
- if (host_client->old_frags != host_client->edict->v.frags)
+ // update the host_client fields we care about according to the entity fields
+ sv_player = host_client->edict;
+ 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
+ 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 ; j<svs.maxclients ; j++, client++)
+ {
+ if (!client->active || !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 ; j<svs.maxclients ; j++, client++)
+ {
+ if (!client->active || !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 ; j<svs.maxclients ; j++, client++)
{
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);
+ MSG_WriteShort (&client->message, host_client->frags);
}
-
- host_client->old_frags = host_client->edict->v.frags;
}
}
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;
}
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)
{
// 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;
================
*/
-int SV_ModelIndex (char *name)
+int SV_ModelIndex (const char *name)
{
- int i;
+ int i;
if (!name || !name[0])
return 0;
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)
+ 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
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]);
}
}
}
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);
}
}
}
+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;
+
+ // links don't survive the transition, so unlink everything
+ for (i = 0;i < sv.max_edicts;i++)
+ SV_UnlinkEdict (sv.edicts + i);
+ 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;i < sv.max_edicts;i++)
+ {
+ ent = sv.edicts + i;
+ ent->e = sv.edictsengineprivate + i;
+ ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size);
+ // link every entity except world
+ if (i > 0)
+ SV_LinkEdict(ent, false);
+ }
+
+ Mem_Free(oldedictsengineprivate);
+ Mem_Free(oldedictsfields);
+ Mem_Free(oldmoved_edicts);
+}
+
/*
================
SV_SpawnServer
*/
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)
//
if (sv.active)
SV_SendReconnect ();
+ else
+ NetConn_OpenServerPorts(svs.maxclients > 1);
//
// make cvars consistant
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 * pr_edict_size);
+ // 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;
// leave slots at start for clients only
sv.num_edicts = svs.maxclients+1;
for (i=0 ; i<svs.maxclients ; i++)
- {
- ent = EDICT_NUM(i+1);
- svs.clients[i].edict = ent;
- }
+ svs.clients[i].edict = EDICT_NUM(i+1);
sv.state = ss_loading;
sv.paused = false;
//
SV_ClearWorld ();
- sv.sound_precache[0] = pr_strings;
+ sv.sound_precache[0] = "";
- sv.model_precache[0] = pr_strings;
+ sv.model_precache[0] = "";
sv.model_precache[1] = sv.modelname;
for (i = 1;i < sv.worldmodel->numsubmodels;i++)
{
// 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;
+ 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.integer)
pr_global_struct->coop = coop.integer;
else
pr_global_struct->deathmatch = deathmatch.integer;
- pr_global_struct->mapname = sv.name - pr_strings;
+ pr_global_struct->mapname = PR_SetString(sv.name);
// serverflags are for cross level information (sigils)
pr_global_struct->serverflags = svs.serverflags;
- ED_LoadFromFile (sv.worldmodel->entities);
+ // load replacement entity file if found
+ entities = NULL;
+ if (sv_entpatch.integer)
+ entities = FS_LoadFile(va("maps/%s.ent", sv.name), true);
+ if (entities)
+ {
+ Con_Printf("Loaded maps/%s.ent\n", sv.name);
+ ED_LoadFromFile (entities);
+ Mem_Free(entities);
+ }
+ else
+ ED_LoadFromFile (sv.worldmodel->entities);
+
+
// LordHavoc: clear world angles (to fix e3m3.bsp)
- VectorClear(sv.edicts->v.angles);
+ VectorClear(sv.edicts->v->angles);
sv.active = true;
SV_SendServerinfo (host_client);
Con_DPrintf ("Server spawned.\n");
+ NetConn_Heartbeat (2);
}
projects / xonotic / darkplaces.git / blobdiff