#include "quakedef.h"
-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_pvs = {0, "sv_cullentities_pvs", "1"}; // fast but loose
+static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0"}; // 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"};
static char localmodels[MAX_MODELS][5]; // inline model names for precache
mempool_t *sv_edicts_mempool = NULL;
-mempool_t *sv_clients_mempool = NULL;
//============================================================================
extern void SV_Phys_Init (void);
extern void SV_World_Init (void);
+static void SV_SaveEntFile_f(void);
/*
===============
{
int i;
+ Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f);
Cvar_RegisterVariable (&sv_maxvelocity);
Cvar_RegisterVariable (&sv_gravity);
Cvar_RegisterVariable (&sv_friction);
sprintf (localmodels[i], "*%i", i);
sv_edicts_mempool = Mem_AllocPool("server edicts");
- sv_clients_mempool = Mem_AllocPool("server clients");
+}
+
+static void SV_SaveEntFile_f(void)
+{
+ char basename[MAX_QPATH];
+ if (!sv.active || !sv.worldmodel)
+ {
+ Con_Print("Not running a server\n");
+ return;
+ }
+ FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
+ FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities));
}
/*
if ( sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num] )
{
- Con_Printf ("SV_StartSound: %s not precached\n", sample);
+ Con_Printf("SV_StartSound: %s not precached\n", sample);
return;
}
client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool);
MSG_WriteByte (&client->message, svc_print);
- sprintf (message, "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, 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_VERSION4);
- MSG_WriteByte (&client->message, MAX_SCOREBOARD);
+ MSG_WriteLong (&client->message, PROTOCOL_DARKPLACES5);
+ MSG_WriteByte (&client->message, svs.maxclients);
if (!coop.integer && deathmatch.integer)
MSG_WriteByte (&client->message, GAME_DEATHMATCH);
int i;
float spawn_parms[NUM_SPAWN_PARMS];
- client = svs.connectedclients[clientnum];
+ client = svs.clients + clientnum;
// set up the client_t
if (sv.loadgame)
memcpy (spawn_parms, client->spawn_parms, sizeof(spawn_parms));
memset (client, 0, sizeof(*client));
+ client->active = true;
client->netconnection = netconnection;
Con_DPrintf("Client %s connected\n", client->netconnection->address);
}
// 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] != '*'))
+ if (sv_cullentities_trace.integer && (model == 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]);
- if (SV_Move(testeye, vec3_origin, vec3_origin, testorigin, MOVE_WORLDONLY, NULL).fraction == 1)
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
+ if (trace.fraction == 1)
client->visibletime[e] = realtime + 1;
else
{
testorigin[1] = bound(entmins[1], testeye[1], entmaxs[1]);
testorigin[2] = bound(entmins[2], testeye[2], entmaxs[2]);
- if (SV_Move(testeye, vec3_origin, vec3_origin, testorigin, MOVE_WORLDONLY, NULL).fraction == 1)
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
+ if (trace.fraction == 1)
client->visibletime[e] = realtime + 1;
else if (realtime > client->visibletime[e])
{
if (msg->maxsize - msg->cursize < 32) // LordHavoc: increased check from 16 to 32
{
- Con_Printf ("packet overflow\n");
+ Con_Print("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++)
{
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_WriteDPCoord (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_WriteDPCoord (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_WriteDPCoord (msg, origin[2]);
+ if (bits & U_ORIGIN3) MSG_WriteDPCoord(msg, origin[2]);
if (bits & U_ANGLE3) MSG_WriteAngle(msg, angles[2]);
// LordHavoc: new stuff
void SV_PrepareEntitiesForSending(void)
{
int e, i;
+ float f;
edict_t *ent;
entity_state_t cs;
// send all entities that touch the pvs
if (i >= 1 && i < MAX_MODELS && *PR_GetString(ent->v->model))
cs.modelindex = i;
-
cs.alpha = 255;
- i = (int)(GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f);
- if (i)
+ f = (GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f);
+ if (f)
+ {
+ i = (int)f;
cs.alpha = (qbyte)bound(0, i, 255);
+ }
// halflife
- i = (int)(GETEDICTFIELDVALUE(ent, eval_renderamt)->_float);
- if (i)
+ f = (GETEDICTFIELDVALUE(ent, eval_renderamt)->_float);
+ if (f)
+ {
+ i = (int)f;
cs.alpha = (qbyte)bound(0, i, 255);
+ }
cs.scale = 16;
- i = (int)(GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
- if (i)
+ f = (GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
+ if (f)
+ {
+ i = (int)f;
cs.scale = (qbyte)bound(0, i, 255);
+ }
cs.glowcolor = 254;
- i = (int)(GETEDICTFIELDVALUE(ent, eval_glow_color)->_float);
- if (i)
- cs.glowcolor = i;
+ f = (GETEDICTFIELDVALUE(ent, eval_glow_color)->_float);
+ if (f)
+ cs.glowcolor = (int)f;
if (GETEDICTFIELDVALUE(ent, eval_fullbright)->_float)
cs.effects |= EF_FULLBRIGHT;
if (cs.viewmodelforclient)
cs.flags |= RENDER_VIEWMODEL; // show relative to the view
+ f = GETEDICTFIELDVALUE(ent, eval_color)->vector[0]*256;
+ cs.light[0] = (unsigned short)bound(0, f, 65535);
+ f = GETEDICTFIELDVALUE(ent, eval_color)->vector[1]*256;
+ cs.light[1] = (unsigned short)bound(0, f, 65535);
+ f = GETEDICTFIELDVALUE(ent, eval_color)->vector[2]*256;
+ cs.light[2] = (unsigned short)bound(0, f, 65535);
+ f = GETEDICTFIELDVALUE(ent, eval_light_lev)->_float;
+ cs.light[3] = (unsigned short)bound(0, f, 65535);
+ cs.lightstyle = (qbyte)GETEDICTFIELDVALUE(ent, eval_style)->_float;
+ cs.lightpflags = (qbyte)GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
+
+ if (gamemode == GAME_TENEBRAE)
+ {
+ // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
+ if (cs.effects & 16)
+ {
+ cs.effects &= ~16;
+ cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+ }
+ // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
+ if (cs.effects & 32)
+ {
+ cs.effects &= ~32;
+ cs.light[0] = 0.2;
+ cs.light[1] = 1;
+ cs.light[2] = 0.2;
+ cs.light[3] = 200;
+ cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+ }
+ }
+
cs.specialvisibilityradius = 0;
+ if (cs.lightpflags & PFLAGS_FULLDYNAMIC)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.light[3]);
if (cs.glowsize)
cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.glowsize * 4);
if (cs.flags & RENDER_GLOWTRAIL)
// 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 > MAX_SCOREBOARD && ((cs.effects & EF_NODRAW) || (!cs.modelindex && !cs.specialvisibilityradius)))
+ if (cs.number > svs.maxclients && ((cs.effects & EF_NODRAW) || (!cs.modelindex && !cs.specialvisibilityradius)))
continue;
sendentitiesindex[e] = sendentities + numsendentities;
sendentities[numsendentities++] = cs;
testorigin[0] = (entmins[0] + entmaxs[0]) * 0.5f;
testorigin[1] = (entmins[1] + entmaxs[1]) * 0.5f;
testorigin[2] = (entmins[2] + entmaxs[2]) * 0.5f;
- trace = SV_Move(sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, MOVE_WORLDONLY, NULL);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &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
testorigin[0] = lhrandom(entmins[0], entmaxs[0]);
testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
- trace = SV_Move(sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, MOVE_WORLDONLY, NULL);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &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
testorigin[0] = lhrandom(lightmins[0], lightmaxs[0]);
testorigin[1] = lhrandom(lightmins[1], lightmaxs[1]);
testorigin[2] = lhrandom(lightmins[2], lightmaxs[2]);
- trace = SV_Move(sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, MOVE_WORLDONLY, NULL);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &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;
}
vec3_t testorigin;
entity_state_t *s;
entity_database4_t *d;
- int maxbytes, n, startnumber;
+ int n, startnumber;
entity_state_t *e, inactiveentitystate;
sizebuf_t buf;
qbyte data[128];
+
+ // if there isn't enough space to accomplish anything, skip it
+ if (msg->cursize + 24 > msg->maxsize)
+ return;
+
// 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;
for (i = 0;i < numsendentities;i++)
SV_MarkWriteEntityStateToClient(sendentities + i);
- d = client->entitydatabase4;
- // 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 = d->commit + EntityFrame4_SV_ChooseCommitToReplace(d);
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_Print(")\n");
+ }
if (d->currententitynumber >= sv.max_edicts)
startnumber = 1;
else
}
}
// if the commit is full, we're done this frame
- if (msg->cursize + buf.cursize > maxbytes)
+ if (msg->cursize + buf.cursize > msg->maxsize - 4)
{
// next frame we will continue where we left off
break;
if ( ent->v->waterlevel >= 2)
bits |= SU_INWATER;
- // dpprotocol
+ // PROTOCOL_DARKPLACES
VectorClear(punchvector);
if ((val = GETEDICTFIELDVALUE(ent, eval_punchvector)))
VectorCopy(val->vector, punchvector);
{
if (ent->v->punchangle[i])
bits |= (SU_PUNCH1<<i);
- if (punchvector[i]) // dpprotocol
- bits |= (SU_PUNCHVEC1<<i); // dpprotocol
+ if (punchvector[i]) // PROTOCOL_DARKPLACES
+ bits |= (SU_PUNCHVEC1<<i); // PROTOCOL_DARKPLACES
if (ent->v->velocity[i])
bits |= (SU_VELOCITY1<<i);
}
for (i=0 ; i<3 ; i++)
{
if (bits & (SU_PUNCH1<<i))
- MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // dpprotocol
- if (bits & (SU_PUNCHVEC1<<i)) // dpprotocol
- MSG_WriteDPCoord(msg, punchvector[i]); // dpprotocol
+ MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // PROTOCOL_DARKPLACES
+ if (bits & (SU_PUNCHVEC1<<i)) // PROTOCOL_DARKPLACES
+ MSG_WriteFloat(msg, punchvector[i]); // PROTOCOL_DARKPLACES
if (bits & (SU_VELOCITY1<<i))
- MSG_WriteChar (msg, ent->v->velocity[i]/16);
+ MSG_WriteFloat(msg, ent->v->velocity[i]);
}
// [always sent] if (bits & SU_ITEMS)
MSG_WriteByte (msg, ent->v->ammo_rockets);
MSG_WriteByte (msg, ent->v->ammo_cells);
- if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
{
for(i=0;i<32;i++)
{
SV_SendClientDatagram
=======================
*/
-static qbyte sv_sendclientdatagram_buf[MAX_DATAGRAM]; // FIXME?
+static qbyte sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
qboolean SV_SendClientDatagram (client_t *client)
{
sizebuf_t msg;
msg.data = sv_sendclientdatagram_buf;
- msg.maxsize = sizeof(sv_sendclientdatagram_buf);
+ msg.maxsize = (int)bound(50.0, client->netconnection->rate * host_realframetime, (double)sizeof(sv_sendclientdatagram_buf));
msg.cursize = 0;
MSG_WriteByte (&msg, svc_time);
SV_WriteEntitiesToClient (client, client->edict, &msg);
// copy the server datagram if there is space
- if (msg.cursize + sv.datagram.cursize < msg.maxsize)
+ // FIXME: put in delayed queue of effects to send
+ if (msg.cursize + sv.datagram.cursize <= msg.maxsize)
SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize);
// send the datagram
char *s;
// check for changes to be sent over the reliable streams
- for (i = 0;i < MAX_SCOREBOARD;i++)
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
- // only update the client fields if they've spawned in
- if ((host_client = svs.connectedclients[i]) && host_client->spawned)
+ // 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)
{
- // 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))
+ 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++)
{
- strcpy(host_client->old_name, host_client->name);
- for (j = 0;j < MAX_SCOREBOARD;j++)
- {
- if (!(client = svs.connectedclients[j]) || !client->spawned)
- continue;
- MSG_WriteByte (&client->message, svc_updatename);
- MSG_WriteByte (&client->message, i);
- MSG_WriteString (&client->message, host_client->name);
- }
+ 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)
+ }
+ 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++)
{
- host_client->old_colors = host_client->colors;
- for (j = 0;j < MAX_SCOREBOARD;j++)
- {
- if (!(client = svs.connectedclients[j]) || !client->spawned)
- continue;
- MSG_WriteByte (&client->message, svc_updatecolors);
- MSG_WriteByte (&client->message, i);
- MSG_WriteByte (&client->message, host_client->colors);
- }
+ 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)
+ }
+ 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++)
{
- host_client->old_frags = host_client->frags;
- for (j = 0;j < MAX_SCOREBOARD;j++)
- {
- if (!(client = svs.connectedclients[j]) || !client->spawned)
- continue;
- MSG_WriteByte (&client->message, svc_updatefrags);
- MSG_WriteByte (&client->message, i);
- MSG_WriteShort (&client->message, host_client->frags);
- }
+ if (!client->spawned || !client->netconnection)
+ continue;
+ MSG_WriteByte (&client->message, svc_updatefrags);
+ MSG_WriteByte (&client->message, i);
+ MSG_WriteShort (&client->message, host_client->frags);
}
}
}
- for (j = 0;j < MAX_SCOREBOARD;j++)
- if ((client = svs.connectedclients[j]))
+ 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);
SV_UpdateToReliableMessages();
// build individual updates
- for (i = 0;i < MAX_SCOREBOARD;i++)
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
- if (!(host_client = svs.connectedclients[i]))
+ if (!host_client->active)
+ continue;
+ if (!host_client->netconnection)
+ {
+ SZ_Clear(&host_client->message);
continue;
+ }
- if (host_client->deadsocket || !host_client->netconnection || host_client->message.overflowed)
+ if (host_client->deadsocket || host_client->message.overflowed)
{
SV_DropClient (true); // if the message couldn't send, kick off
continue;
if (svent->e->free)
continue;
- if (entnum > MAX_SCOREBOARD && !svent->v->modelindex)
+ if (entnum > svs.maxclients && !svent->v->modelindex)
continue;
// create entity baseline
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 <= MAX_SCOREBOARD)
+ if (entnum > 0 && entnum <= svs.maxclients)
{
svent->e->baseline.colormap = entnum;
svent->e->baseline.modelindex = SV_ModelIndex("progs/player.mdl");
svs.serverflags = pr_global_struct->serverflags;
- for (i = 0;i < MAX_SCOREBOARD;i++)
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
- if (!(host_client = svs.connectedclients[i]))
+ if (!host_client->active)
continue;
// call the progs to get default spawn parms for the new client
Cvar_Set ("hostname", "UNNAMED");
scr_centertime_off = 0;
- Con_DPrintf ("SpawnServer: %s\n",server);
+ Con_DPrintf("SpawnServer: %s\n",server);
svs.changelevel_issued = false; // now safe to issue another
//
if (sv.active)
SV_SendReconnect();
else
+ {
+ // make sure cvars have been checked before opening the ports
+ NetConn_ServerFrame();
NetConn_OpenServerPorts(true);
+ }
//
// make cvars consistant
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
// start out with just enough room for clients and a reasonable estimate of entities
- sv.max_edicts = max(MAX_SCOREBOARD + 1, 512);
+ sv.max_edicts = max(svs.maxclients + 1, 512);
sv.max_edicts = min(sv.max_edicts, MAX_EDICTS);
// clear the edict memory pool
sv.signon.data = sv.signon_buf;
// leave slots at start for clients only
- sv.num_edicts = MAX_SCOREBOARD+1;
+ sv.num_edicts = svs.maxclients+1;
sv.state = ss_loading;
sv.paused = false;
Mod_ClearUsed();
- strcpy (sv.name, server);
- sprintf (sv.modelname,"maps/%s.bsp", server);
+ strlcpy (sv.name, server, sizeof (sv.name));
+ snprintf (sv.modelname, sizeof (sv.modelname), "maps/%s.bsp", server);
sv.worldmodel = Mod_ForName(sv.modelname, false, true, true);
if (!sv.worldmodel)
{
- Con_Printf ("Couldn't spawn server %s\n", sv.modelname);
+ Con_Printf("Couldn't spawn server %s\n", sv.modelname);
sv.active = false;
return;
}
// load replacement entity file if found
entities = NULL;
if (sv_entpatch.integer)
- entities = FS_LoadFile(va("maps/%s.ent", sv.name), true);
+ entities = FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true);
if (entities)
{
Con_Printf("Loaded maps/%s.ent\n", sv.name);
#endif
// send serverinfo to all connected clients
- for (i = 0;i < MAX_SCOREBOARD;i++)
- if ((host_client = svs.connectedclients[i]))
+ 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");
+ Con_DPrint("Server spawned.\n");
NetConn_Heartbeat (2);
}
projects / xonotic / darkplaces.git / blobdiff