#include "quakedef.h"
+// select which protocol to host, by name
+// this is named the same as PROTOCOL_DARKPLACES6 for example, minus the PROTOCOL_ prefix
+cvar_t sv_protocolname = {0, "sv_protocolname", "DARKPLACES6"};
+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"};
+extern cvar_t sys_ticrate;
+
+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"};
+cvar_t sv_gameplayfix_setmodelrealbox = {0, "sv_gameplayfix_setmodelrealbox", "1"};
+
+cvar_t sv_progs = {0, "sv_progs", "progs.dat" };
+
server_t sv;
server_static_t svs;
-static char localmodels[MAX_MODELS][5]; // inline model names for precache
-
mempool_t *sv_edicts_mempool = NULL;
//============================================================================
*/
void SV_Init (void)
{
- int i;
-
Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f);
Cvar_RegisterVariable (&sv_maxvelocity);
Cvar_RegisterVariable (&sv_gravity);
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_gameplayfix_setmodelrealbox);
+ Cvar_RegisterVariable (&sv_protocolname);
+ Cvar_RegisterVariable (&sv_ratelimitlocalplayer);
+ Cvar_RegisterVariable (&sv_maxrate);
+ Cvar_RegisterVariable (&sv_progs);
SV_Phys_Init();
SV_World_Init();
- for (i = 0;i < MAX_MODELS;i++)
- sprintf (localmodels[i], "*%i", i);
-
- sv_edicts_mempool = Mem_AllocPool("server edicts");
+ sv_edicts_mempool = Mem_AllocPool("server edicts", 0, NULL);
}
static void SV_SaveEntFile_f(void)
FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities));
}
+
/*
=============================================================================
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;
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);
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);
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;
-
- if ( sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num] )
- {
- Con_Printf("SV_StartSound: %s not precached\n", sample);
+ sound_num = SV_SoundIndex(sample, 1);
+ if (!sound_num)
return;
- }
ent = NUM_FOR_EDICT(entity);
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]));
+ 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[128];
+ int i;
+ char message[128];
// edicts get reallocated on level changes, so we need to update it here
- client->edict = EDICT_NUM(client->number + 1);
+ client->edict = EDICT_NUM((client - svs.clients) + 1);
+
+ // if client is a botclient coming from a level change, we need to set up
+ // client info that normally requires networking
+ if (!client->netconnection)
+ {
+ // set up the edict
+ ED_ClearEdict(client->edict);
+
+ // copy spawn parms out of the client_t
+ for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
+ (&pr_global_struct->parm1)[i] = host_client->spawn_parms[i];
+
+ // call the spawn function
+ pr_global_struct->time = sv.time;
+ pr_global_struct->self = EDICT_TO_PROG(client->edict);
+ PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing");
+ PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
+ host_client->spawned = true;
+ return;
+ }
// LordHavoc: clear entityframe tracking
- client->entityframenumber = 0;
+ client->latestframenum = 0;
+
+ if (client->entitydatabase)
+ EntityFrame_FreeDatabase(client->entitydatabase);
if (client->entitydatabase4)
EntityFrame4_FreeDatabase(client->entitydatabase4);
- client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool);
+ 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 || sv.protocol == PROTOCOL_DARKPLACES6)
+ client->entitydatabase5 = EntityFrame5_AllocDatabase(sv_clients_mempool);
MSG_WriteByte (&client->message, svc_print);
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, PROTOCOL_DARKPLACES5);
+ MSG_WriteLong (&client->message, sv.protocol);
MSG_WriteByte (&client->message, svs.maxclients);
if (!coop.integer && deathmatch.integer)
MSG_WriteString (&client->message,PR_GetString(sv.edicts->v->message));
- for (s = sv.model_precache+1 ; *s ; s++)
- MSG_WriteString (&client->message, *s);
+ for (i = 1;i < MAX_MODELS && sv.model_precache[i][0];i++)
+ MSG_WriteString (&client->message, sv.model_precache[i]);
MSG_WriteByte (&client->message, 0);
- for (s = sv.sound_precache+1 ; *s ; s++)
- MSG_WriteString (&client->message, *s);
+ for (i = 1;i < MAX_SOUNDS && sv.sound_precache[i][0];i++)
+ MSG_WriteString (&client->message, sv.sound_precache[i]);
MSG_WriteByte (&client->message, 0);
// send music
client->active = true;
client->netconnection = netconnection;
- Con_DPrintf("Client %s connected\n", client->netconnection->address);
+ Con_DPrintf("Client %s connected\n", client->netconnection ? client->netconnection->address : "botclient");
strcpy(client->name, "unconnected");
strcpy(client->old_name, "unconnected");
- client->number = clientnum;
client->spawned = false;
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
+ // updated by receiving "rate" command from client
+ client->rate = NET_MINRATE;
+ // no limits for local player
+ if (client->netconnection && LHNETADDRESS_GetAddressType(&client->netconnection->peeraddress) == LHNETADDRESSTYPE_LOOP)
+ client->rate = 1000000000;
+ client->connecttime = realtime;
if (sv.loadgame)
memcpy (client->spawn_parms, spawn_parms, sizeof(spawn_parms));
client->spawn_parms[i] = (&pr_global_struct->parm1)[i];
}
- SV_SendServerinfo (client);
+ // don't call SendServerinfo for a fresh botclient because its fields have
+ // not been set up by the qc yet
+ if (client->netconnection)
+ SV_SendServerinfo (client);
+ else
+ client->spawned = true;
}
int sv_writeentitiestoclient_pvsbytes;
qbyte sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
-/*
-=============
-SV_WriteEntitiesToClient
-
-=============
-*/
-#ifdef QUAKEENTITIES
-void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
-{
- int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize;
- int culled_pvs, culled_trace, visibleentities, totalentities;
- qbyte *pvs;
- vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
- float nextfullupdate, alphaf;
- edict_t *ent;
- eval_t *val;
- entity_state_t *baseline; // LordHavoc: delta or startup baseline
- model_t *model;
-
- Mod_CheckLoaded(sv.worldmodel);
-
-// find the client's PVS
- VectorAdd (clent->v->origin, clent->v->view_ofs, testeye);
- fatbytes = 0;
- if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
- fatbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, testeye, 8, sv_writeentitiestoclient_pvs, sizeof(sv_writeentitiestoclient_pvs));
-
- culled_pvs = 0;
- culled_trace = 0;
- visibleentities = 0;
- totalentities = 0;
-
- clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
- // send all entities that touch the pvs
- ent = NEXT_EDICT(sv.edicts);
- for (e = 1;e < sv.num_edicts;e++, ent = NEXT_EDICT(ent))
- {
- bits = 0;
-
- // prevent delta compression against this frame (unless actually sent, which will restore this later)
- nextfullupdate = client->nextfullupdate[e];
- client->nextfullupdate[e] = -1;
-
- if (ent != clent) // LordHavoc: always send player
- {
- if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict)
- {
- if (val->edict != clentnum)
- {
- // don't show to anyone else
- continue;
- }
- else
- bits |= U_VIEWMODEL; // show relative to the view
- }
- 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;
- }
- }
-
- glowsize = 0;
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size)))
- glowsize = (int) val->_float >> 2;
- if (glowsize > 255) glowsize = 255;
- if (glowsize < 0) glowsize = 0;
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail)))
- if (val->_float != 0)
- bits |= U_GLOWTRAIL;
-
- if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && *PR_GetString(ent->v->model))
- {
- model = sv.models[(int)ent->v->modelindex];
- Mod_CheckLoaded(model);
- }
- else
- {
- model = NULL;
- if (ent != clent) // LordHavoc: always send player
- if (glowsize == 0 && (bits & U_GLOWTRAIL) == 0) // no effects
- continue;
- }
-
- VectorCopy(ent->v->angles, angles);
- VectorCopy(ent->v->origin, origin);
-
- // ent has survived every check so far, check if it is visible
- if (ent != clent && ((bits & U_VIEWMODEL) == 0))
- {
- // use the predicted origin
- entmins[0] = origin[0] - 1.0f;
- entmins[1] = origin[1] - 1.0f;
- entmins[2] = origin[2] - 1.0f;
- entmaxs[0] = origin[0] + 1.0f;
- entmaxs[1] = origin[1] + 1.0f;
- entmaxs[2] = origin[2] + 1.0f;
- // using the model's bounding box to ensure things are visible regardless of their physics box
- if (model)
- {
- if (ent->v->angles[0] || ent->v->angles[2]) // pitch and roll
- {
- VectorAdd(entmins, model->rotatedmins, entmins);
- VectorAdd(entmaxs, model->rotatedmaxs, entmaxs);
- }
- else if (ent->v->angles[1])
- {
- VectorAdd(entmins, model->yawmins, entmins);
- VectorAdd(entmaxs, model->yawmaxs, entmaxs);
- }
- else
- {
- VectorAdd(entmins, model->normalmins, entmins);
- VectorAdd(entmaxs, model->normalmaxs, entmaxs);
- }
- }
-
- totalentities++;
-
- // if not touching a visible leaf
- if (sv_cullentities_pvs.integer && fatbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, entmins, entmaxs))
- {
- culled_pvs++;
- continue;
- }
-
- // don't try to cull embedded brush models with this, they're sometimes huge (spanning several rooms)
- if (sv_cullentities_trace.integer && (model == NULL || model->name[0] != '*'))
- {
- // LordHavoc: test random offsets, to maximize chance of detection
- testorigin[0] = lhrandom(entmins[0], entmaxs[0]);
- testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
- testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
-
- sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
- if (trace.fraction == 1)
- client->visibletime[e] = realtime + 1;
- else
- {
- //test nearest point on bbox
- testorigin[0] = bound(entmins[0], testeye[0], entmaxs[0]);
- testorigin[1] = bound(entmins[1], testeye[1], entmaxs[1]);
- testorigin[2] = bound(entmins[2], testeye[2], entmaxs[2]);
-
- sv.worldmodel->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])
- {
- culled_trace++;
- continue;
- }
- }
- }
- visibleentities++;
- }
-
- alphaf = 255.0f;
- scale = 16;
- glowcolor = 254;
- effects = ent->v->effects;
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
- if (val->_float != 0)
- alphaf = val->_float * 255.0f;
-
- // HalfLife support
- if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)))
- if (val->_float != 0)
- alphaf = val->_float;
-
- if (alphaf == 0.0f)
- alphaf = 255.0f;
- alpha = bound(0, alphaf, 255);
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_scale)))
- if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16;
- if (scale < 0) scale = 0;
- if (scale > 255) scale = 255;
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_glow_color)))
- if (val->_float != 0)
- glowcolor = (int) val->_float;
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_fullbright)))
- if (val->_float != 0)
- effects |= EF_FULLBRIGHT;
-
- if (ent != clent)
- {
- if (glowsize == 0 && (bits & U_GLOWTRAIL) == 0) // no effects
- {
- 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;
- }
- }
-
- if (msg->maxsize - msg->cursize < 32) // LordHavoc: increased check from 16 to 32
- {
- 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++)
- {
- client->nextfullupdate[e] = -1;
- client->visibletime[e] = -1;
- }
- return;
- }
-
- if ((val = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)) && val->edict == clentnum)
- bits = bits | U_EXTERIORMODEL;
-
-// send an update
- baseline = &ent->e->baseline;
-
- 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->e->deltabaseline;
- }
- else
- nextfullupdate = realtime + 0.5f;
- }
- else
- nextfullupdate = realtime + 0.5f;
-
- // restore nextfullupdate since this is being sent for real
- client->nextfullupdate[e] = nextfullupdate;
-
- if (e >= 256)
- bits |= U_LONGENTITY;
-
- if (ent->v->movetype == MOVETYPE_STEP)
- bits |= U_STEP;
-
- // LordHavoc: old stuff, but rewritten to have more exact tolerances
- if (origin[0] != baseline->origin[0]) bits |= U_ORIGIN1;
- if (origin[1] != baseline->origin[1]) bits |= U_ORIGIN2;
- if (origin[2] != baseline->origin[2]) bits |= U_ORIGIN3;
- if (((int)(angles[0]*(256.0/360.0)) & 255) != ((int)(baseline->angles[0]*(256.0/360.0)) & 255)) bits |= U_ANGLE1;
- if (((int)(angles[1]*(256.0/360.0)) & 255) != ((int)(baseline->angles[1]*(256.0/360.0)) & 255)) bits |= U_ANGLE2;
- if (((int)(angles[2]*(256.0/360.0)) & 255) != ((int)(baseline->angles[2]*(256.0/360.0)) & 255)) bits |= U_ANGLE3;
- if (baseline->colormap != (qbyte) ent->v->colormap) bits |= U_COLORMAP;
- if (baseline->skin != (qbyte) ent->v->skin) bits |= U_SKIN;
- if ((baseline->frame & 0x00FF) != ((int) ent->v->frame & 0x00FF)) bits |= U_FRAME;
- if ((baseline->effects & 0x00FF) != ((int) ent->v->effects & 0x00FF)) bits |= U_EFFECTS;
- if ((baseline->modelindex & 0x00FF) != ((int) ent->v->modelindex & 0x00FF)) bits |= U_MODEL;
-
- // LordHavoc: new stuff
- if (baseline->alpha != alpha) bits |= U_ALPHA;
- if (baseline->scale != scale) bits |= U_SCALE;
- if (((int) baseline->effects & 0xFF00) != ((int) ent->v->effects & 0xFF00)) bits |= U_EFFECTS2;
- if (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;
-
- // update delta baseline
- 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)
- bits |= U_EXTEND2;
- if (bits >= 65536)
- bits |= U_EXTEND1;
- if (bits >= 256)
- bits |= U_MOREBITS;
- bits |= U_SIGNAL;
-
- MSG_WriteByte (msg, bits);
- if (bits & U_MOREBITS)
- MSG_WriteByte (msg, bits>>8);
- // LordHavoc: extend bytes have to be written here due to delta compression
- if (bits & U_EXTEND1)
- MSG_WriteByte (msg, bits>>16);
- if (bits & U_EXTEND2)
- MSG_WriteByte (msg, bits>>24);
-
- // LordHavoc: old stuff
- if (bits & U_LONGENTITY)
- 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]);
-
- // 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_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 (sv_cullentities_stats.integer)
- Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, totalentities, visibleentities, culled_pvs + culled_trace, culled_pvs, culled_trace);
-}
-#else
static int numsendentities;
static entity_state_t sendentities[MAX_EDICTS];
static entity_state_t *sendentitiesindex[MAX_EDICTS];
if (ent->e->free)
continue;
- ClearStateToDefault(&cs);
+ cs = defaultstate;
cs.active = true;
cs.number = e;
VectorCopy(ent->v->origin, cs.origin);
void SV_MarkWriteEntityStateToClient(entity_state_t *s)
{
+ int isbmodel;
vec3_t entmins, entmaxs, lightmins, lightmaxs, testorigin;
model_t *model;
trace_t trace;
if (sententities[s->tagentity] != sententitiesmark)
return;
}
+ // skip invalid modelindexes to avoid crashes
+ else if (s->modelindex >= MAX_MODELS)
+ return;
// always send world submodels, they don't generate much traffic
- else if ((model = sv.models[s->modelindex]) == NULL || model->name[0] != '*')
+ // except in PROTOCOL_QUAKE where they hog bandwidth like crazy
+ else if (!(s->effects & EF_NODEPTHTEST) && (!(isbmodel = (model = sv.models[s->modelindex]) != NULL && model->name[0] == '*') || sv.protocol == PROTOCOL_QUAKE))
{
Mod_CheckLoaded(model);
// entity has survived every check so far, check if visible
lightmins[0] = min(entmins[0], s->origin[0] - s->specialvisibilityradius);
lightmins[1] = min(entmins[1], s->origin[1] - s->specialvisibilityradius);
lightmins[2] = min(entmins[2], s->origin[2] - s->specialvisibilityradius);
- lightmaxs[0] = min(entmaxs[0], s->origin[0] + s->specialvisibilityradius);
- lightmaxs[1] = min(entmaxs[1], s->origin[1] + s->specialvisibilityradius);
- lightmaxs[2] = min(entmaxs[2], s->origin[2] + s->specialvisibilityradius);
+ 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_writeentitiestoclient_pvsbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, lightmins, lightmaxs))
return;
}
// or not seen by random tracelines
- if (sv_cullentities_trace.integer)
+ if (sv_cullentities_trace.integer && !isbmodel)
{
// LordHavoc: test center first
testorigin[0] = (entmins[0] + entmaxs[0]) * 0.5f;
sententities[s->number] = sententitiesmark;
}
-void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
+entity_state_t sendstates[MAX_EDICTS];
+
+void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg, int *stats)
{
- int i;
- vec3_t testorigin;
+ int i, numsendstates;
entity_state_t *s;
- entity_database4_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;
-
- // 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)
+ if (msg->cursize + 25 > msg->maxsize)
return;
- d->currentcommit = d->commit + i;
-
- // this state's number gets played around with later
- ClearStateToDefault(&inactiveentitystate);
- //inactiveentitystate = defaultstate;
sv_writeentitiestoclient_client = client;
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 = ++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
- 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++)
+ numsendstates = 0;
+ for (i = 0;i < numsendentities;i++)
{
- // 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 (sententities[sendentities[i].number] == sententitiesmark)
{
- // entity exists, build an update (if empty there is no change)
- // find the state in the list
- for (;i < numsendentities && sendentities[i].number < n;i++);
- s = sendentities + i;
- if (s->number != n)
- Sys_Error("SV_WriteEntitiesToClient: s->number != n\n");
- // build the update
+ s = &sendstates[numsendstates++];
+ *s = sendentities[i];
if (s->exteriormodelforclient && s->exteriormodelforclient == sv_writeentitiestoclient_clentnum)
- {
s->flags |= RENDER_EXTERIORMODEL;
- EntityState_Write(s, &buf, e);
- s->flags &= ~RENDER_EXTERIORMODEL;
- }
- else
- EntityState_Write(s, &buf, e);
- }
- else
- {
- s = &inactiveentitystate;
- s->number = n;
- if (e->active)
- {
- // entity used to exist but doesn't anymore, send remove
- MSG_WriteShort(&buf, n | 0x8000);
- }
- }
- // if the commit is full, we're done this frame
- if (msg->cursize + buf.cursize > 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;
-
- // remove world message (invalid, and thus a good terminator)
- MSG_WriteShort(msg, 0x8000);
- // write the number of the end entity
- MSG_WriteShort(msg, d->currententitynumber);
- // just to be sure
- d->currentcommit = NULL;
if (sv_cullentities_stats.integer)
Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, sv_writeentitiestoclient_totalentities, sv_writeentitiestoclient_visibleentities, sv_writeentitiestoclient_culled_pvs + sv_writeentitiestoclient_culled_trace, sv_writeentitiestoclient_culled_pvs, sv_writeentitiestoclient_culled_trace);
+
+ if (client->entitydatabase5)
+ EntityFrame5_WriteFrame(msg, client->entitydatabase5, numsendstates, sendstates, client - svs.clients + 1, stats);
+ 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
/*
=============
==================
*/
-void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
+void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg, int *stats)
{
int bits;
int i;
eval_t *val;
vec3_t punchvector;
qbyte viewzoom;
+ int weaponmodelindex;
//
// send a damage message
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;
{
MSG_WriteByte (msg, svc_setangle);
for (i=0 ; i < 3 ; i++)
- MSG_WriteAngle (msg, ent->v->angles[i] );
+ MSG_WriteAngle (msg, ent->v->angles[i], sv.protocol);
ent->v->fixangle = 0;
}
- bits = 0;
-
- if (ent->v->view_ofs[2] != DEFAULT_VIEWHEIGHT)
- bits |= SU_VIEWHEIGHT;
-
- if (ent->v->idealpitch)
- bits |= SU_IDEALPITCH;
-
-// stuff the sigil bits into the high bits of items for sbar, or else
-// mix in items2
+ // stuff the sigil bits into the high bits of items for sbar, or else
+ // mix in items2
val = GETEDICTFIELDVALUE(ent, eval_items2);
-
if (val)
items = (int)ent->v->items | ((int)val->_float << 23);
else
items = (int)ent->v->items | ((int)pr_global_struct->serverflags << 28);
- bits |= SU_ITEMS;
-
- if ( (int)ent->v->flags & FL_ONGROUND)
- bits |= SU_ONGROUND;
-
- if ( ent->v->waterlevel >= 2)
- bits |= SU_INWATER;
-
- // PROTOCOL_DARKPLACES
VectorClear(punchvector);
if ((val = GETEDICTFIELDVALUE(ent, eval_punchvector)))
VectorCopy(val->vector, punchvector);
- i = 255;
+ weaponmodelindex = SV_ModelIndex(PR_GetString(ent->v->weaponmodel), 1);
+
+ viewzoom = 255;
if ((val = GETEDICTFIELDVALUE(ent, eval_viewzoom)))
- {
- i = val->_float * 255.0f;
- if (i == 0)
- i = 255;
- else
- i = bound(0, i, 255);
- }
- viewzoom = i;
+ viewzoom = val->_float * 255.0f;
+ if (viewzoom == 0)
+ viewzoom = 255;
+
+ bits = 0;
- if (viewzoom != 255)
- bits |= SU_VIEWZOOM;
+ if ((int)ent->v->flags & FL_ONGROUND)
+ bits |= SU_ONGROUND;
+ if (ent->v->waterlevel >= 2)
+ bits |= SU_INWATER;
+ if (ent->v->idealpitch)
+ bits |= SU_IDEALPITCH;
for (i=0 ; i<3 ; i++)
{
if (ent->v->punchangle[i])
bits |= (SU_PUNCH1<<i);
- if (punchvector[i]) // PROTOCOL_DARKPLACES
- bits |= (SU_PUNCHVEC1<<i); // PROTOCOL_DARKPLACES
+ if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
+ if (punchvector[i])
+ bits |= (SU_PUNCHVEC1<<i);
if (ent->v->velocity[i])
bits |= (SU_VELOCITY1<<i);
}
- if (ent->v->weaponframe)
- bits |= SU_WEAPONFRAME;
-
- if (ent->v->armorvalue)
- bits |= SU_ARMOR;
-
- bits |= SU_WEAPON;
+ memset(stats, 0, sizeof(int[MAX_CL_STATS]));
+ stats[STAT_VIEWHEIGHT] = ent->v->view_ofs[2];
+ stats[STAT_ITEMS] = items;
+ stats[STAT_WEAPONFRAME] = ent->v->weaponframe;
+ stats[STAT_ARMOR] = ent->v->armorvalue;
+ stats[STAT_WEAPON] = weaponmodelindex;
+ stats[STAT_HEALTH] = ent->v->health;
+ stats[STAT_AMMO] = ent->v->currentammo;
+ stats[STAT_SHELLS] = ent->v->ammo_shells;
+ stats[STAT_NAILS] = ent->v->ammo_nails;
+ stats[STAT_ROCKETS] = ent->v->ammo_rockets;
+ stats[STAT_CELLS] = ent->v->ammo_cells;
+ stats[STAT_ACTIVEWEAPON] = ent->v->weapon;
+ stats[STAT_VIEWZOOM] = viewzoom;
+ // the QC bumps these itself by sending svc_'s, so we have to keep them
+ // zero or they'll be corrected by the engine
+ //stats[STAT_TOTALSECRETS] = pr_global_struct->total_secrets;
+ //stats[STAT_TOTALMONSTERS] = pr_global_struct->total_monsters;
+ //stats[STAT_SECRETS] = pr_global_struct->found_secrets;
+ //stats[STAT_MONSTERS] = pr_global_struct->killed_monsters;
+
+ if (sv.protocol != PROTOCOL_DARKPLACES6)
+ {
+ if (stats[STAT_VIEWHEIGHT] != DEFAULT_VIEWHEIGHT) bits |= SU_VIEWHEIGHT;
+ bits |= SU_ITEMS;
+ if (stats[STAT_WEAPONFRAME]) bits |= SU_WEAPONFRAME;
+ if (stats[STAT_ARMOR]) bits |= SU_ARMOR;
+ bits |= SU_WEAPON;
+ // 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;
+ }
if (bits >= 65536)
bits |= SU_EXTEND1;
if (bits >= 16777216)
bits |= SU_EXTEND2;
-// send the data
-
+ // send the data
MSG_WriteByte (msg, svc_clientdata);
MSG_WriteShort (msg, bits);
if (bits & SU_EXTEND1)
MSG_WriteByte(msg, bits >> 24);
if (bits & SU_VIEWHEIGHT)
- MSG_WriteChar (msg, ent->v->view_ofs[2]);
+ MSG_WriteChar (msg, stats[STAT_VIEWHEIGHT]);
if (bits & SU_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]); // PROTOCOL_DARKPLACES
- if (bits & (SU_PUNCHVEC1<<i)) // PROTOCOL_DARKPLACES
- MSG_WriteFloat(msg, punchvector[i]); // PROTOCOL_DARKPLACES
+ {
+ 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 || sv.protocol == PROTOCOL_DARKPLACES6)
+ 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 || sv.protocol == PROTOCOL_DARKPLACES6)
+ {
+ 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 || sv.protocol == PROTOCOL_DARKPLACES6)
+ MSG_WriteCoord32f(msg, punchvector[i]);
+ }
+ }
if (bits & (SU_VELOCITY1<<i))
- MSG_WriteFloat(msg, ent->v->velocity[i]);
+ {
+ 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 || sv.protocol == PROTOCOL_DARKPLACES6)
+ 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_GetString(ent->v->weaponmodel)));
+ if (bits & SU_ITEMS)
+ MSG_WriteLong (msg, stats[STAT_ITEMS]);
- 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)
+ if (sv.protocol == PROTOCOL_DARKPLACES5)
{
- for(i=0;i<32;i++)
- {
- if ( ((int)ent->v->weapon) & (1<<i) )
- {
- MSG_WriteByte (msg, i);
- break;
- }
- }
+ if (bits & SU_WEAPONFRAME)
+ MSG_WriteShort (msg, stats[STAT_WEAPONFRAME]);
+ if (bits & SU_ARMOR)
+ MSG_WriteShort (msg, stats[STAT_ARMOR]);
+ if (bits & SU_WEAPON)
+ MSG_WriteShort (msg, stats[STAT_WEAPON]);
+ MSG_WriteShort (msg, stats[STAT_HEALTH]);
+ MSG_WriteShort (msg, stats[STAT_AMMO]);
+ MSG_WriteShort (msg, stats[STAT_SHELLS]);
+ MSG_WriteShort (msg, stats[STAT_NAILS]);
+ MSG_WriteShort (msg, stats[STAT_ROCKETS]);
+ MSG_WriteShort (msg, stats[STAT_CELLS]);
+ MSG_WriteShort (msg, stats[STAT_ACTIVEWEAPON]);
+ if (bits & SU_VIEWZOOM)
+ MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535));
}
- else
+ else if (sv.protocol != PROTOCOL_DARKPLACES6)
{
- MSG_WriteByte (msg, ent->v->weapon);
+ if (bits & SU_WEAPONFRAME)
+ MSG_WriteByte (msg, stats[STAT_WEAPONFRAME]);
+ if (bits & SU_ARMOR)
+ MSG_WriteByte (msg, stats[STAT_ARMOR]);
+ if (bits & SU_WEAPON)
+ MSG_WriteByte (msg, stats[STAT_WEAPON]);
+ MSG_WriteShort (msg, stats[STAT_HEALTH]);
+ MSG_WriteByte (msg, stats[STAT_AMMO]);
+ MSG_WriteByte (msg, stats[STAT_SHELLS]);
+ MSG_WriteByte (msg, stats[STAT_NAILS]);
+ MSG_WriteByte (msg, stats[STAT_ROCKETS]);
+ MSG_WriteByte (msg, stats[STAT_CELLS]);
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+ {
+ for (i = 0;i < 32;i++)
+ if (stats[STAT_WEAPON] & (1<<i))
+ break;
+ MSG_WriteByte (msg, i);
+ }
+ else
+ MSG_WriteByte (msg, stats[STAT_WEAPON]);
+ if (bits & SU_VIEWZOOM)
+ {
+ if (sv.protocol == PROTOCOL_DARKPLACES4)
+ MSG_WriteByte (msg, min(stats[STAT_VIEWZOOM], 255));
+ else if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
+ MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535));
+ }
}
-
- if (bits & SU_VIEWZOOM)
- MSG_WriteByte (msg, viewzoom);
}
/*
static qbyte sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
qboolean SV_SendClientDatagram (client_t *client)
{
- sizebuf_t msg;
+ int rate, maxrate, maxsize, maxsize2;
+ sizebuf_t msg;
+ int stats[MAX_CL_STATS];
+
+ 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 || sv.protocol == PROTOCOL_DARKPLACES6)
+ {
+ // 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->rate, maxrate);
+ rate = (int)(client->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 = (int)bound(50.0, client->netconnection->rate * host_realframetime, (double)sizeof(sv_sendclientdatagram_buf));
+ msg.maxsize = maxsize;
msg.cursize = 0;
MSG_WriteByte (&msg, svc_time);
MSG_WriteFloat (&msg, sv.time);
// add the client specific data to the datagram
- SV_WriteClientdataToMessage (client->edict, &msg);
+ SV_WriteClientdataToMessage (client, client->edict, &msg, stats);
+ SV_WriteEntitiesToClient (client, client->edict, &msg, stats);
- SV_WriteEntitiesToClient (client, client->edict, &msg);
+ // 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 (msg.cursize + sv.datagram.cursize <= msg.maxsize)
+ if (sv.datagram.cursize > 0 && msg.cursize + sv.datagram.cursize <= msg.maxsize)
SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize);
// send the datagram
int i, j;
client_t *client;
eval_t *val;
- char *s;
+ char *name;
+ char *model;
+ char *skin;
// check for changes to be sent over the reliable streams
for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
// 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
+ host_client->edict = EDICT_NUM(i+1);
+
+ // DP_SV_CLIENTNAME
+ name = PR_GetString(host_client->edict->v->netname);
+ if (name == NULL)
+ name = "";
+ // always point the string back at host_client->name to keep it safe
+ strlcpy (host_client->name, name, sizeof (host_client->name));
+ host_client->edict->v->netname = PR_SetString(host_client->name);
if (strcmp(host_client->old_name, host_client->name))
{
+ if (host_client->spawned)
+ SV_BroadcastPrintf("%s changed name to %s\n", 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);
- }
+ // send notification to all clients
+ MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
+ MSG_WriteByte (&sv.reliable_datagram, i);
+ MSG_WriteString (&sv.reliable_datagram, host_client->name);
}
+
+ // DP_SV_CLIENTCOLORS
+ // this is always found (since it's added by the progs loader)
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
+ host_client->colors = (int)val->_float;
if (host_client->old_colors != host_client->colors)
{
host_client->old_colors = host_client->colors;
- for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
- {
- if (!client->spawned || !client->netconnection)
- continue;
- MSG_WriteByte (&client->message, svc_updatecolors);
- MSG_WriteByte (&client->message, i);
- MSG_WriteByte (&client->message, host_client->colors);
- }
+ // send notification to all clients
+ MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
+ MSG_WriteByte (&sv.reliable_datagram, i);
+ MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
+ }
+
+ // NEXUIZ_PLAYERMODEL
+ if( eval_playermodel ) {
+ model = PR_GetString(GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string);
+ if (model == NULL)
+ model = "";
+ // always point the string back at host_client->name to keep it safe
+ strlcpy (host_client->playermodel, model, sizeof (host_client->playermodel));
+ GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PR_SetString(host_client->playermodel);
}
+
+ // NEXUIZ_PLAYERSKIN
+ if( eval_playerskin ) {
+ skin = PR_GetString(GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string);
+ if (skin == NULL)
+ skin = "";
+ // always point the string back at host_client->name to keep it safe
+ strlcpy (host_client->playerskin, skin, sizeof (host_client->playerskin));
+ GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PR_SetString(host_client->playerskin);
+ }
+
+ // frags
+ host_client->frags = (int)host_client->edict->v->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++)
- {
- if (!client->spawned || !client->netconnection)
- continue;
- MSG_WriteByte (&client->message, svc_updatefrags);
- MSG_WriteByte (&client->message, i);
- MSG_WriteShort (&client->message, host_client->frags);
- }
+ // send notification to all clients
+ MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags);
+ MSG_WriteByte (&sv.reliable_datagram, i);
+ MSG_WriteShort (&sv.reliable_datagram, host_client->frags);
}
}
================
*/
-int SV_ModelIndex (const char *name)
+int SV_ModelIndex(char *s, int precachemode)
{
- int i;
-
- if (!name || !name[0])
+ int i, limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_MODELS);
+ char filename[MAX_QPATH];
+ if (!s || !*s)
return 0;
+ // testing
+ //if (precachemode == 2)
+ // return 0;
+ strlcpy(filename, s, sizeof(filename));
+ for (i = 2;i < limit;i++)
+ {
+ if (!sv.model_precache[i][0])
+ {
+ if (precachemode)
+ {
+ if (sv.state != ss_loading && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5))
+ {
+ Con_Printf("SV_ModelIndex(\"%s\"): precache_model can only be done in spawn functions\n", filename);
+ return 0;
+ }
+ if (precachemode == 1)
+ Con_Printf("SV_ModelIndex(\"%s\"): not precached (fix your code), precaching anyway\n", filename);
+ strlcpy(sv.model_precache[i], filename, sizeof(sv.model_precache[i]));
+ sv.models[i] = Mod_ForName (sv.model_precache[i], true, false, false);
+ if (sv.protocol == PROTOCOL_DARKPLACES6)
+ {
+ MSG_WriteByte(&sv.reliable_datagram, svc_precache);
+ MSG_WriteShort(&sv.reliable_datagram, i);
+ MSG_WriteString(&sv.reliable_datagram, filename);
+ }
+ return i;
+ }
+ Con_Printf("SV_ModelIndex(\"%s\"): not precached\n", filename);
+ return 0;
+ }
+ if (!strcmp(sv.model_precache[i], filename))
+ return i;
+ }
+ Con_Printf("SV_ModelIndex(\"%s\"): i (%i) == MAX_MODELS (%i)\n", filename, i, MAX_MODELS);
+ return 0;
+}
+
+/*
+================
+SV_SoundIndex
- for (i=0 ; i<MAX_MODELS && sv.model_precache[i] ; i++)
- if (!strcmp(sv.model_precache[i], name))
+================
+*/
+int SV_SoundIndex(char *s, int precachemode)
+{
+ int i, limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_SOUNDS);
+ char filename[MAX_QPATH];
+ if (!s || !*s)
+ return 0;
+ // testing
+ //if (precachemode == 2)
+ // return 0;
+ strlcpy(filename, s, sizeof(filename));
+ for (i = 1;i < limit;i++)
+ {
+ if (!sv.sound_precache[i][0])
+ {
+ if (precachemode)
+ {
+ if (sv.state != ss_loading && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5))
+ {
+ Con_Printf("SV_SoundIndex(\"%s\"): precache_sound can only be done in spawn functions\n", filename);
+ return 0;
+ }
+ if (precachemode == 1)
+ Con_Printf("SV_SoundIndex(\"%s\"): not precached (fix your code), precaching anyway\n", filename);
+ strlcpy(sv.sound_precache[i], filename, sizeof(sv.sound_precache[i]));
+ if (sv.protocol == PROTOCOL_DARKPLACES6)
+ {
+ MSG_WriteByte(&sv.reliable_datagram, svc_precache);
+ MSG_WriteShort(&sv.reliable_datagram, i + 32768);
+ MSG_WriteString(&sv.reliable_datagram, filename);
+ }
+ return i;
+ }
+ Con_Printf("SV_SoundIndex(\"%s\"): not precached\n", filename);
+ return 0;
+ }
+ if (!strcmp(sv.sound_precache[i], filename))
return i;
- if (i==MAX_MODELS || !sv.model_precache[i])
- Host_Error ("SV_ModelIndex: model %s not precached", name);
- return i;
+ }
+ Con_Printf("SV_SoundIndex(\"%s\"): i (%i) == MAX_SOUNDS (%i)\n", filename, i, MAX_SOUNDS);
+ return 0;
}
-#ifdef SV_QUAKEENTITIES
/*
================
SV_CreateBaseline
svent = EDICT_NUM(entnum);
// LordHavoc: always clear state values, whether the entity is in use or not
- ClearStateToDefault(&svent->e->baseline);
+ svent->e->baseline = defaultstate;
if (svent->e->free)
continue;
if (entnum > 0 && entnum <= svs.maxclients)
{
svent->e->baseline.colormap = entnum;
- svent->e->baseline.modelindex = SV_ModelIndex("progs/player.mdl");
+ svent->e->baseline.modelindex = SV_ModelIndex("progs/player.mdl", 1);
}
else
{
MSG_WriteByte (&sv.signon, svent->e->baseline.skin);
for (i=0 ; i<3 ; i++)
{
- MSG_WriteDPCoord(&sv.signon, svent->e->baseline.origin[i]);
- MSG_WriteAngle(&sv.signon, svent->e->baseline.angles[i]);
+ MSG_WriteCoord(&sv.signon, svent->e->baseline.origin[i], sv.protocol);
+ MSG_WriteAngle(&sv.signon, svent->e->baseline.angles[i], sv.protocol);
}
}
}
-#endif
/*
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
//
strlcpy (sv.name, server, sizeof (sv.name));
+ sv.netquakecompatible = false;
+ if (!strcasecmp(sv_protocolname.string, "QUAKE"))
+ {
+ sv.protocol = PROTOCOL_QUAKE;
+ sv.netquakecompatible = true;
+ }
+ else if (!strcasecmp(sv_protocolname.string, "QUAKEDP"))
+ sv.protocol = PROTOCOL_QUAKE;
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES1"))
+ sv.protocol = PROTOCOL_DARKPLACES1;
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES2"))
+ sv.protocol = PROTOCOL_DARKPLACES2;
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES3"))
+ sv.protocol = PROTOCOL_DARKPLACES3;
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES4"))
+ sv.protocol = PROTOCOL_DARKPLACES4;
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES5"))
+ sv.protocol = PROTOCOL_DARKPLACES5;
+ else if (!strcasecmp(sv_protocolname.string, "DARKPLACES6"))
+ sv.protocol = PROTOCOL_DARKPLACES6;
+ else
+ {
+ sv.protocol = PROTOCOL_DARKPLACES6;
+ Con_Printf("Unknown sv_protocolname \"%s\", valid values are QUAKE, QUAKEDP, DARKPLACES1, DARKPLACES2, DARKPLACES3, DARKPLACES4, DARKPLACES5, DARKPLACES6, falling back to DARKPLACES6 protocol\n", sv_protocolname.string);
+ }
+
// load progs to get entity field count
- PR_LoadProgs ();
+ PR_LoadProgs ( sv_progs.string );
// allocate server memory
// start out with just enough room for clients and a reasonable estimate of entities
ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size);
}
+ // fix up client->edict pointers for returning clients right away...
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+ host_client->edict = EDICT_NUM(i + 1);
+
sv.datagram.maxsize = sizeof(sv.datagram_buf);
sv.datagram.cursize = 0;
sv.datagram.data = sv.datagram_buf;
sv.time = 1.0;
Mod_ClearUsed();
+ worldmodel->used = true;
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);
- sv.active = false;
- return;
- }
+ strcpy(sv.modelname, modelname);
+ sv.worldmodel = worldmodel;
sv.models[1] = sv.worldmodel;
//
//
SV_ClearWorld ();
- sv.sound_precache[0] = "";
+ strlcpy(sv.sound_precache[0], "", sizeof(sv.sound_precache[0]));
- sv.model_precache[0] = "";
- sv.model_precache[1] = sv.modelname;
+ strlcpy(sv.model_precache[0], "", sizeof(sv.model_precache[0]));
+ strlcpy(sv.model_precache[1], sv.modelname, sizeof(sv.model_precache[1]));
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);
+ snprintf(sv.model_precache[i+1], sizeof(sv.model_precache[i+1]), "*%i", i);
+ sv.models[i+1] = Mod_ForName (sv.model_precache[i+1], false, false, false);
}
//
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
+ // (note this also handles botclients coming back from a level change)
for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
- if (host_client->netconnection)
+ if (host_client->active)
SV_SendServerinfo(host_client);
Con_DPrint("Server spawned.\n");
projects / xonotic / darkplaces.git / blobdiff