#include "quakedef.h"
-static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "0"}; // fast but loose
-static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "1"}; // tends to get false negatives, uses a timeout to keep entities visible a short time after becoming hidden
+static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "1"}; // fast but loose
+static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0"}; // tends to get false negatives, uses a timeout to keep entities visible a short time after becoming hidden
static cvar_t sv_cullentities_stats = {0, "sv_cullentities_stats", "0"};
static cvar_t sv_entpatch = {0, "sv_entpatch", "1"};
+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;
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_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);
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)
+{
+ char basename[MAX_QPATH];
+ if (!sv.active || !sv.worldmodel)
+ {
+ Con_Print("Not running a server\n");
+ return;
+ }
+ FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
+ FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities));
}
/*
if ( sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num] )
{
- Con_Printf ("SV_StartSound: %s not precached\n", sample);
+ Con_Printf("SV_StartSound: %s not precached\n", sample);
return;
}
MSG_WriteString (&client->message,message);
MSG_WriteByte (&client->message, svc_serverinfo);
- MSG_WriteLong (&client->message, PROTOCOL_DARKPLACES4);
+ MSG_WriteLong (&client->message, PROTOCOL_DARKPLACES5);
MSG_WriteByte (&client->message, svs.maxclients);
if (!coop.integer && deathmatch.integer)
}
// don't try to cull embedded brush models with this, they're sometimes huge (spanning several rooms)
- if (sv_cullentities_trace.integer && (model == NULL || model->brush.TraceBox == NULL || model->name[0] != '*'))
+ if (sv_cullentities_trace.integer && (model == NULL || model->name[0] != '*'))
{
// LordHavoc: test random offsets, to maximize chance of detection
testorigin[0] = lhrandom(entmins[0], entmaxs[0]);
testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
- sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
+ 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]);
- sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, testeye, testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
if (trace.fraction == 1)
client->visibletime[e] = realtime + 1;
else if (realtime > client->visibletime[e])
if (msg->maxsize - msg->cursize < 32) // LordHavoc: increased check from 16 to 32
{
- Con_Printf ("packet overflow\n");
+ Con_Print("packet overflow\n");
// mark the rest of the entities so they can't be delta compressed against this frame
for (;e < sv.num_edicts;e++)
{
if (cs.viewmodelforclient)
cs.flags |= RENDER_VIEWMODEL; // show relative to the view
+ f = GETEDICTFIELDVALUE(ent, eval_color)->vector[0]*256;
+ cs.light[0] = (unsigned short)bound(0, f, 65535);
+ f = GETEDICTFIELDVALUE(ent, eval_color)->vector[1]*256;
+ cs.light[1] = (unsigned short)bound(0, f, 65535);
+ f = GETEDICTFIELDVALUE(ent, eval_color)->vector[2]*256;
+ cs.light[2] = (unsigned short)bound(0, f, 65535);
+ f = GETEDICTFIELDVALUE(ent, eval_light_lev)->_float;
+ cs.light[3] = (unsigned short)bound(0, f, 65535);
+ cs.lightstyle = (qbyte)GETEDICTFIELDVALUE(ent, eval_style)->_float;
+ cs.lightpflags = (qbyte)GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
+
+ if (gamemode == GAME_TENEBRAE)
+ {
+ // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
+ if (cs.effects & 16)
+ {
+ cs.effects &= ~16;
+ cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+ }
+ // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
+ if (cs.effects & 32)
+ {
+ cs.effects &= ~32;
+ cs.light[0] = 0.2;
+ cs.light[1] = 1;
+ cs.light[2] = 0.2;
+ cs.light[3] = 200;
+ cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+ }
+ }
+
cs.specialvisibilityradius = 0;
+ if (cs.lightpflags & PFLAGS_FULLDYNAMIC)
+ cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.light[3]);
if (cs.glowsize)
cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.glowsize * 4);
if (cs.flags & RENDER_GLOWTRAIL)
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))
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->brush.TraceBox(sv.worldmodel, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs))
sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
else
testorigin[0] = lhrandom(entmins[0], entmaxs[0]);
testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
- sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs))
sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
else
testorigin[0] = lhrandom(lightmins[0], lightmaxs[0]);
testorigin[1] = lhrandom(lightmins[1], lightmaxs[1]);
testorigin[2] = lhrandom(lightmins[2], lightmaxs[2]);
- sv.worldmodel->brush.TraceBox(sv.worldmodel, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs))
sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
}
vec3_t testorigin;
entity_state_t *s;
entity_database4_t *d;
- int maxbytes, n, startnumber;
+ int n, startnumber;
entity_state_t *e, inactiveentitystate;
sizebuf_t buf;
qbyte data[128];
+
+ // if there isn't enough space to accomplish anything, skip it
+ if (msg->cursize + 24 > msg->maxsize)
+ return;
+
// prepare the buffer
memset(&buf, 0, sizeof(buf));
buf.data = data;
for (i = 0;i < numsendentities;i++)
SV_MarkWriteEntityStateToClient(sendentities + i);
- // calculate maximum bytes to allow in this packet
- // deduct 4 to account for the end data
- maxbytes = min(msg->maxsize, MAX_PACKETFRAGMENT) - 4;
-
d->currentcommit->numentities = 0;
d->currentcommit->framenum = ++client->entityframenumber;
MSG_WriteByte(msg, svc_entities);
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);
+ 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_Printf(")\n");
+ Con_Print(")\n");
}
if (d->currententitynumber >= sv.max_edicts)
startnumber = 1;
if (s->exteriormodelforclient && s->exteriormodelforclient == sv_writeentitiestoclient_clentnum)
{
s->flags |= RENDER_EXTERIORMODEL;
- EntityState_Write(s, &buf, e);
+ EntityState_WriteUpdate(s, &buf, e);
s->flags &= ~RENDER_EXTERIORMODEL;
}
else
- EntityState_Write(s, &buf, e);
+ EntityState_WriteUpdate(s, &buf, e);
}
else
{
}
}
// if the commit is full, we're done this frame
- if (msg->cursize + buf.cursize > maxbytes)
+ if (msg->cursize + buf.cursize > msg->maxsize - 4)
{
// next frame we will continue where we left off
break;
if (bits & (SU_PUNCH1<<i))
MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // PROTOCOL_DARKPLACES
if (bits & (SU_PUNCHVEC1<<i)) // PROTOCOL_DARKPLACES
- MSG_WriteDPCoord(msg, punchvector[i]); // PROTOCOL_DARKPLACES
+ MSG_WriteFloat(msg, punchvector[i]); // PROTOCOL_DARKPLACES
if (bits & (SU_VELOCITY1<<i))
- MSG_WriteChar (msg, ent->v->velocity[i]/16);
+ MSG_WriteFloat(msg, ent->v->velocity[i]);
}
// [always sent] if (bits & SU_ITEMS)
SV_SendClientDatagram
=======================
*/
-static qbyte sv_sendclientdatagram_buf[MAX_DATAGRAM]; // FIXME?
+static qbyte sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
qboolean SV_SendClientDatagram (client_t *client)
{
sizebuf_t msg;
msg.data = sv_sendclientdatagram_buf;
- msg.maxsize = sizeof(sv_sendclientdatagram_buf);
+ msg.maxsize = (int)bound(50.0, client->netconnection->rate * host_realframetime, (double)sizeof(sv_sendclientdatagram_buf));
msg.cursize = 0;
MSG_WriteByte (&msg, svc_time);
SV_WriteEntitiesToClient (client, client->edict, &msg);
// copy the server datagram if there is space
- if (msg.cursize + sv.datagram.cursize < msg.maxsize)
+ // FIXME: put in delayed queue of effects to send
+ if (msg.cursize + sv.datagram.cursize <= msg.maxsize)
SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize);
// send the datagram
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
//
if (sv.active)
SV_SendReconnect();
else
+ {
+ // make sure cvars have been checked before opening the ports
+ NetConn_ServerFrame();
NetConn_OpenServerPorts(true);
+ }
//
// make cvars consistant
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;
//
// load replacement entity file if found
entities = NULL;
if (sv_entpatch.integer)
- entities = FS_LoadFile(va("maps/%s.ent", sv.name), true);
+ entities = FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true);
if (entities)
{
Con_Printf("Loaded maps/%s.ent\n", sv.name);
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