#include "quakedef.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
+// select which protocol to host, by name
+// this is named the same as PROTOCOL_DARKPLACES5 for example, minus the PROTOCOL_ prefix
+cvar_t sv_protocolname = {0, "sv_protocolname", "DARKPLACES5"};
+cvar_t sv_ratelimitlocalplayer = {0, "sv_ratelimitlocalplayer", "0"};
+cvar_t sv_maxrate = {CVAR_SAVE | CVAR_NOTIFY, "sv_maxrate", "10000"};
+
+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"};
-server_t sv;
-server_static_t svs;
+cvar_t sv_gameplayfix_grenadebouncedownslopes = {0, "sv_gameplayfix_grenadebouncedownslopes", "1"};
+cvar_t sv_gameplayfix_noairborncorpse = {0, "sv_gameplayfix_noairborncorpse", "1"};
+cvar_t sv_gameplayfix_stepdown = {0, "sv_gameplayfix_stepdown", "1"};
+cvar_t sv_gameplayfix_stepwhilejumping = {0, "sv_gameplayfix_stepwhilejumping", "1"};
+cvar_t sv_gameplayfix_swiminbmodels = {0, "sv_gameplayfix_swiminbmodels", "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;
//============================================================================
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);
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);
+ Cvar_RegisterVariable (&sv_gameplayfix_grenadebouncedownslopes);
+ Cvar_RegisterVariable (&sv_gameplayfix_noairborncorpse);
+ Cvar_RegisterVariable (&sv_gameplayfix_stepdown);
+ Cvar_RegisterVariable (&sv_gameplayfix_stepwhilejumping);
+ Cvar_RegisterVariable (&sv_gameplayfix_swiminbmodels);
+ Cvar_RegisterVariable (&sv_protocolname);
+ Cvar_RegisterVariable (&sv_ratelimitlocalplayer);
+ Cvar_RegisterVariable (&sv_maxrate);
SV_Phys_Init();
SV_World_Init();
for (i = 0;i < MAX_MODELS;i++)
sprintf (localmodels[i], "*%i", i);
- sv_edicts_mempool = Mem_AllocPool("edicts");
+ sv_edicts_mempool = Mem_AllocPool("server edicts", 0, NULL);
+}
+
+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));
}
/*
{
int i, v;
- if (sv.datagram.cursize > MAX_DATAGRAM-16)
+ if (sv.datagram.cursize > MAX_PACKETFRAGMENT-18)
return;
MSG_WriteByte (&sv.datagram, svc_particle);
- MSG_WriteDPCoord (&sv.datagram, org[0]);
- MSG_WriteDPCoord (&sv.datagram, org[1]);
- MSG_WriteDPCoord (&sv.datagram, org[2]);
+ MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
+ MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
+ MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
for (i=0 ; i<3 ; i++)
{
v = dir[i]*16;
*/
void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate)
{
- if (sv.datagram.cursize > MAX_DATAGRAM-18)
- return;
if (modelindex >= 256 || startframe >= 256)
{
+ if (sv.datagram.cursize > MAX_PACKETFRAGMENT-19)
+ return;
MSG_WriteByte (&sv.datagram, svc_effect2);
- MSG_WriteDPCoord (&sv.datagram, org[0]);
- MSG_WriteDPCoord (&sv.datagram, org[1]);
- MSG_WriteDPCoord (&sv.datagram, org[2]);
+ MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
+ MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
+ MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
MSG_WriteShort (&sv.datagram, modelindex);
MSG_WriteShort (&sv.datagram, startframe);
MSG_WriteByte (&sv.datagram, framecount);
}
else
{
+ if (sv.datagram.cursize > MAX_PACKETFRAGMENT-17)
+ return;
MSG_WriteByte (&sv.datagram, svc_effect);
- MSG_WriteDPCoord (&sv.datagram, org[0]);
- MSG_WriteDPCoord (&sv.datagram, org[1]);
- MSG_WriteDPCoord (&sv.datagram, org[2]);
+ MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
+ MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
+ MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
MSG_WriteByte (&sv.datagram, modelindex);
MSG_WriteByte (&sv.datagram, startframe);
MSG_WriteByte (&sv.datagram, framecount);
==================
*/
-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);
if (channel < 0 || channel > 7)
Host_Error ("SV_StartSound: channel = %i", channel);
- if (sv.datagram.cursize > MAX_DATAGRAM-16)
+ if (sv.datagram.cursize > MAX_PACKETFRAGMENT-21)
return;
// find precache number for sound
- for (sound_num=1 ; sound_num<MAX_SOUNDS
- && sv.sound_precache[sound_num] ; sound_num++)
- if (!strcmp(sample, sv.sound_precache[sound_num]))
- break;
+ for (sound_num=1 ; sound_num<MAX_SOUNDS && sv.sound_precache[sound_num] ; sound_num++)
+ if (!strcmp(sample, sv.sound_precache[sound_num]))
+ break;
- if ( sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num] )
- {
- Con_Printf ("SV_StartSound: %s not precached\n", sample);
- return;
- }
+ if ( sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num] )
+ {
+ Con_Printf("SV_StartSound: %s not precached\n", sample);
+ return;
+ }
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_WriteCoord (&sv.datagram, entity->v->origin[i]+0.5*(entity->v->mins[i]+entity->v->maxs[i]), sv.protocol);
}
/*
void SV_SendServerinfo (client_t *client)
{
char **s;
- char message[2048];
+ char message[128];
+
+ // edicts get reallocated on level changes, so we need to update it here
+ client->edict = EDICT_NUM(client->number + 1);
+
// LordHavoc: clear entityframe tracking
- client->entityframenumber = 0;
- EntityFrame_ClearDatabase(&client->entitydatabase);
+
+ if (client->entitydatabase)
+ EntityFrame_FreeDatabase(client->entitydatabase);
+ if (client->entitydatabase4)
+ EntityFrame4_FreeDatabase(client->entitydatabase4);
+ if (client->entitydatabase5)
+ EntityFrame5_FreeDatabase(client->entitydatabase5);
+
+ if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)
+ client->entitydatabase = EntityFrame_AllocDatabase(sv_clients_mempool);
+ if (sv.protocol == PROTOCOL_DARKPLACES4)
+ client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool);
+ if (sv.protocol == PROTOCOL_DARKPLACES5)
+ client->entitydatabase5 = EntityFrame5_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_VERSION3);
+ MSG_WriteLong (&client->message, sv.protocol);
MSG_WriteByte (&client->message, svs.maxclients);
if (!coop.integer && deathmatch.integer)
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->active = true;
client->netconnection = netconnection;
- strcpy (client->name, "unconnected");
- client->active = true;
+ Con_DPrintf("Client %s connected\n", client->netconnection->address);
+
+ strcpy(client->name, "unconnected");
+ strcpy(client->old_name, "unconnected");
+ client->number = clientnum;
client->spawned = false;
- client->edict = ent;
+ client->edict = EDICT_NUM(clientnum+1);
client->message.data = client->msgbuf;
client->message.maxsize = sizeof(client->msgbuf);
client->message.allowoverflow = true; // we can catch it
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];
}
-#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++;
- }
}
-
/*
===============================================================================
=============================================================================
*/
-int fatbytes;
-qbyte fatpvs[MAX_MAP_LEAFS/8];
-
-void SV_AddToFatPVS (vec3_t org, mnode_t *node)
-{
- int i;
- qbyte *pvs;
- mplane_t *plane;
- float d;
-
- while (1)
- {
- // if this is a leaf, accumulate the pvs bits
- if (node->contents < 0)
- {
- if (node->contents != CONTENTS_SOLID)
- {
- pvs = Mod_LeafPVS ( (mleaf_t *)node, sv.worldmodel);
- for (i=0 ; i<fatbytes ; i++)
- fatpvs[i] |= pvs[i];
- }
- return;
- }
-
- plane = node->plane;
- d = DotProduct (org, plane->normal) - plane->dist;
- if (d > 8)
- node = node->children[0];
- else if (d < -8)
- node = node->children[1];
- else
- { // go down both
- SV_AddToFatPVS (org, node->children[0]);
- node = node->children[1];
- }
- }
-}
-
-/*
-=============
-SV_FatPVS
-
-Calculates a PVS that is the inclusive or of all leafs within 8 pixels of the
-given point.
-=============
-*/
-qbyte *SV_FatPVS (vec3_t org)
-{
- fatbytes = (sv.worldmodel->numleafs+31)>>3;
- memset (fatpvs, 0, fatbytes);
- SV_AddToFatPVS (org, sv.worldmodel->nodes);
- return fatpvs;
-}
-
-//=============================================================================
-
-
-int SV_BoxTouchingPVS (qbyte *pvs, vec3_t mins, vec3_t maxs, mnode_t *node)
-{
- int leafnum;
-loc0:
- if (node->contents < 0)
- {
- // leaf
- if (node->contents == CONTENTS_SOLID)
- return false;
- leafnum = (mleaf_t *)node - sv.worldmodel->leafs - 1;
- return pvs[leafnum >> 3] & (1 << (leafnum & 7));
- }
-
- // node - recurse down the BSP tree
- switch (BoxOnPlaneSide(mins, maxs, node->plane))
- {
- case 1: // front
- node = node->children[0];
- goto loc0;
- case 2: // back
- node = node->children[1];
- goto loc0;
- default: // crossing
- if (node->children[0]->contents != CONTENTS_SOLID)
- if (SV_BoxTouchingPVS (pvs, mins, maxs, node->children[0]))
- return true;
- node = node->children[1];
- goto loc0;
- }
- // never reached
- return false;
-}
-
+int sv_writeentitiestoclient_pvsbytes;
+qbyte sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
/*
=============
=============
*/
-#ifdef QUAKEENTITIES
-void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
+/*
+void SV_WriteEntitiesToClient_QUAKE (client_t *client, edict_t *clent, sizebuf_t *msg)
{
- int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects;
- int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
+ int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize;
+ int culled_pvs, culled_trace, visibleentities, totalentities;
qbyte *pvs;
vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
float nextfullupdate, alphaf;
edict_t *ent;
eval_t *val;
entity_state_t *baseline; // LordHavoc: delta or startup baseline
- trace_t trace;
model_t *model;
Mod_CheckLoaded(sv.worldmodel);
// find the client's PVS
- VectorAdd (clent->v.origin, clent->v.view_ofs, testeye);
- pvs = SV_FatPVS (testeye);
+ VectorAdd (clent->v->origin, clent->v->view_ofs, testeye);
+ fatbytes = 0;
+ if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
+ fatbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, testeye, 8, sv_writeentitiestoclient_pvs, sizeof(sv_writeentitiestoclient_pvs));
culled_pvs = 0;
- culled_portal = 0;
culled_trace = 0;
visibleentities = 0;
totalentities = 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)
- {
- 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->angles, angles);
+ VectorCopy(ent->v->origin, origin);
// ent has survived every check so far, check if it is visible
if (ent != clent && ((bits & U_VIEWMODEL) == 0))
// 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);
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 && fatbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, entmins, entmaxs))
{
culled_pvs++;
continue;
}
- // or not visible through the portals
- if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs))
- {
- culled_portal++;
- continue;
- }
-
// don't try to cull embedded brush models with this, they're sometimes huge (spanning several rooms)
- if (sv_cullentities_trace.integer && (model == NULL || model->type != mod_brush || 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]);
- Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
-
+ 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]);
- Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
-
+ 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])
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 (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++)
{
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_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_ANGLE2) MSG_WriteAngle(msg, angles[1]);
- if (bits & U_ORIGIN3) MSG_WriteDPCoord (msg, origin[2]);
- if (bits & U_ANGLE3) MSG_WriteAngle(msg, angles[2]);
+ 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_WriteCoord13i(msg, origin[0]);
+ if (bits & U_ANGLE1) MSG_WriteAngle8i(msg, angles[0]);
+ if (bits & U_ORIGIN2) MSG_WriteCoord13i(msg, origin[1]);
+ if (bits & U_ANGLE2) MSG_WriteAngle8i(msg, angles[1]);
+ if (bits & U_ORIGIN3) MSG_WriteCoord13i(msg, origin[2]);
+ if (bits & U_ANGLE3) MSG_WriteAngle8i(msg, angles[2]);
// LordHavoc: new stuff
if (bits & U_ALPHA) MSG_WriteByte(msg, alpha);
if (bits & U_SCALE) MSG_WriteByte(msg, scale);
- if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v.effects >> 8);
+ if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v->effects >> 8);
if (bits & U_GLOWSIZE) MSG_WriteByte(msg, glowsize);
if (bits & U_GLOWCOLOR) MSG_WriteByte(msg, glowcolor);
- if (bits & U_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);
+ Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, totalentities, visibleentities, culled_pvs + culled_trace, culled_pvs, culled_trace);
}
-#else
-void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
-{
- int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects;
- int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
- float alphaf;
- qbyte *pvs;
- vec3_t origin, angles, entmins, entmaxs, 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);
- 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;
- if (e >= 128)
- e -= 256;
- testorigin[2] -= (float) e;
- EntityFrame_Clear(&entityframe, testorigin);
+static int numsendentities;
+static entity_state_t sendentities[MAX_EDICTS];
+static entity_state_t *sendentitiesindex[MAX_EDICTS];
- culled_pvs = 0;
- culled_portal = 0;
- culled_trace = 0;
- visibleentities = 0;
- totalentities = 0;
-
- clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
+void SV_PrepareEntitiesForSending(void)
+{
+ int e, i;
+ float f;
+ edict_t *ent;
+ entity_state_t cs;
// send all entities that touch the pvs
- ent = NEXT_EDICT(sv.edicts);
- for (e = 1;e < sv.num_edicts;e++, ent = NEXT_EDICT(ent))
+ numsendentities = 0;
+ sendentitiesindex[0] = NULL;
+ for (e = 1, ent = NEXT_EDICT(sv.edicts);e < sv.num_edicts;e++, ent = NEXT_EDICT(ent))
{
- flags = 0;
+ sendentitiesindex[e] = NULL;
+ if (ent->e->free)
+ continue;
- if (ent != clent) // LordHavoc: always send player
+ cs = defaultstate;
+ cs.active = true;
+ cs.number = e;
+ VectorCopy(ent->v->origin, cs.origin);
+ VectorCopy(ent->v->angles, cs.angles);
+ cs.flags = 0;
+ cs.effects = (int)ent->v->effects;
+ cs.colormap = (qbyte)ent->v->colormap;
+ cs.skin = (qbyte)ent->v->skin;
+ cs.frame = (qbyte)ent->v->frame;
+ cs.viewmodelforclient = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)->edict;
+ cs.exteriormodelforclient = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)->edict;
+ cs.nodrawtoclient = GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)->edict;
+ cs.drawonlytoclient = GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)->edict;
+ cs.tagentity = GETEDICTFIELDVALUE(ent, eval_tag_entity)->edict;
+ cs.tagindex = (qbyte)GETEDICTFIELDVALUE(ent, eval_tag_index)->_float;
+ i = (int)(GETEDICTFIELDVALUE(ent, eval_glow_size)->_float * 0.25f);
+ cs.glowsize = (qbyte)bound(0, i, 255);
+ if (GETEDICTFIELDVALUE(ent, eval_glow_trail)->_float)
+ cs.flags |= RENDER_GLOWTRAIL;
+
+ cs.modelindex = 0;
+ i = (int)ent->v->modelindex;
+ if (i >= 1 && i < MAX_MODELS && *PR_GetString(ent->v->model))
+ cs.modelindex = i;
+
+ cs.alpha = 255;
+ f = (GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f);
+ if (f)
{
- if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict)
- {
- if (val->edict == clentnum)
- flags |= RENDER_VIEWMODEL; // show relative to the view
- else
- {
- // don't show to anyone else
- continue;
- }
- }
- else
- {
- // LordHavoc: never draw something told not to display to this client
- if ((val = GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)) && val->edict == clentnum)
- continue;
- if ((val = GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)) && val->edict && val->edict != clentnum)
- continue;
- }
+ i = (int)f;
+ cs.alpha = (qbyte)bound(0, i, 255);
}
-
- glowsize = 0;
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size)))
- glowsize = (int) val->_float >> 2;
- glowsize = bound(0, glowsize, 255);
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail)))
- if (val->_float != 0)
- flags |= RENDER_GLOWTRAIL;
-
- if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model])
+ // halflife
+ f = (GETEDICTFIELDVALUE(ent, eval_renderamt)->_float);
+ if (f)
{
- model = sv.models[(int)ent->v.modelindex];
- Mod_CheckLoaded(model);
+ i = (int)f;
+ cs.alpha = (qbyte)bound(0, i, 255);
}
- else
+
+ cs.scale = 16;
+ f = (GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
+ if (f)
{
- model = NULL;
- if (ent != clent) // LordHavoc: always send player
- if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
- continue;
+ i = (int)f;
+ cs.scale = (qbyte)bound(0, i, 255);
}
- VectorCopy(ent->v.angles, angles);
- if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f && host_client->latency >= 0.01f)
+ cs.glowcolor = 254;
+ f = (GETEDICTFIELDVALUE(ent, eval_glow_color)->_float);
+ if (f)
+ cs.glowcolor = (int)f;
+
+ if (GETEDICTFIELDVALUE(ent, eval_fullbright)->_float)
+ cs.effects |= EF_FULLBRIGHT;
+
+ if (ent->v->movetype == MOVETYPE_STEP)
+ cs.flags |= RENDER_STEP;
+ if ((cs.effects & EF_LOWPRECISION) && cs.origin[0] >= -32768 && cs.origin[1] >= -32768 && cs.origin[2] >= -32768 && cs.origin[0] <= 32767 && cs.origin[1] <= 32767 && cs.origin[2] <= 32767)
+ cs.flags |= RENDER_LOWPRECISION;
+ if (ent->v->colormap >= 1024)
+ cs.flags |= RENDER_COLORMAPPED;
+ if (cs.viewmodelforclient)
+ cs.flags |= RENDER_VIEWMODEL; // show relative to the view
+
+ 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)
{
- 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);
+ // 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;
+ }
}
- else
+
+ 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)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100);
+ if (cs.effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
{
- VectorCopy(ent->v.origin, origin);
+ if (cs.effects & EF_BRIGHTFIELD)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 80);
+ if (cs.effects & EF_MUZZLEFLASH)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100);
+ if (cs.effects & EF_BRIGHTLIGHT)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 400);
+ if (cs.effects & EF_DIMLIGHT)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200);
+ if (cs.effects & EF_RED)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200);
+ if (cs.effects & EF_BLUE)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200);
+ if (cs.effects & EF_FLAME)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 250);
+ if (cs.effects & EF_STARDUST)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100);
}
- // ent has survived every check so far, check if it is visible
- // always send embedded brush models, they don't generate much traffic
- if (ent != clent && ((flags & RENDER_VIEWMODEL) == 0) && (model == NULL || model->type != mod_brush || model->name[0] != '*'))
+ if (numsendentities >= MAX_EDICTS)
+ continue;
+ // we can omit invisible entities with no effects that are not clients
+ // LordHavoc: this could kill tags attached to an invisible entity, I
+ // just hope we never have to support that case
+ if (cs.number > svs.maxclients && ((cs.effects & EF_NODRAW) || (!cs.modelindex && !cs.specialvisibilityradius)))
+ continue;
+ sendentitiesindex[e] = sendentities + numsendentities;
+ sendentities[numsendentities++] = cs;
+ }
+}
+
+static int sententitiesmark = 0;
+static int sententities[MAX_EDICTS];
+static int sententitiesconsideration[MAX_EDICTS];
+static int sv_writeentitiestoclient_culled_pvs;
+static int sv_writeentitiestoclient_culled_trace;
+static int sv_writeentitiestoclient_visibleentities;
+static int sv_writeentitiestoclient_totalentities;
+//static entity_frame_t sv_writeentitiestoclient_entityframe;
+static int sv_writeentitiestoclient_clentnum;
+static vec3_t sv_writeentitiestoclient_testeye;
+static client_t *sv_writeentitiestoclient_client;
+
+void SV_MarkWriteEntityStateToClient(entity_state_t *s)
+{
+ int isbmodel;
+ vec3_t entmins, entmaxs, lightmins, lightmaxs, testorigin;
+ model_t *model;
+ trace_t trace;
+ if (sententitiesconsideration[s->number] == sententitiesmark)
+ return;
+ sententitiesconsideration[s->number] = sententitiesmark;
+ // viewmodels don't have visibility checking
+ if (s->viewmodelforclient)
+ {
+ if (s->viewmodelforclient != sv_writeentitiestoclient_clentnum)
+ return;
+ }
+ // never reject player
+ else if (s->number != sv_writeentitiestoclient_clentnum)
+ {
+ // check various rejection conditions
+ if (s->nodrawtoclient == sv_writeentitiestoclient_clentnum)
+ return;
+ if (s->drawonlytoclient && s->drawonlytoclient != sv_writeentitiestoclient_clentnum)
+ return;
+ if (s->effects & EF_NODRAW)
+ return;
+ // LordHavoc: only send entities with a model or important effects
+ if (!s->modelindex && s->specialvisibilityradius == 0)
+ return;
+ isbmodel = (model = sv.models[s->modelindex]) == NULL || model->name[0] != '*';
+ if (s->tagentity)
{
- // use the predicted origin
- entmins[0] = origin[0] - 1.0f;
- entmins[1] = origin[1] - 1.0f;
- entmins[2] = origin[2] - 1.0f;
- entmaxs[0] = origin[0] + 1.0f;
- entmaxs[1] = origin[1] + 1.0f;
- entmaxs[2] = origin[2] + 1.0f;
+ // tag attached entities simply check their parent
+ if (!sendentitiesindex[s->tagentity])
+ return;
+ SV_MarkWriteEntityStateToClient(sendentitiesindex[s->tagentity]);
+ if (sententities[s->tagentity] != sententitiesmark)
+ return;
+ }
+ // always send world submodels, they don't generate much traffic
+ else if (!isbmodel || sv.protocol == PROTOCOL_QUAKE)
+ {
+ Mod_CheckLoaded(model);
+ // entity has survived every check so far, check if visible
+ // enlarged box to account for prediction (not that there is
+ // any currently, but still helps the 'run into a room and
+ // watch items pop up' problem)
+ entmins[0] = s->origin[0] - 32.0f;
+ entmins[1] = s->origin[1] - 32.0f;
+ entmins[2] = s->origin[2] - 32.0f;
+ entmaxs[0] = s->origin[0] + 32.0f;
+ entmaxs[1] = s->origin[1] + 32.0f;
+ entmaxs[2] = s->origin[2] + 32.0f;
// using the model's bounding box to ensure things are visible regardless of their physics box
if (model)
{
- if (ent->v.angles[0] || ent->v.angles[2]) // pitch and roll
+ if (s->angles[0] || s->angles[2]) // pitch and roll
{
VectorAdd(entmins, model->rotatedmins, entmins);
VectorAdd(entmaxs, model->rotatedmaxs, entmaxs);
}
- else if (ent->v.angles[1])
+ else if (s->angles[1])
{
VectorAdd(entmins, model->yawmins, entmins);
VectorAdd(entmaxs, model->yawmaxs, entmaxs);
VectorAdd(entmaxs, model->normalmaxs, entmaxs);
}
}
-
- totalentities++;
-
+ lightmins[0] = min(entmins[0], s->origin[0] - s->specialvisibilityradius);
+ lightmins[1] = min(entmins[1], s->origin[1] - s->specialvisibilityradius);
+ lightmins[2] = min(entmins[2], s->origin[2] - s->specialvisibilityradius);
+ lightmaxs[0] = max(entmaxs[0], s->origin[0] + s->specialvisibilityradius);
+ lightmaxs[1] = max(entmaxs[1], s->origin[1] + s->specialvisibilityradius);
+ lightmaxs[2] = max(entmaxs[2], s->origin[2] + s->specialvisibilityradius);
+ sv_writeentitiestoclient_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_writeentitiestoclient_pvsbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, lightmins, lightmaxs))
{
- culled_pvs++;
- continue;
+ sv_writeentitiestoclient_culled_pvs++;
+ return;
}
-
- // or not visible through the portals
- if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs))
- {
- culled_portal++;
- continue;
- }
-
- if (sv_cullentities_trace.integer)
+ // or not seen by random tracelines
+ if (sv_cullentities_trace.integer && !isbmodel)
{
- // 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;
+ // LordHavoc: test center first
+ testorigin[0] = (entmins[0] + entmaxs[0]) * 0.5f;
+ testorigin[1] = (entmins[1] + entmaxs[1]) * 0.5f;
+ testorigin[2] = (entmins[2] + entmaxs[2]) * 0.5f;
+ sv.worldmodel->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
{
- 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]);
+ 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
{
- culled_trace++;
- continue;
+ if (s->specialvisibilityradius)
+ {
+ // LordHavoc: test random offsets, to maximize chance of detection
+ testorigin[0] = lhrandom(lightmins[0], lightmaxs[0]);
+ testorigin[1] = lhrandom(lightmins[1], lightmaxs[1]);
+ testorigin[2] = lhrandom(lightmins[2], lightmaxs[2]);
+ sv.worldmodel->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;
+ }
}
}
+ if (realtime > sv_writeentitiestoclient_client->visibletime[s->number])
+ {
+ sv_writeentitiestoclient_culled_trace++;
+ return;
+ }
}
- visibleentities++;
+ sv_writeentitiestoclient_visibleentities++;
}
+ }
+ // this just marks it for sending
+ // FIXME: it would be more efficient to send here, but the entity
+ // compressor isn't that flexible
+ sententities[s->number] = sententitiesmark;
+}
- alphaf = 255.0f;
- scale = 16;
- glowcolor = 254;
- effects = ent->v.effects;
+entity_state_t sendstates[MAX_EDICTS];
- if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
- if (val->_float != 0)
- alphaf = val->_float * 255.0;
+/*
+// entityframe4 protocol
+void SV_WriteEntitiesToClient_EF4(client_t *client, edict_t *clent, sizebuf_t *msg)
+{
+ int i;
+ vec3_t testorigin;
+ entity_state_t *s;
+ entityframe4_database_t *d;
+ 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;
- // HalfLife support
- if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)))
- if (val->_float != 0)
- alphaf = val->_float;
+ // prepare the buffer
+ memset(&buf, 0, sizeof(buf));
+ buf.data = data;
+ buf.maxsize = sizeof(data);
- if (alphaf == 0.0f)
- alphaf = 255.0f;
- alpha = bound(0, alphaf, 255);
+ d = client->entitydatabase4;
- if ((val = GETEDICTFIELDVALUE(ent, eval_scale)))
- if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16;
- if (scale < 0) scale = 0;
- if (scale > 255) scale = 255;
+ 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;
- if ((val = GETEDICTFIELDVALUE(ent, eval_glow_color)))
- if (val->_float != 0)
- glowcolor = (int) val->_float;
+ // this state's number gets played around with later
+ inactiveentitystate = defaultstate;
- if ((val = GETEDICTFIELDVALUE(ent, eval_fullbright)))
- if (val->_float != 0)
- effects |= EF_FULLBRIGHT;
+ sv_writeentitiestoclient_client = client;
- if (ent != clent)
+ sv_writeentitiestoclient_culled_pvs = 0;
+ sv_writeentitiestoclient_culled_trace = 0;
+ sv_writeentitiestoclient_visibleentities = 0;
+ sv_writeentitiestoclient_totalentities = 0;
+
+ Mod_CheckLoaded(sv.worldmodel);
+
+// find the client's PVS
+ // the real place being tested from
+ VectorAdd(clent->v->origin, clent->v->view_ofs, sv_writeentitiestoclient_testeye);
+ sv_writeentitiestoclient_pvsbytes = 0;
+ if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
+ sv_writeentitiestoclient_pvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, sv_writeentitiestoclient_testeye, 8, sv_writeentitiestoclient_pvs, sizeof(sv_writeentitiestoclient_pvs));
+
+ sv_writeentitiestoclient_clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
+
+ sententitiesmark++;
+
+ // the place being reported (to consider the fact the client still
+ // applies the view_ofs[2], so we have to only send the fractional part
+ // of view_ofs[2], undoing what the client will redo)
+ VectorCopy(sv_writeentitiestoclient_testeye, testorigin);
+ i = (int) clent->v->view_ofs[2] & 255;
+ if (i >= 128)
+ i -= 256;
+ testorigin[2] -= (float) i;
+
+ for (i = 0;i < numsendentities;i++)
+ SV_MarkWriteEntityStateToClient(sendentities + i);
+
+ d->currentcommit->numentities = 0;
+ d->currentcommit->framenum = ++d->latestframenumber;
+ 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 num:%i ref:%i (database: ref:%i commits:", d->currentcommit->framenum, d->referenceframenum, 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
+ startnumber = bound(1, d->currententitynumber, sv.max_edicts - 1);
+ MSG_WriteShort(msg, startnumber);
+ // reset currententitynumber so if the loop does not break it we will
+ // start at beginning next frame (if it does break, it will set it)
+ d->currententitynumber = 1;
+ for (i = 0, n = startnumber;n < sv.max_edicts;n++)
+ {
+ // find the old state to delta from
+ e = EntityFrame4_GetReferenceEntity(d, n);
+ // prepare the buffer
+ SZ_Clear(&buf);
+ // make the message
+ if (sententities[n] == sententitiesmark)
{
- if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+ // entity exists, build an update (if empty there is no change)
+ // find the state in the list
+ for (;i < numsendentities && sendentities[i].number < n;i++);
+ s = sendentities + i;
+ if (s->number != n)
+ Sys_Error("SV_WriteEntitiesToClient: s->number != n\n");
+ // build the update
+ if (s->exteriormodelforclient && s->exteriormodelforclient == sv_writeentitiestoclient_clentnum)
{
- if (model) // model
- {
- // don't send if flagged for NODRAW and there are no effects
- if (model->flags == 0 && ((effects & EF_NODRAW) || scale <= 0 || alpha <= 0))
- continue;
- }
- else // no model and no effects
- continue;
+ s->flags |= RENDER_EXTERIORMODEL;
+ EntityState_WriteUpdate(s, &buf, e);
+ s->flags &= ~RENDER_EXTERIORMODEL;
+ }
+ else
+ EntityState_WriteUpdate(s, &buf, e);
+ }
+ else
+ {
+ s = &inactiveentitystate;
+ s->number = n;
+ if (e->active)
+ {
+ // entity used to exist but doesn't anymore, send remove
+ MSG_WriteShort(&buf, n | 0x8000);
}
}
+ // if the commit is full, we're done this frame
+ if (msg->cursize + buf.cursize > msg->maxsize - 4)
+ {
+ // next frame we will continue where we left off
+ break;
+ }
+ // add the entity to the commit
+ EntityFrame4_AddCommitEntity(d, s);
+ // if the message is empty, skip out now
+ if (buf.cursize)
+ {
+ // write the message to the packet
+ SZ_Write(msg, buf.data, buf.cursize);
+ }
+ }
+ d->currententitynumber = n;
- if ((val = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)) && val->edict == clentnum)
- flags |= RENDER_EXTERIORMODEL;
+ // remove world message (invalid, and thus a good terminator)
+ MSG_WriteShort(msg, 0x8000);
+ // write the number of the end entity
+ MSG_WriteShort(msg, d->currententitynumber);
+ // just to be sure
+ d->currentcommit = NULL;
- if (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;
+ if (sv_cullentities_stats.integer)
+ Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, sv_writeentitiestoclient_totalentities, sv_writeentitiestoclient_visibleentities, sv_writeentitiestoclient_culled_pvs + sv_writeentitiestoclient_culled_trace, sv_writeentitiestoclient_culled_pvs, sv_writeentitiestoclient_culled_trace);
+}
+*/
- s = EntityFrame_NewEntity(&entityframe, e);
- // if we run out of space, abort
- if (!s)
- break;
- VectorCopy(origin, s->origin);
- VectorCopy(angles, s->angles);
- if (ent->v.colormap >= 1024)
- flags |= RENDER_COLORMAPPED;
- s->colormap = ent->v.colormap;
- s->skin = ent->v.skin;
- s->frame = ent->v.frame;
- s->modelindex = ent->v.modelindex;
- s->effects = effects;
- s->alpha = alpha;
- s->scale = scale;
- s->glowsize = glowsize;
- s->glowcolor = glowcolor;
- s->flags = flags;
+void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
+{
+ int i, numsendstates;
+ entity_state_t *s;
+
+ // if there isn't enough space to accomplish anything, skip it
+ if (msg->cursize + 25 > msg->maxsize)
+ return;
+
+ sv_writeentitiestoclient_client = client;
+
+ sv_writeentitiestoclient_culled_pvs = 0;
+ sv_writeentitiestoclient_culled_trace = 0;
+ sv_writeentitiestoclient_visibleentities = 0;
+ sv_writeentitiestoclient_totalentities = 0;
+
+ Mod_CheckLoaded(sv.worldmodel);
+
+// find the client's PVS
+ // the real place being tested from
+ VectorAdd(clent->v->origin, clent->v->view_ofs, sv_writeentitiestoclient_testeye);
+ sv_writeentitiestoclient_pvsbytes = 0;
+ if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
+ sv_writeentitiestoclient_pvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, sv_writeentitiestoclient_testeye, 8, sv_writeentitiestoclient_pvs, sizeof(sv_writeentitiestoclient_pvs));
+
+ sv_writeentitiestoclient_clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
+
+ sententitiesmark++;
+
+ for (i = 0;i < numsendentities;i++)
+ SV_MarkWriteEntityStateToClient(sendentities + i);
+
+ numsendstates = 0;
+ for (i = 0;i < numsendentities;i++)
+ {
+ if (sententities[sendentities[i].number] == sententitiesmark)
+ {
+ s = &sendstates[numsendstates++];
+ *s = sendentities[i];
+ if (s->exteriormodelforclient && s->exteriormodelforclient == sv_writeentitiestoclient_clentnum)
+ s->flags |= RENDER_EXTERIORMODEL;
+ }
}
- entityframe.framenum = ++client->entityframenumber;
- EntityFrame_Write(&client->entitydatabase, &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);
+ Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, sv_writeentitiestoclient_totalentities, sv_writeentitiestoclient_visibleentities, sv_writeentitiestoclient_culled_pvs + sv_writeentitiestoclient_culled_trace, sv_writeentitiestoclient_culled_pvs, sv_writeentitiestoclient_culled_trace);
+
+ if (client->entitydatabase5)
+ EntityFrame5_WriteFrame(msg, client->entitydatabase5, numsendstates, sendstates, client - svs.clients + 1);
+ else if (client->entitydatabase4)
+ EntityFrame4_WriteFrame(msg, client->entitydatabase4, numsendstates, sendstates);
+ else if (client->entitydatabase)
+ EntityFrame_WriteFrame(msg, client->entitydatabase, numsendstates, sendstates, client - svs.clients + 1);
+ else
+ EntityFrameQuake_WriteFrame(msg, numsendstates, sendstates);
}
-#endif
/*
=============
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_WriteCoord (msg, other->v->origin[i] + 0.5*(other->v->mins[i] + other->v->maxs[i]), sv.protocol);
- 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;
+ {
+ if (sv.protocol == PROTOCOL_DARKPLACES5)
+ MSG_WriteAngle16i (msg, ent->v->angles[i] );
+ else
+ MSG_WriteAngle8i (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
+ // PROTOCOL_DARKPLACES
VectorClear(punchvector);
if ((val = GETEDICTFIELDVALUE(ent, eval_punchvector)))
VectorCopy(val->vector, punchvector);
if (i == 0)
i = 255;
else
- i = bound(0, i, 255);
+ i = bound(0, i, 65535);
}
viewzoom = i;
- if (viewzoom != 255)
- bits |= SU_VIEWZOOM;
+ // FIXME: which protocols support this? does PROTOCOL_DARKPLACES3 support viewzoom?
+ if (sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+ if (viewzoom != 255)
+ bits |= SU_VIEWZOOM;
for (i=0 ; i<3 ; i++)
{
- if (ent->v.punchangle[i])
+ if (ent->v->punchangle[i])
bits |= (SU_PUNCH1<<i);
- if (punchvector[i]) // dpprotocol
- bits |= (SU_PUNCHVEC1<<i); // dpprotocol
- if (ent->v.velocity[i])
+ if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+ if (punchvector[i])
+ bits |= (SU_PUNCHVEC1<<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
- if (bits & (SU_PUNCHVEC1<<i)) // dpprotocol
- MSG_WriteDPCoord(msg, punchvector[i]); // dpprotocol
+ {
+ if (sv.protocol == PROTOCOL_QUAKE)
+ MSG_WriteChar(msg, ent->v->punchangle[i]);
+ else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+ MSG_WriteAngle16i(msg, ent->v->punchangle[i]);
+ }
+ if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+ {
+ if (bits & (SU_PUNCHVEC1<<i))
+ {
+ if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
+ MSG_WriteCoord16i(msg, punchvector[i]);
+ else if (sv.protocol == PROTOCOL_DARKPLACES5)
+ MSG_WriteCoord32f(msg, punchvector[i]);
+ }
+ }
if (bits & (SU_VELOCITY1<<i))
- MSG_WriteChar (msg, ent->v.velocity[i]/16);
+ {
+ if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
+ MSG_WriteChar(msg, ent->v->velocity[i] * (1.0f / 16.0f));
+ else if (sv.protocol == PROTOCOL_DARKPLACES5)
+ MSG_WriteCoord32f(msg, ent->v->velocity[i]);
+ }
}
// [always sent] if (bits & SU_ITEMS)
MSG_WriteLong (msg, items);
- if (bits & SU_WEAPONFRAME)
- MSG_WriteByte (msg, ent->v.weaponframe);
- 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_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)
+ if (sv.protocol == PROTOCOL_DARKPLACES5)
{
- for(i=0;i<32;i++)
+ if (bits & SU_WEAPONFRAME)
+ MSG_WriteShort (msg, ent->v->weaponframe);
+ if (bits & SU_ARMOR)
+ MSG_WriteShort (msg, ent->v->armorvalue);
+ if (bits & SU_WEAPON)
{
- if ( ((int)ent->v.weapon) & (1<<i) )
+ i = SV_ModelIndex(PR_GetString(ent->v->weaponmodel));
+ if (i < 0)
{
- MSG_WriteByte (msg, i);
- break;
+ Con_DPrintf("weaponmodel \"%s\" not precached\n", PR_GetString(ent->v->weaponmodel));
+ i = 0;
}
+ MSG_WriteShort (msg, i);
}
+
+ MSG_WriteShort (msg, ent->v->health);
+ MSG_WriteShort (msg, ent->v->currentammo);
+ MSG_WriteShort (msg, ent->v->ammo_shells);
+ MSG_WriteShort (msg, ent->v->ammo_nails);
+ MSG_WriteShort (msg, ent->v->ammo_rockets);
+ MSG_WriteShort (msg, ent->v->ammo_cells);
+
+ MSG_WriteShort (msg, ent->v->weapon);
+
+ if (bits & SU_VIEWZOOM)
+ MSG_WriteShort (msg, viewzoom);
}
else
{
- MSG_WriteByte (msg, ent->v.weapon);
- }
+ if (bits & SU_WEAPONFRAME)
+ MSG_WriteByte (msg, ent->v->weaponframe);
+ if (bits & SU_ARMOR)
+ MSG_WriteByte (msg, ent->v->armorvalue);
+ if (bits & SU_WEAPON)
+ {
+ i = SV_ModelIndex(PR_GetString(ent->v->weaponmodel));
+ if (i < 0)
+ {
+ Con_DPrintf("weaponmodel \"%s\" not precached\n", PR_GetString(ent->v->weaponmodel));
+ i = 0;
+ }
+ MSG_WriteByte (msg, i);
+ }
- if (bits & SU_VIEWZOOM)
- MSG_WriteByte (msg, viewzoom);
+ MSG_WriteShort (msg, ent->v->health);
+ MSG_WriteByte (msg, ent->v->currentammo);
+ MSG_WriteByte (msg, ent->v->ammo_shells);
+ MSG_WriteByte (msg, ent->v->ammo_nails);
+ MSG_WriteByte (msg, ent->v->ammo_rockets);
+ MSG_WriteByte (msg, ent->v->ammo_cells);
+
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+ {
+ for(i=0;i<32;i++)
+ {
+ if ( ((int)ent->v->weapon) & (1<<i) )
+ {
+ MSG_WriteByte (msg, i);
+ break;
+ }
+ }
+ }
+ else
+ {
+ MSG_WriteByte (msg, ent->v->weapon);
+ }
+
+ if (bits & SU_VIEWZOOM)
+ {
+ if (sv.protocol == PROTOCOL_DARKPLACES4)
+ {
+ viewzoom = min(viewzoom, 255);
+ MSG_WriteByte (msg, viewzoom);
+ }
+ else if (sv.protocol == PROTOCOL_DARKPLACES5)
+ MSG_WriteShort (msg, viewzoom);
+ }
+ }
}
/*
SV_SendClientDatagram
=======================
*/
+static qbyte sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
qboolean SV_SendClientDatagram (client_t *client)
{
- qbyte buf[MAX_DATAGRAM];
- sizebuf_t msg;
+ int rate, maxrate, maxsize, maxsize2;
+ sizebuf_t msg;
- msg.data = buf;
- msg.maxsize = sizeof(buf);
+ if (LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) == LHNETADDRESSTYPE_LOOP && !sv_ratelimitlocalplayer.integer)
+ {
+ // for good singleplayer, send huge packets
+ maxsize = sizeof(sv_sendclientdatagram_buf);
+ maxsize2 = sizeof(sv_sendclientdatagram_buf);
+ }
+ else if (sv.protocol == PROTOCOL_DARKPLACES5)
+ {
+ // PROTOCOL_DARKPLACES5 supports packet size limiting of updates
+ maxrate = bound(NET_MINRATE, sv_maxrate.integer, NET_MAXRATE);
+ if (sv_maxrate.integer != maxrate)
+ Cvar_SetValueQuick(&sv_maxrate, maxrate);
+
+ rate = bound(NET_MINRATE, client->netconnection->rate, maxrate);
+ rate = (int)(client->netconnection->rate * sys_ticrate.value);
+ maxsize = bound(100, rate, 1400);
+ maxsize2 = 1400;
+ }
+ else
+ {
+ // no rate limiting support on older protocols because dp protocols
+ // 1-4 kick the client off if they overflow, and quake protocol shows
+ // less than the full entity set if rate limited
+ maxsize = 1400;
+ maxsize2 = 1400;
+ }
+
+ msg.data = sv_sendclientdatagram_buf;
+ msg.maxsize = maxsize;
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);
- }
+ // expand packet size to allow effects to go over the rate limit
+ // (dropping them is FAR too ugly)
+ msg.maxsize = maxsize2;
+
+ // copy the server datagram if there is space
+ // FIXME: put in delayed queue of effects to send
+ if (sv.datagram.cursize > 0 && 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++)
+ 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 = EDICT_NUM(i+1);
+ s = PR_GetString(sv_player->v->netname);
+ if (s != host_client->name)
+ {
+ if (s == NULL)
+ s = "";
+ // point the string back at host_client->name to keep it safe
+ strlcpy (host_client->name, s, sizeof (host_client->name));
+ sv_player->v->netname = PR_SetString(host_client->name);
+ }
+ if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)) && host_client->colors != val->_float)
+ host_client->colors = val->_float;
+ host_client->frags = sv_player->v->frags;
+ if (gamemode == GAME_NEHAHRA)
+ if ((val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)) && host_client->pmodel != val->_float)
+ host_client->pmodel = val->_float;
+
+ // if the fields changed, send messages about the changes
+ if (strcmp(host_client->old_name, host_client->name))
+ {
+ strcpy(host_client->old_name, host_client->name);
+ for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
+ {
+ if (!client->spawned || !client->netconnection)
+ continue;
+ MSG_WriteByte (&client->message, svc_updatename);
+ MSG_WriteByte (&client->message, i);
+ MSG_WriteString (&client->message, host_client->name);
+ }
+ }
+ if (host_client->old_colors != host_client->colors)
{
- for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
+ host_client->old_colors = host_client->colors;
+ for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
- if (!client->active || !client->spawned)
+ 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)
+ {
+ host_client->old_frags = host_client->frags;
+ for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
+ {
+ if (!client->spawned || !client->netconnection)
continue;
MSG_WriteByte (&client->message, svc_updatefrags);
MSG_WriteByte (&client->message, i);
- MSG_WriteShort (&client->message, host_client->edict->v.frags);
+ MSG_WriteShort (&client->message, host_client->frags);
}
-
- host_client->old_frags = host_client->edict->v.frags;
}
}
- for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
- {
- if (!client->active)
- continue;
- SZ_Write (&client->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
- }
+ for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
+ if (client->netconnection)
+ SZ_Write (&client->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
SZ_Clear (&sv.reliable_datagram);
}
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;
}
*/
void SV_SendClientMessages (void)
{
- int i;
+ int i, prepared = false;
// update frags, names, etc
- SV_UpdateToReliableMessages ();
+ SV_UpdateToReliableMessages();
// build individual updates
- for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
if (!host_client->active)
continue;
+ if (!host_client->netconnection)
+ {
+ SZ_Clear(&host_client->message);
+ continue;
+ }
-#ifndef NOROUTINGFIX
- if (host_client->sendserverinfo)
+ if (host_client->deadsocket || host_client->message.overflowed)
{
- 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)
{
+ if (!prepared)
+ {
+ prepared = true;
+ // only prepare entities once per frame
+ SV_PrepareEntitiesForSending();
+ }
if (!SV_SendClientDatagram (host_client))
continue;
}
}
}
- // check for an overflowed message. Should only happen
- // on a very fucked up connection that backs up a lot, then
- // changes level
- if (host_client->message.overflowed)
- {
- SV_DropClient (true);
- host_client->message.overflowed = false;
- continue;
- }
-
if (host_client->message.cursize || host_client->dropasap)
{
- if (!NET_CanSendMessage (host_client->netconnection))
+ 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;
}
}
-
// clear muzzle flashes
- SV_CleanupEnts ();
+ SV_CleanupEnts();
}
================
*/
-int SV_ModelIndex (char *name)
+int SV_ModelIndex (const char *name)
{
- int i;
+ int i;
if (!name || !name[0])
return 0;
if (!strcmp(sv.model_precache[i], name))
return i;
if (i==MAX_MODELS || !sv.model_precache[i])
- Host_Error ("SV_ModelIndex: model %s not precached", name);
+ {
+ Con_DPrintf ("SV_ModelIndex: model %s not precached", name);
+ return -1;
+ }
return i;
}
-#ifdef SV_QUAKEENTITIES
/*
================
SV_CreateBaseline
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);
+ svent->e->baseline = defaultstate;
- 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;
+ i = SV_ModelIndex("progs/player.mdl");
+ if (i < 0)
+ i = 0;
+ svent->e->baseline.modelindex = i;
}
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_WriteCoord(&sv.signon, svent->e->baseline.origin[i], sv.protocol);
+ MSG_WriteAngle8i(&sv.signon, svent->e->baseline.angles[i]);
}
}
}
-#endif
/*
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);
}
svs.serverflags = pr_global_struct->serverflags;
- for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
if (!host_client->active)
continue;
}
}
+void SV_IncreaseEdicts(void)
+{
+ int i;
+ edict_t *ent;
+ int oldmax_edicts = sv.max_edicts;
+ void *oldedictsengineprivate = sv.edictsengineprivate;
+ void *oldedictsfields = sv.edictsfields;
+ void *oldmoved_edicts = sv.moved_edicts;
+
+ if (sv.max_edicts >= MAX_EDICTS)
+ return;
+
+ // links don't survive the transition, so unlink everything
+ for (i = 0, ent = sv.edicts;i < sv.max_edicts;i++, ent++)
+ {
+ if (!ent->e->free)
+ SV_UnlinkEdict(sv.edicts + i);
+ memset(&ent->e->areagrid, 0, sizeof(ent->e->areagrid));
+ }
+ SV_ClearWorld();
+
+ sv.max_edicts = min(sv.max_edicts + 256, MAX_EDICTS);
+ sv.edictsengineprivate = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_engineprivate_t));
+ sv.edictsfields = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size);
+ sv.moved_edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *));
+
+ memcpy(sv.edictsengineprivate, oldedictsengineprivate, oldmax_edicts * sizeof(edict_engineprivate_t));
+ memcpy(sv.edictsfields, oldedictsfields, oldmax_edicts * pr_edict_size);
+
+ for (i = 0, ent = sv.edicts;i < sv.max_edicts;i++, ent++)
+ {
+ ent->e = sv.edictsengineprivate + i;
+ ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size);
+ // link every entity except world
+ if (!ent->e->free)
+ SV_LinkEdict(ent, false);
+ }
+
+ Mem_Free(oldedictsengineprivate);
+ Mem_Free(oldedictsfields);
+ Mem_Free(oldmoved_edicts);
+}
+
/*
================
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;
+ model_t *worldmodel;
+ char modelname[sizeof(sv.modelname)];
+
+ Con_DPrintf("SpawnServer: %s\n", server);
+
+ snprintf (modelname, sizeof(modelname), "maps/%s.bsp", server);
+ worldmodel = Mod_ForName(modelname, false, true, true);
+ if (!worldmodel || !worldmodel->TraceBox)
+ {
+ Con_Printf("Couldn't load map %s\n", modelname);
+ return;
+ }
// let's not have any servers with no name
if (hostname.string[0] == 0)
Cvar_Set ("hostname", "UNNAMED");
scr_centertime_off = 0;
- Con_DPrintf ("SpawnServer: %s\n",server);
svs.changelevel_issued = false; // now safe to issue another
//
// tell all connected clients that we are going to a new level
//
if (sv.active)
- SV_SendReconnect ();
+ 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));
+
+ // FIXME: cvar
+ if (!strcasecmp(sv_protocolname.string, "QUAKE"))
+ {
+ sv.protocol = PROTOCOL_QUAKE;
+ sv.netquakecompatible = true;
+ }
+ else if (!strcasecmp(sv_protocolname.string, "QUAKEDP"))
+ {
+ sv.protocol = PROTOCOL_QUAKE;
+ sv.netquakecompatible = false;
+ }
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES1"))
+ {
+ sv.protocol = PROTOCOL_DARKPLACES1;
+ sv.netquakecompatible = false;
+ }
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES2"))
+ {
+ sv.protocol = PROTOCOL_DARKPLACES2;
+ sv.netquakecompatible = false;
+ }
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES3"))
+ {
+ sv.protocol = PROTOCOL_DARKPLACES3;
+ sv.netquakecompatible = false;
+ }
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES4"))
+ {
+ sv.protocol = PROTOCOL_DARKPLACES4;
+ sv.netquakecompatible = false;
+ }
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES5"))
+ {
+ sv.protocol = PROTOCOL_DARKPLACES5;
+ sv.netquakecompatible = false;
+ }
+ else
+ {
+ sv.protocol = PROTOCOL_DARKPLACES5;
+ sv.netquakecompatible = false;
+ Con_Printf("Unknown sv_protocolname \"%s\", valid values are QUAKE, QUAKEDP, DARKPLACES1, DARKPLACES2, DARKPLACES3, DARKPLACES4, DARKPLACES5, falling back to DARKPLACES5 protocol\n", sv_protocolname.string);
+ }
// load progs to get entity field count
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 = max(svs.maxclients + 1, 512);
+ 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;
- }
sv.state = ss_loading;
sv.paused = false;
sv.time = 1.0;
Mod_ClearUsed();
+ worldmodel->used = true;
- strcpy (sv.name, server);
- sprintf (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);
- sv.active = false;
- return;
- }
+ strlcpy (sv.name, server, sizeof (sv.name));
+ strcpy(sv.modelname, modelname);
+ sv.worldmodel = worldmodel;
sv.models[1] = sv.worldmodel;
//
//
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++)
+ for (i = 1;i < sv.worldmodel->brush.numsubmodels;i++)
{
sv.model_precache[i+1] = localmodels[i];
sv.models[i+1] = Mod_ForName (localmodels[i], false, false, false);
// load the rest of the entities
//
ent = EDICT_NUM(0);
- memset (&ent->v, 0, progs->entityfields * 4);
- ent->free = false;
- ent->v.model = sv.worldmodel->name - pr_strings;
- ent->v.modelindex = 1; // world model
- ent->v.solid = SOLID_BSP;
- ent->v.movetype = MOVETYPE_PUSH;
-
- if (coop.integer)
+ memset (ent->v, 0, progs->entityfields * 4);
+ ent->e->free = false;
+ ent->v->model = PR_SetString(sv.modelname);
+ ent->v->modelindex = 1; // world model
+ ent->v->solid = SOLID_BSP;
+ ent->v->movetype = MOVETYPE_PUSH;
+
+ if (coop.value)
pr_global_struct->coop = coop.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), tempmempool, 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);
+ VectorClear(sv.edicts->v->angles);
sv.active = true;
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();
-#ifdef QUAKEENTITIES
// create a baseline for more efficient communications
- SV_CreateBaseline ();
-#endif
+ if (sv.protocol == PROTOCOL_QUAKE)
+ SV_CreateBaseline ();
// send serverinfo to all connected clients
- for (i=0,host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
- if (host_client->active)
- SV_SendServerinfo (host_client);
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+ if (host_client->netconnection)
+ SV_SendServerinfo(host_client);
- Con_DPrintf ("Server spawned.\n");
+ Con_DPrint("Server spawned.\n");
+ NetConn_Heartbeat (2);
}
projects / xonotic / darkplaces.git / blobdiff