void SV_VM_Init();
void SV_VM_Setup();
-// select which protocol to host, this is fed to Protocol_EnumForName
-cvar_t sv_protocolname = {0, "sv_protocolname", "DP7"};
-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"};
+void VM_AutoSentStats_Clear (void);
+void EntityFrameCSQC_ClearVersions (void);
+void EntityFrameCSQC_InitClientVersions (int client, qboolean clear);
+void VM_SV_WriteAutoSentStats (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats);
+void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_state_t *states);
-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_gameplayfix_blowupfallenzombies = {0, "sv_gameplayfix_blowupfallenzombies", "1"};
-cvar_t sv_gameplayfix_findradiusdistancetobox = {0, "sv_gameplayfix_findradiusdistancetobox", "1"};
-
-cvar_t sv_progs = {0, "sv_progs", "progs.dat" };
+// select which protocol to host, this is fed to Protocol_EnumForName
+cvar_t sv_protocolname = {0, "sv_protocolname", "DP7", "selects network protocol to host for (values include QUAKE, QUAKEDP, NEHAHRAMOVIE, DP1 and up)"};
+cvar_t sv_ratelimitlocalplayer = {0, "sv_ratelimitlocalplayer", "0", "whether to apply rate limiting to the local player in a listen server (only useful for testing)"};
+cvar_t sv_maxrate = {CVAR_SAVE | CVAR_NOTIFY, "sv_maxrate", "10000", "upper limit on client rate cvar, should reflect your network connection quality"};
+
+static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "1", "fast but loose culling of hidden entities"}; // fast but loose
+static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0", "somewhat slow but very tight culling of hidden entities, minimizes network traffic and makes wallhack cheats useless"}; // 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", "displays stats on network entities culled by various methods for each client"};
+static cvar_t sv_entpatch = {0, "sv_entpatch", "1", "enables loading of .ent files to override entities in the bsp (for example Threewave CTF server pack contains .ent patch files enabling play of CTF on id1 maps)"};
+
+cvar_t sv_gameplayfix_grenadebouncedownslopes = {0, "sv_gameplayfix_grenadebouncedownslopes", "1", "prevents MOVETYPE_BOUNCE (grenades) from getting stuck when fired down a downward sloping surface"};
+cvar_t sv_gameplayfix_noairborncorpse = {0, "sv_gameplayfix_noairborncorpse", "1", "causes entities (corpses) sitting ontop of moving entities (players) to fall when the moving entity (player) is no longer supporting them"};
+cvar_t sv_gameplayfix_stepdown = {0, "sv_gameplayfix_stepdown", "0", "attempts to step down stairs, not just up them (prevents the familiar thud..thud..thud.. when running down stairs and slopes)"};
+cvar_t sv_gameplayfix_stepwhilejumping = {0, "sv_gameplayfix_stepwhilejumping", "1", "applies step-up onto a ledge even while airborn, useful if you would otherwise just-miss the floor when running across small areas with gaps (for instance running across the moving platforms in dm2, or jumping to the megahealth and red armor in dm2 rather than using the bridge)"};
+cvar_t sv_gameplayfix_swiminbmodels = {0, "sv_gameplayfix_swiminbmodels", "1", "causes pointcontents (used to determine if you are in a liquid) to check bmodel entities as well as the world model, so you can swim around in (possibly moving) water bmodel entities"};
+cvar_t sv_gameplayfix_setmodelrealbox = {0, "sv_gameplayfix_setmodelrealbox", "1", "fixes a bug in Quake that made setmodel always set the entity box to ('-16 -16 -16', '16 16 16') rather than properly checking the model box, breaks some poorly coded mods"};
+cvar_t sv_gameplayfix_blowupfallenzombies = {0, "sv_gameplayfix_blowupfallenzombies", "1", "causes findradius to detect SOLID_NOT entities such as zombies and corpses on the floor, allowing splash damage to apply to them"};
+cvar_t sv_gameplayfix_findradiusdistancetobox = {0, "sv_gameplayfix_findradiusdistancetobox", "1", "causes findradius to check the distance to the corner of a box rather than the center of the box, makes findradius detect bmodels such as very large doors that would otherwise be unaffected by splash damage"};
+
+cvar_t sv_progs = {0, "sv_progs", "progs.dat", "selects which quakec progs.dat file to run" };
server_t sv;
server_static_t svs;
*/
void SV_Init (void)
{
- Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f);
+ Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f, "save map entities to .ent file (to allow external editing)");
Cvar_RegisterVariable (&sv_maxvelocity);
Cvar_RegisterVariable (&sv_gravity);
Cvar_RegisterVariable (&sv_friction);
+ Cvar_RegisterVariable (&sv_waterfriction);
Cvar_RegisterVariable (&sv_edgefriction);
Cvar_RegisterVariable (&sv_stopspeed);
Cvar_RegisterVariable (&sv_maxspeed);
+ Cvar_RegisterVariable (&sv_maxairspeed);
Cvar_RegisterVariable (&sv_accelerate);
+ Cvar_RegisterVariable (&sv_airaccelerate);
+ Cvar_RegisterVariable (&sv_wateraccelerate);
Cvar_RegisterVariable (&sv_idealpitchscale);
Cvar_RegisterVariable (&sv_aim);
Cvar_RegisterVariable (&sv_nostep);
- Cvar_RegisterVariable (&sv_deltacompress);
Cvar_RegisterVariable (&sv_cullentities_pvs);
Cvar_RegisterVariable (&sv_cullentities_trace);
Cvar_RegisterVariable (&sv_cullentities_stats);
return;
}
FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
- FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities));
+ FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, (fs_offset_t)strlen(sv.worldmodel->brush.entities));
}
*/
void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count)
{
- int i, v;
+ int i;
if (sv.datagram.cursize > MAX_PACKETFRAGMENT-18)
return;
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 (v > 127)
- v = 127;
- else if (v < -128)
- v = -128;
- MSG_WriteChar (&sv.datagram, v);
- }
+ MSG_WriteChar (&sv.datagram, (int)bound(-128, dir[i]*16, 127));
MSG_WriteByte (&sv.datagram, count);
MSG_WriteByte (&sv.datagram, color);
}
if (volume < 0 || volume > 255)
{
- Con_Printf ("SV_StartSound: volume = %i", volume);
+ Con_Printf ("SV_StartSound: volume = %i\n", volume);
return;
}
if (attenuation < 0 || attenuation > 4)
{
- Con_Printf ("SV_StartSound: attenuation = %f", attenuation);
+ Con_Printf ("SV_StartSound: attenuation = %f\n", attenuation);
return;
}
if (channel < 0 || channel > 7)
{
- Con_Printf ("SV_StartSound: channel = %i", channel);
+ Con_Printf ("SV_StartSound: channel = %i\n", channel);
return;
}
if (field_mask & SND_VOLUME)
MSG_WriteByte (&sv.datagram, volume);
if (field_mask & SND_ATTENUATION)
- MSG_WriteByte (&sv.datagram, attenuation*64);
+ MSG_WriteByte (&sv.datagram, (int)(attenuation*64));
if (field_mask & SND_LARGEENTITY)
{
MSG_WriteShort (&sv.datagram, ent);
==============================================================================
*/
+static const char *SV_InitCmd; //[515]: svprogs able to send cmd to client on connect
+extern qboolean csqc_loaded;
/*
================
SV_SendServerinfo
int i;
char message[128];
+ // we know that this client has a netconnection and thus is not a bot
+
// edicts get reallocated on level changes, so we need to update it here
client->edict = PRVM_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
- PRVM_ED_ClearEdict(client->edict);
-
- // copy spawn parms out of the client_t
- for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
- (&prog->globals.server->parm1)[i] = host_client->spawn_parms[i];
-
- // call the spawn function
- host_client->clientconnectcalled = true;
- prog->globals.server->time = sv.time;
- prog->globals.server->self = PRVM_EDICT_TO_PROG(client->edict);
- PRVM_ExecuteProgram (prog->globals.server->ClientConnect, "QC function ClientConnect is missing");
- PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
- host_client->spawned = true;
- return;
- }
+ // clear cached stuff that depends on the level
+ client->weaponmodel[0] = 0;
+ client->weaponmodelindex = 0;
// LordHavoc: clear entityframe tracking
client->latestframenum = 0;
client->entitydatabase5 = EntityFrame5_AllocDatabase(sv_mempool);
}
- SZ_Clear (&client->message);
- MSG_WriteByte (&client->message, svc_print);
- dpsnprintf (message, sizeof (message), "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, prog->filecrc);
- MSG_WriteString (&client->message,message);
+ SZ_Clear (&client->netconnection->message);
+ MSG_WriteByte (&client->netconnection->message, svc_print);
+ dpsnprintf (message, sizeof (message), "\nServer: %s build %s (progs %i crc)", gamename, buildstring, prog->filecrc);
+ MSG_WriteString (&client->netconnection->message,message);
- MSG_WriteByte (&client->message, svc_serverinfo);
- MSG_WriteLong (&client->message, Protocol_NumberForEnum(sv.protocol));
- MSG_WriteByte (&client->message, svs.maxclients);
+ // FIXME: LordHavoc: this does not work on dedicated servers, needs fixing.
+//[515]: init csprogs according to version of svprogs, check the crc, etc.
+ if(csqc_loaded && (cls.state == ca_dedicated || PRVM_NUM_FOR_EDICT(client->edict) != 1))
+ {
+ MSG_WriteByte (&client->netconnection->message, svc_stufftext);
+ if(SV_InitCmd)
+ MSG_WriteString (&client->netconnection->message, va("csqc_progcrc %i;%s\n", csqc_progcrc.integer, SV_InitCmd));
+ else
+ MSG_WriteString (&client->netconnection->message, va("csqc_progcrc %i\n", csqc_progcrc.integer));
+ }
+
+ MSG_WriteByte (&client->netconnection->message, svc_serverinfo);
+ MSG_WriteLong (&client->netconnection->message, Protocol_NumberForEnum(sv.protocol));
+ MSG_WriteByte (&client->netconnection->message, svs.maxclients);
if (!coop.integer && deathmatch.integer)
- MSG_WriteByte (&client->message, GAME_DEATHMATCH);
+ MSG_WriteByte (&client->netconnection->message, GAME_DEATHMATCH);
else
- MSG_WriteByte (&client->message, GAME_COOP);
+ MSG_WriteByte (&client->netconnection->message, GAME_COOP);
- MSG_WriteString (&client->message,PRVM_GetString(prog->edicts->fields.server->message));
+ MSG_WriteString (&client->netconnection->message,PRVM_GetString(prog->edicts->fields.server->message));
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);
+ MSG_WriteString (&client->netconnection->message, sv.model_precache[i]);
+ MSG_WriteByte (&client->netconnection->message, 0);
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);
+ MSG_WriteString (&client->netconnection->message, sv.sound_precache[i]);
+ MSG_WriteByte (&client->netconnection->message, 0);
// send music
- MSG_WriteByte (&client->message, svc_cdtrack);
- MSG_WriteByte (&client->message, prog->edicts->fields.server->sounds);
- MSG_WriteByte (&client->message, prog->edicts->fields.server->sounds);
+ MSG_WriteByte (&client->netconnection->message, svc_cdtrack);
+ MSG_WriteByte (&client->netconnection->message, (int)prog->edicts->fields.server->sounds);
+ MSG_WriteByte (&client->netconnection->message, (int)prog->edicts->fields.server->sounds);
// set view
- MSG_WriteByte (&client->message, svc_setview);
- MSG_WriteShort (&client->message, PRVM_NUM_FOR_EDICT(client->edict));
+ MSG_WriteByte (&client->netconnection->message, svc_setview);
+ MSG_WriteShort (&client->netconnection->message, PRVM_NUM_FOR_EDICT(client->edict));
- MSG_WriteByte (&client->message, svc_signonnum);
- MSG_WriteByte (&client->message, 1);
+ MSG_WriteByte (&client->netconnection->message, svc_signonnum);
+ MSG_WriteByte (&client->netconnection->message, 1);
- client->sendsignon = true;
client->spawned = false; // need prespawn, spawn, etc
}
client = svs.clients + clientnum;
+ if(netconnection)//[515]: bots don't play with csqc =)
+ EntityFrameCSQC_InitClientVersions(clientnum, false);
+
// set up the client_t
if (sv.loadgame)
memcpy (spawn_parms, client->spawn_parms, sizeof(spawn_parms));
strcpy(client->old_name, "unconnected");
client->spawned = false;
client->edict = PRVM_EDICT_NUM(clientnum+1);
- client->message.data = client->msgbuf;
- client->message.maxsize = sizeof(client->msgbuf);
- client->message.allowoverflow = true; // we can catch it
+ if (client->netconnection)
+ client->netconnection->message.allowoverflow = true; // we can catch it
// updated by receiving "rate" command from client
client->rate = NET_MINRATE;
// no limits for local player
PRVM_ExecuteProgram (prog->globals.server->SetNewParms, "QC function SetNewParms is missing");
for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
client->spawn_parms[i] = (&prog->globals.server->parm1)[i];
+
+ // set up the entity for this client (including .colormap, .team, etc)
+ PRVM_ED_ClearEdict(client->edict);
}
// don't call SendServerinfo for a fresh botclient because its fields have
*/
int sv_writeentitiestoclient_pvsbytes;
-qbyte sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
+unsigned char sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
static int numsendentities;
static entity_state_t sendentities[MAX_EDICTS];
static entity_state_t *sendentitiesindex[MAX_EDICTS];
-void SV_PrepareEntitiesForSending(void)
+qboolean SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *cs, int e)
{
- int e, i;
+ int i;
+ unsigned int modelindex, effects, flags, glowsize, lightstyle, lightpflags, light[4], specialvisibilityradius;
+ unsigned int customizeentityforclient;
float f;
- prvm_edict_t *ent;
+ vec3_t cullmins, cullmaxs;
+ model_t *model;
prvm_eval_t *val;
- entity_state_t cs;
- // send all entities that touch the pvs
- numsendentities = 0;
- sendentitiesindex[0] = NULL;
- for (e = 1, ent = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ent = PRVM_NEXT_EDICT(ent))
- {
- sendentitiesindex[e] = NULL;
- if (ent->priv.server->free)
- continue;
- cs = defaultstate;
- cs.active = true;
- cs.number = e;
- VectorCopy(ent->fields.server->origin, cs.origin);
- VectorCopy(ent->fields.server->angles, cs.angles);
- cs.flags = 0;
- cs.effects = (unsigned)ent->fields.server->effects;
- cs.colormap = (unsigned)ent->fields.server->colormap;
- cs.skin = (unsigned)ent->fields.server->skin;
- cs.frame = (unsigned)ent->fields.server->frame;
- cs.viewmodelforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)->edict;
- cs.exteriormodelforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)->edict;
- cs.nodrawtoclient = PRVM_GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)->edict;
- cs.drawonlytoclient = PRVM_GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)->edict;
- cs.tagentity = PRVM_GETEDICTFIELDVALUE(ent, eval_tag_entity)->edict;
- cs.tagindex = (qbyte)PRVM_GETEDICTFIELDVALUE(ent, eval_tag_index)->_float;
- i = (int)(PRVM_GETEDICTFIELDVALUE(ent, eval_glow_size)->_float * 0.25f);
- cs.glowsize = (qbyte)bound(0, i, 255);
- if (PRVM_GETEDICTFIELDVALUE(ent, eval_glow_trail)->_float)
- cs.flags |= RENDER_GLOWTRAIL;
-
- // don't need to init cs.colormod because the defaultstate did that for us
- //cs.colormod[0] = cs.colormod[1] = cs.colormod[2] = 32;
- val = PRVM_GETEDICTFIELDVALUE(ent, eval_colormod);
- if (val->vector[0] || val->vector[1] || val->vector[2])
+ // EF_NODRAW prevents sending for any reason except for your own
+ // client, so we must keep all clients in this superset
+ effects = (unsigned)ent->fields.server->effects;
+
+ // 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
+ i = (int)ent->fields.server->modelindex;
+ modelindex = (i >= 1 && i < MAX_MODELS && *PRVM_GetString(ent->fields.server->model)) ? i : 0;
+
+ flags = 0;
+ i = (int)(PRVM_GETEDICTFIELDVALUE(ent, eval_glow_size)->_float * 0.25f);
+ glowsize = (unsigned char)bound(0, i, 255);
+ if (PRVM_GETEDICTFIELDVALUE(ent, eval_glow_trail)->_float)
+ flags |= RENDER_GLOWTRAIL;
+
+ f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[0]*256;
+ light[0] = (unsigned short)bound(0, f, 65535);
+ f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[1]*256;
+ light[1] = (unsigned short)bound(0, f, 65535);
+ f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[2]*256;
+ light[2] = (unsigned short)bound(0, f, 65535);
+ f = PRVM_GETEDICTFIELDVALUE(ent, eval_light_lev)->_float;
+ light[3] = (unsigned short)bound(0, f, 65535);
+ lightstyle = (unsigned char)PRVM_GETEDICTFIELDVALUE(ent, eval_style)->_float;
+ lightpflags = (unsigned char)PRVM_GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
+
+ if (gamemode == GAME_TENEBRAE)
+ {
+ // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
+ if (effects & 16)
+ {
+ effects &= ~16;
+ lightpflags |= PFLAGS_FULLDYNAMIC;
+ }
+ // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
+ if (effects & 32)
{
- i = val->vector[0] * 32.0f;cs.colormod[0] = bound(0, i, 255);
- i = val->vector[1] * 32.0f;cs.colormod[1] = bound(0, i, 255);
- i = val->vector[2] * 32.0f;cs.colormod[2] = bound(0, i, 255);
+ effects &= ~32;
+ light[0] = (int)(0.2*256);
+ light[1] = (int)(1.0*256);
+ light[2] = (int)(0.2*256);
+ light[3] = 200;
+ lightpflags |= PFLAGS_FULLDYNAMIC;
}
+ }
+
+ specialvisibilityradius = 0;
+ if (lightpflags & PFLAGS_FULLDYNAMIC)
+ specialvisibilityradius = max(specialvisibilityradius, light[3]);
+ if (glowsize)
+ specialvisibilityradius = max(specialvisibilityradius, glowsize * 4);
+ if (flags & RENDER_GLOWTRAIL)
+ specialvisibilityradius = max(specialvisibilityradius, 100);
+ if (effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
+ {
+ if (effects & EF_BRIGHTFIELD)
+ specialvisibilityradius = max(specialvisibilityradius, 80);
+ if (effects & EF_MUZZLEFLASH)
+ specialvisibilityradius = max(specialvisibilityradius, 100);
+ if (effects & EF_BRIGHTLIGHT)
+ specialvisibilityradius = max(specialvisibilityradius, 400);
+ if (effects & EF_DIMLIGHT)
+ specialvisibilityradius = max(specialvisibilityradius, 200);
+ if (effects & EF_RED)
+ specialvisibilityradius = max(specialvisibilityradius, 200);
+ if (effects & EF_BLUE)
+ specialvisibilityradius = max(specialvisibilityradius, 200);
+ if (effects & EF_FLAME)
+ specialvisibilityradius = max(specialvisibilityradius, 250);
+ if (effects & EF_STARDUST)
+ specialvisibilityradius = max(specialvisibilityradius, 100);
+ }
+
+ // early culling checks
+ // (final culling is done by SV_MarkWriteEntityStateToClient)
+ customizeentityforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_customizeentityforclient)->function;
+ if (!customizeentityforclient)
+ {
+ if (e > svs.maxclients && (!modelindex && !specialvisibilityradius))
+ return false;
+ // this 2 billion unit check is actually to detect NAN origins
+ // (we really don't want to send those)
+ if (VectorLength2(ent->fields.server->origin) > 2000000000.0*2000000000.0)
+ return false;
+ }
+
+
+ *cs = defaultstate;
+ cs->active = true;
+ cs->number = e;
+ VectorCopy(ent->fields.server->origin, cs->origin);
+ VectorCopy(ent->fields.server->angles, cs->angles);
+ cs->flags = flags;
+ cs->effects = effects;
+ cs->colormap = (unsigned)ent->fields.server->colormap;
+ cs->modelindex = modelindex;
+ cs->skin = (unsigned)ent->fields.server->skin;
+ cs->frame = (unsigned)ent->fields.server->frame;
+ cs->viewmodelforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)->edict;
+ cs->exteriormodelforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)->edict;
+ cs->nodrawtoclient = PRVM_GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)->edict;
+ cs->drawonlytoclient = PRVM_GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)->edict;
+ cs->customizeentityforclient = customizeentityforclient;
+ cs->tagentity = PRVM_GETEDICTFIELDVALUE(ent, eval_tag_entity)->edict;
+ cs->tagindex = (unsigned char)PRVM_GETEDICTFIELDVALUE(ent, eval_tag_index)->_float;
+ cs->glowsize = glowsize;
+
+ // don't need to init cs->colormod because the defaultstate did that for us
+ //cs->colormod[0] = cs->colormod[1] = cs->colormod[2] = 32;
+ val = PRVM_GETEDICTFIELDVALUE(ent, eval_colormod);
+ if (val->vector[0] || val->vector[1] || val->vector[2])
+ {
+ i = (int)(val->vector[0] * 32.0f);cs->colormod[0] = bound(0, i, 255);
+ i = (int)(val->vector[1] * 32.0f);cs->colormod[1] = bound(0, i, 255);
+ i = (int)(val->vector[2] * 32.0f);cs->colormod[2] = bound(0, i, 255);
+ }
+
+ cs->modelindex = modelindex;
+
+ cs->alpha = 255;
+ f = (PRVM_GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f);
+ if (f)
+ {
+ i = (int)f;
+ cs->alpha = (unsigned char)bound(0, i, 255);
+ }
+ // halflife
+ f = (PRVM_GETEDICTFIELDVALUE(ent, eval_renderamt)->_float);
+ if (f)
+ {
+ i = (int)f;
+ cs->alpha = (unsigned char)bound(0, i, 255);
+ }
- cs.modelindex = 0;
- i = (int)ent->fields.server->modelindex;
- if (i >= 1 && i < MAX_MODELS && *PRVM_GetString(ent->fields.server->model))
- cs.modelindex = i;
+ cs->scale = 16;
+ f = (PRVM_GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
+ if (f)
+ {
+ i = (int)f;
+ cs->scale = (unsigned char)bound(0, i, 255);
+ }
- cs.alpha = 255;
- f = (PRVM_GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f);
- if (f)
+ cs->glowcolor = 254;
+ f = (PRVM_GETEDICTFIELDVALUE(ent, eval_glow_color)->_float);
+ if (f)
+ cs->glowcolor = (int)f;
+
+ if (PRVM_GETEDICTFIELDVALUE(ent, eval_fullbright)->_float)
+ cs->effects |= EF_FULLBRIGHT;
+
+ if (ent->fields.server->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->fields.server->colormap >= 1024)
+ cs->flags |= RENDER_COLORMAPPED;
+ if (cs->viewmodelforclient)
+ cs->flags |= RENDER_VIEWMODEL; // show relative to the view
+
+ cs->light[0] = light[0];
+ cs->light[1] = light[1];
+ cs->light[2] = light[2];
+ cs->light[3] = light[3];
+ cs->lightstyle = lightstyle;
+ cs->lightpflags = lightpflags;
+
+ cs->specialvisibilityradius = specialvisibilityradius;
+
+ // calculate the visible box of this entity (don't use the physics box
+ // as that is often smaller than a model, and would not count
+ // specialvisibilityradius)
+ if ((model = sv.models[modelindex]))
+ {
+ float scale = cs->scale * (1.0f / 16.0f);
+ if (cs->angles[0] || cs->angles[2]) // pitch and roll
{
- i = (int)f;
- cs.alpha = (qbyte)bound(0, i, 255);
+ VectorMA(cs->origin, scale, model->rotatedmins, cullmins);
+ VectorMA(cs->origin, scale, model->rotatedmaxs, cullmaxs);
}
- // halflife
- f = (PRVM_GETEDICTFIELDVALUE(ent, eval_renderamt)->_float);
- if (f)
+ else if (cs->angles[1])
{
- i = (int)f;
- cs.alpha = (qbyte)bound(0, i, 255);
+ VectorMA(cs->origin, scale, model->yawmins, cullmins);
+ VectorMA(cs->origin, scale, model->yawmaxs, cullmaxs);
}
-
- cs.scale = 16;
- f = (PRVM_GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
- if (f)
+ else
{
- i = (int)f;
- cs.scale = (qbyte)bound(0, i, 255);
+ VectorMA(cs->origin, scale, model->normalmins, cullmins);
+ VectorMA(cs->origin, scale, model->normalmaxs, cullmaxs);
}
-
- cs.glowcolor = 254;
- f = (PRVM_GETEDICTFIELDVALUE(ent, eval_glow_color)->_float);
- if (f)
- cs.glowcolor = (int)f;
-
- if (PRVM_GETEDICTFIELDVALUE(ent, eval_fullbright)->_float)
- cs.effects |= EF_FULLBRIGHT;
-
- if (ent->fields.server->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->fields.server->colormap >= 1024)
- cs.flags |= RENDER_COLORMAPPED;
- if (cs.viewmodelforclient)
- cs.flags |= RENDER_VIEWMODEL; // show relative to the view
-
- f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[0]*256;
- cs.light[0] = (unsigned short)bound(0, f, 65535);
- f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[1]*256;
- cs.light[1] = (unsigned short)bound(0, f, 65535);
- f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[2]*256;
- cs.light[2] = (unsigned short)bound(0, f, 65535);
- f = PRVM_GETEDICTFIELDVALUE(ent, eval_light_lev)->_float;
- cs.light[3] = (unsigned short)bound(0, f, 65535);
- cs.lightstyle = (qbyte)PRVM_GETEDICTFIELDVALUE(ent, eval_style)->_float;
- cs.lightpflags = (qbyte)PRVM_GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
-
- if (gamemode == GAME_TENEBRAE)
+ }
+ else
+ {
+ // if there is no model (or it could not be loaded), use the physics box
+ VectorAdd(cs->origin, ent->fields.server->mins, cullmins);
+ VectorAdd(cs->origin, ent->fields.server->maxs, cullmaxs);
+ }
+ if (specialvisibilityradius)
+ {
+ cullmins[0] = min(cullmins[0], cs->origin[0] - specialvisibilityradius);
+ cullmins[1] = min(cullmins[1], cs->origin[1] - specialvisibilityradius);
+ cullmins[2] = min(cullmins[2], cs->origin[2] - specialvisibilityradius);
+ cullmaxs[0] = max(cullmaxs[0], cs->origin[0] + specialvisibilityradius);
+ cullmaxs[1] = max(cullmaxs[1], cs->origin[1] + specialvisibilityradius);
+ cullmaxs[2] = max(cullmaxs[2], cs->origin[2] + specialvisibilityradius);
+ }
+ if (!VectorCompare(cullmins, ent->priv.server->cullmins) || !VectorCompare(cullmaxs, ent->priv.server->cullmaxs))
+ {
+ VectorCopy(cullmins, ent->priv.server->cullmins);
+ VectorCopy(cullmaxs, ent->priv.server->cullmaxs);
+ ent->priv.server->pvs_numclusters = -1;
+ if (sv.worldmodel && sv.worldmodel->brush.FindBoxClusters)
{
- // 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;
- }
+ i = sv.worldmodel->brush.FindBoxClusters(sv.worldmodel, cullmins, cullmaxs, MAX_ENTITYCLUSTERS, ent->priv.server->pvs_clusterlist);
+ if (i <= MAX_ENTITYCLUSTERS)
+ ent->priv.server->pvs_numclusters = i;
}
+ }
+
+ return true;
+}
- 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))
+void SV_PrepareEntitiesForSending(void)
+{
+ int e;
+ prvm_edict_t *ent;
+ // send all entities that touch the pvs
+ numsendentities = 0;
+ sendentitiesindex[0] = NULL;
+ memset(sendentitiesindex, 0, prog->num_edicts * sizeof(entity_state_t *));
+ for (e = 1, ent = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ent = PRVM_NEXT_EDICT(ent))
+ {
+ if (!ent->priv.server->free && SV_PrepareEntityForSending(ent, sendentities + numsendentities, e))
{
- 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);
+ sendentitiesindex[e] = sendentities + numsendentities;
+ numsendentities++;
}
-
- 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;
}
}
void SV_MarkWriteEntityStateToClient(entity_state_t *s)
{
int isbmodel;
- vec3_t entmins, entmaxs, lightmins, lightmaxs, testorigin;
+ vec3_t testorigin;
model_t *model;
+ prvm_edict_t *ed;
trace_t trace;
if (sententitiesconsideration[s->number] == sententitiesmark)
return;
sententitiesconsideration[s->number] = sententitiesmark;
- // viewmodels don't have visibility checking
- if (s->viewmodelforclient)
+ sv_writeentitiestoclient_totalentities++;
+
+ if (s->customizeentityforclient)
{
- if (s->viewmodelforclient != sv_writeentitiestoclient_clentnum)
+ prog->globals.server->self = s->number;
+ prog->globals.server->other = sv_writeentitiestoclient_clentnum;
+ PRVM_ExecuteProgram(s->customizeentityforclient, "customizeentityforclient: NULL function");
+ if(!PRVM_G_FLOAT(OFS_RETURN) || !SV_PrepareEntityForSending(PRVM_EDICT_NUM(s->number), s, s->number))
return;
}
+
// never reject player
- else if (s->number != sv_writeentitiestoclient_clentnum)
+ if (s->number != sv_writeentitiestoclient_clentnum)
{
// check various rejection conditions
if (s->nodrawtoclient == sv_writeentitiestoclient_clentnum)
// LordHavoc: only send entities with a model or important effects
if (!s->modelindex && s->specialvisibilityradius == 0)
return;
- if (s->tagentity)
+
+ // viewmodels don't have visibility checking
+ if (s->viewmodelforclient)
+ {
+ if (s->viewmodelforclient != sv_writeentitiestoclient_clentnum)
+ return;
+ }
+ else if (s->tagentity)
{
// tag attached entities simply check their parent
if (!sendentitiesindex[s->tagentity])
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
- // 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 || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)))
+ // always send world submodels in newer protocols because they don't
+ // generate much traffic (in old protocols they hog bandwidth)
+ else if (!(s->effects & EF_NODEPTHTEST) && !((isbmodel = (model = sv.models[s->modelindex]) != NULL && model->name[0] == '*') && (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE)))
{
- 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)
+ ed = PRVM_EDICT_NUM(s->number);
+
+ // if not touching a visible leaf
+ if (sv_cullentities_pvs.integer && sv_writeentitiestoclient_pvsbytes)
{
- if (s->angles[0] || s->angles[2]) // pitch and roll
- {
- VectorAdd(entmins, model->rotatedmins, entmins);
- VectorAdd(entmaxs, model->rotatedmaxs, entmaxs);
- }
- else if (s->angles[1])
+ if (ed->priv.server->pvs_numclusters < 0)
{
- VectorAdd(entmins, model->yawmins, entmins);
- VectorAdd(entmaxs, model->yawmaxs, entmaxs);
+ // entity too big for clusters list
+ if (sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
+ {
+ sv_writeentitiestoclient_culled_pvs++;
+ return;
+ }
}
else
{
- VectorAdd(entmins, model->normalmins, entmins);
- VectorAdd(entmaxs, model->normalmaxs, entmaxs);
+ int i;
+ // check cached clusters list
+ for (i = 0;i < ed->priv.server->pvs_numclusters;i++)
+ if (CHECKPVSBIT(sv_writeentitiestoclient_pvs, ed->priv.server->pvs_clusterlist[i]))
+ break;
+ if (i == ed->priv.server->pvs_numclusters)
+ {
+ sv_writeentitiestoclient_culled_pvs++;
+ return;
+ }
}
}
- 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_writeentitiestoclient_pvsbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, lightmins, lightmaxs))
- {
- sv_writeentitiestoclient_culled_pvs++;
- return;
- }
+
// or not seen by random tracelines
if (sv_cullentities_trace.integer && !isbmodel)
{
// 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))
+ testorigin[0] = (ed->priv.server->cullmins[0] + ed->priv.server->cullmaxs[0]) * 0.5f;
+ testorigin[1] = (ed->priv.server->cullmins[1] + ed->priv.server->cullmaxs[1]) * 0.5f;
+ testorigin[2] = (ed->priv.server->cullmins[2] + ed->priv.server->cullmaxs[2]) * 0.5f;
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, SUPERCONTENTS_SOLID);
+ if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
else
{
// 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))
+ testorigin[0] = lhrandom(ed->priv.server->cullmins[0], ed->priv.server->cullmaxs[0]);
+ testorigin[1] = lhrandom(ed->priv.server->cullmins[1], ed->priv.server->cullmaxs[1]);
+ testorigin[2] = lhrandom(ed->priv.server->cullmins[2], ed->priv.server->cullmaxs[2]);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, SUPERCONTENTS_SOLID);
+ if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
else
{
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))
+ testorigin[0] = lhrandom(ed->priv.server->cullmins[0], ed->priv.server->cullmaxs[0]);
+ testorigin[1] = lhrandom(ed->priv.server->cullmins[1], ed->priv.server->cullmaxs[1]);
+ testorigin[2] = lhrandom(ed->priv.server->cullmins[2], ed->priv.server->cullmaxs[2]);
+ sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, SUPERCONTENTS_SOLID);
+ if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
}
}
return;
}
}
- 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
+ sv_writeentitiestoclient_visibleentities++;
sententities[s->number] = sententitiesmark;
}
entity_state_t sendstates[MAX_EDICTS];
+extern int csqc_clent;
void SV_WriteEntitiesToClient(client_t *client, prvm_edict_t *clent, sizebuf_t *msg, int *stats)
{
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->fields.server->origin, clent->fields.server->view_ofs, sv_writeentitiestoclient_testeye);
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 = PRVM_EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
+ csqc_clent = sv_writeentitiestoclient_clentnum = PRVM_EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
sententitiesmark++;
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);
+ EntityFrameCSQC_WriteFrame(msg, numsendstates, sendstates);
+
if (client->entitydatabase5)
EntityFrame5_WriteFrame(msg, client->entitydatabase5, numsendstates, sendstates, client - svs.clients + 1, stats, client->movesequence);
else if (client->entitydatabase4)
int items;
prvm_eval_t *val;
vec3_t punchvector;
- qbyte viewzoom;
- int weaponmodelindex;
+ int viewzoom;
+ const char *s;
//
// send a damage message
{
other = PRVM_PROG_TO_EDICT(ent->fields.server->dmg_inflictor);
MSG_WriteByte (msg, svc_damage);
- MSG_WriteByte (msg, ent->fields.server->dmg_save);
- MSG_WriteByte (msg, ent->fields.server->dmg_take);
+ MSG_WriteByte (msg, (int)ent->fields.server->dmg_save);
+ MSG_WriteByte (msg, (int)ent->fields.server->dmg_take);
for (i=0 ; i<3 ; i++)
MSG_WriteCoord (msg, other->fields.server->origin[i] + 0.5*(other->fields.server->mins[i] + other->fields.server->maxs[i]), sv.protocol);
// stuff the sigil bits into the high bits of items for sbar, or else
// mix in items2
val = PRVM_GETEDICTFIELDVALUE(ent, eval_items2);
- if (val)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
items = (int)ent->fields.server->items | ((int)val->_float << 23);
else
items = (int)ent->fields.server->items | ((int)prog->globals.server->serverflags << 28);
if ((val = PRVM_GETEDICTFIELDVALUE(ent, eval_punchvector)))
VectorCopy(val->vector, punchvector);
- weaponmodelindex = SV_ModelIndex(PRVM_GetString(ent->fields.server->weaponmodel), 1);
+ // cache weapon model name and index in client struct to save time
+ // (this search can be almost 1% of cpu time!)
+ s = PRVM_GetString(ent->fields.server->weaponmodel);
+ if (strcmp(s, client->weaponmodel))
+ {
+ strlcpy(client->weaponmodel, s, sizeof(client->weaponmodel));
+ client->weaponmodelindex = SV_ModelIndex(s, 1);
+ }
viewzoom = 255;
if ((val = PRVM_GETEDICTFIELDVALUE(ent, eval_viewzoom)))
- viewzoom = val->_float * 255.0f;
+ viewzoom = (int)(val->_float * 255.0f);
if (viewzoom == 0)
viewzoom = 255;
}
memset(stats, 0, sizeof(int[MAX_CL_STATS]));
- stats[STAT_VIEWHEIGHT] = ent->fields.server->view_ofs[2];
+ stats[STAT_VIEWHEIGHT] = (int)ent->fields.server->view_ofs[2];
stats[STAT_ITEMS] = items;
- stats[STAT_WEAPONFRAME] = ent->fields.server->weaponframe;
- stats[STAT_ARMOR] = ent->fields.server->armorvalue;
- stats[STAT_WEAPON] = weaponmodelindex;
- stats[STAT_HEALTH] = ent->fields.server->health;
- stats[STAT_AMMO] = ent->fields.server->currentammo;
- stats[STAT_SHELLS] = ent->fields.server->ammo_shells;
- stats[STAT_NAILS] = ent->fields.server->ammo_nails;
- stats[STAT_ROCKETS] = ent->fields.server->ammo_rockets;
- stats[STAT_CELLS] = ent->fields.server->ammo_cells;
- stats[STAT_ACTIVEWEAPON] = ent->fields.server->weapon;
+ stats[STAT_WEAPONFRAME] = (int)ent->fields.server->weaponframe;
+ stats[STAT_ARMOR] = (int)ent->fields.server->armorvalue;
+ stats[STAT_WEAPON] = client->weaponmodelindex;
+ stats[STAT_HEALTH] = (int)ent->fields.server->health;
+ stats[STAT_AMMO] = (int)ent->fields.server->currentammo;
+ stats[STAT_SHELLS] = (int)ent->fields.server->ammo_shells;
+ stats[STAT_NAILS] = (int)ent->fields.server->ammo_nails;
+ stats[STAT_ROCKETS] = (int)ent->fields.server->ammo_rockets;
+ stats[STAT_CELLS] = (int)ent->fields.server->ammo_cells;
+ stats[STAT_ACTIVEWEAPON] = (int)ent->fields.server->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
MSG_WriteChar (msg, stats[STAT_VIEWHEIGHT]);
if (bits & SU_IDEALPITCH)
- MSG_WriteChar (msg, ent->fields.server->idealpitch);
+ MSG_WriteChar (msg, (int)ent->fields.server->idealpitch);
for (i=0 ; i<3 ; i++)
{
if (bits & (SU_PUNCH1<<i))
{
if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
- MSG_WriteChar(msg, ent->fields.server->punchangle[i]);
+ MSG_WriteChar(msg, (int)ent->fields.server->punchangle[i]);
else
MSG_WriteAngle16i(msg, ent->fields.server->punchangle[i]);
}
if (bits & (SU_VELOCITY1<<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->fields.server->velocity[i] * (1.0f / 16.0f));
+ MSG_WriteChar(msg, (int)(ent->fields.server->velocity[i] * (1.0f / 16.0f)));
else
MSG_WriteCoord32f(msg, ent->fields.server->velocity[i]);
}
MSG_WriteShort (msg, stats[STAT_CELLS]);
MSG_WriteShort (msg, stats[STAT_ACTIVEWEAPON]);
if (bits & SU_VIEWZOOM)
- MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535));
+ MSG_WriteShort (msg, bound(0, stats[STAT_VIEWZOOM], 65535));
}
else if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
{
if (bits & SU_VIEWZOOM)
{
if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
- MSG_WriteByte (msg, min(stats[STAT_VIEWZOOM], 255));
+ MSG_WriteByte (msg, bound(0, stats[STAT_VIEWZOOM], 255));
else
- MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535));
+ MSG_WriteShort (msg, bound(0, stats[STAT_VIEWZOOM], 65535));
}
}
}
SV_SendClientDatagram
=======================
*/
-static qbyte sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
-qboolean SV_SendClientDatagram (client_t *client)
+static unsigned char sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
+void SV_SendClientDatagram (client_t *client)
{
int rate, maxrate, maxsize, maxsize2;
sizebuf_t msg;
if (sv_maxrate.integer != maxrate)
Cvar_SetValueQuick(&sv_maxrate, maxrate);
+ // this rate limiting does not understand sys_ticrate 0
+ // (but no one should be running that on a server!)
rate = bound(NET_MINRATE, client->rate, maxrate);
rate = (int)(client->rate * sys_ticrate.value);
maxsize = bound(100, rate, 1400);
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, client->edict, &msg, stats);
- SV_WriteEntitiesToClient (client, client->edict, &msg, stats);
-
- // 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 (NetConn_SendUnreliableMessage (client->netconnection, &msg) == -1)
+ if (host_client->spawned)
{
- SV_DropClient (true);// if the message couldn't send, kick off
- return false;
+ MSG_WriteByte (&msg, svc_time);
+ MSG_WriteFloat (&msg, sv.time);
+
+ // add the client specific data to the datagram
+ SV_WriteClientdataToMessage (client, client->edict, &msg, stats);
+ VM_SV_WriteAutoSentStats (client, client->edict, &msg, stats);
+ SV_WriteEntitiesToClient (client, client->edict, &msg, stats);
+
+ // 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);
+ }
+ else if (realtime > client->keepalivetime)
+ {
+ // the player isn't totally in the game yet
+ // send small keepalive messages if too much time has passed
+ client->keepalivetime = realtime + 5;
+ MSG_WriteChar (&msg, svc_nop);
}
- return true;
+// send the datagram
+ NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol);
}
/*
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_Write (&client->netconnection->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
SZ_Clear (&sv.reliable_datagram);
}
-/*
-=======================
-SV_SendNop
-
-Send a nop message without trashing or sending the accumulated client
-message buffer
-=======================
-*/
-void SV_SendNop (client_t *client)
-{
- sizebuf_t msg;
- qbyte buf[4];
-
- msg.data = buf;
- msg.maxsize = sizeof(buf);
- msg.cursize = 0;
-
- MSG_WriteChar (&msg, svc_nop);
-
- if (NetConn_SendUnreliableMessage (client->netconnection, &msg) == -1)
- SV_DropClient (true); // if the message couldn't send, kick off
- client->last_message = realtime;
-}
-
/*
=======================
SV_SendClientMessages
{
int i, prepared = false;
+ if (sv.protocol == PROTOCOL_QUAKEWORLD)
+ Sys_Error("SV_SendClientMessages: no quakeworld support\n");
+
// update frags, names, etc
SV_UpdateToReliableMessages();
if (!host_client->active)
continue;
if (!host_client->netconnection)
- {
- SZ_Clear(&host_client->message);
continue;
- }
- if (host_client->message.overflowed)
+ if (host_client->netconnection->message.overflowed)
{
SV_DropClient (true); // if the message couldn't send, kick off
continue;
}
- if (host_client->spawned)
+ if (!prepared)
{
- if (!prepared)
- {
- prepared = true;
- // only prepare entities once per frame
- SV_PrepareEntitiesForSending();
- }
- if (!SV_SendClientDatagram (host_client))
- continue;
- }
- else
- {
- // the player isn't totally in the game yet
- // send small keepalive messages if too much time has passed
- // send a full message when the next signon stage has been requested
- // some other message data (name changes, etc) may accumulate
- // between signon stages
- if (!host_client->sendsignon)
- {
- if (realtime - host_client->last_message > 5)
- SV_SendNop (host_client);
- continue; // don't send out non-signon messages
- }
- }
-
- if (host_client->message.cursize || host_client->dropasap)
- {
- if (!NetConn_CanSendMessage (host_client->netconnection))
- continue;
-
- if (host_client->dropasap)
- SV_DropClient (false); // went to another level
- else
- {
- 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;
- host_client->sendsignon = false;
- }
+ prepared = true;
+ // only prepare entities once per frame
+ SV_PrepareEntitiesForSending();
}
+ SV_SendClientDatagram (host_client);
}
// clear muzzle flashes
// create entity baseline
VectorCopy (svent->fields.server->origin, svent->priv.server->baseline.origin);
VectorCopy (svent->fields.server->angles, svent->priv.server->baseline.angles);
- svent->priv.server->baseline.frame = svent->fields.server->frame;
- svent->priv.server->baseline.skin = svent->fields.server->skin;
+ svent->priv.server->baseline.frame = (int)svent->fields.server->frame;
+ svent->priv.server->baseline.skin = (int)svent->fields.server->skin;
if (entnum > 0 && entnum <= svs.maxclients)
{
svent->priv.server->baseline.colormap = entnum;
else
{
svent->priv.server->baseline.colormap = 0;
- svent->priv.server->baseline.modelindex = svent->fields.server->modelindex;
+ svent->priv.server->baseline.modelindex = (int)svent->fields.server->modelindex;
}
large = false;
}
-/*
-================
-SV_SendReconnect
-
-Tell all the clients that the server is changing levels
-================
-*/
-void SV_SendReconnect (void)
-{
- char data[128];
- sizebuf_t msg;
-
- msg.data = data;
- msg.cursize = 0;
- msg.maxsize = sizeof(data);
-
- MSG_WriteChar (&msg, svc_stufftext);
- MSG_WriteString (&msg, "reconnect\n");
- NetConn_SendToAll (&msg, 5);
-
- if (cls.state != ca_dedicated)
- Cmd_ExecuteString ("reconnect\n", src_command);
-}
-
-
/*
================
SV_SaveSpawnparms
{
int i, j;
- svs.serverflags = prog->globals.server->serverflags;
+ svs.serverflags = (int)prog->globals.server->serverflags;
for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
{
- ent->priv.vp = (qbyte*) prog->edictprivate + i * prog->edictprivate_size;
- ent->fields.server = (void *)((qbyte *)prog->edictsfields + i * prog->edict_size);
+ ent->priv.vp = (unsigned char*) prog->edictprivate + i * prog->edictprivate_size;
+ ent->fields.server = (void *)((unsigned char *)prog->edictsfields + i * prog->edict_size);
// link every entity except world
if (!ent->priv.server->free)
SV_LinkEdict(ent, false);
{
prvm_edict_t *ent;
int i;
- qbyte *entities;
+ char *entities;
model_t *worldmodel;
char modelname[sizeof(sv.modelname)];
//
if (sv.active)
{
- SV_VM_Begin();
- SV_SendReconnect();
- SV_VM_End();
+ client_t *client;
+ for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
+ {
+ if (client->netconnection)
+ {
+ MSG_WriteByte(&client->netconnection->message, svc_stufftext);
+ MSG_WriteString(&client->netconnection->message, "reconnect\n");
+ }
+ }
}
else
{
- // make sure cvars have been checked before opening the ports
- NetConn_ServerFrame();
+ // open server port
NetConn_OpenServerPorts(true);
}
//
// set up the new server
//
- Host_ClearMemory ();
-
memset (&sv, 0, sizeof(sv));
+ // if running a local client, make sure it doesn't try to access the last
+ // level's data which is no longer valiud
+ cls.signon = 0;
+
+ SV_VM_Setup();
+
+ sv.active = true;
strlcpy (sv.name, server, sizeof (sv.name));
sv.protocol = PROTOCOL_QUAKE;
}
- SV_VM_Setup();
-
SV_VM_Begin();
// load progs to get entity field count
// progs fields, often accessed by server
prog->edictsfields = PR_Alloc(prog->max_edicts * prog->edict_size);*/
// used by PushMove to move back pushed entities
- sv.moved_edicts = PRVM_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
+ sv.moved_edicts = (prvm_edict_t **)PRVM_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
/*for (i = 0;i < prog->max_edicts;i++)
{
ent = prog->edicts + i;
- ent->priv.vp = (qbyte*) prog->edictprivate + i * prog->edictprivate_size;
- ent->fields.server = (void *)((qbyte *)prog->edictsfields + i * prog->edict_size);
+ ent->priv.vp = (unsigned char*) prog->edictprivate + i * prog->edictprivate_size;
+ ent->fields.server = (void *)((unsigned char *)prog->edictsfields + i * prog->edict_size);
}*/
- // fix up client->edict pointers for returning clients right away...
+ // reset client csqc entity versions right away.
for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
- host_client->edict = PRVM_EDICT_NUM(i + 1);
+ EntityFrameCSQC_InitClientVersions(i, true);
sv.datagram.maxsize = sizeof(sv.datagram_buf);
sv.datagram.cursize = 0;
// serverflags are for cross level information (sigils)
prog->globals.server->serverflags = svs.serverflags;
+ // we need to reset the spawned flag on all connected clients here so that
+ // their thinks don't run during startup (before PutClientInServer)
+ // we also need to set up the client entities now
+ // and we need to set the ->edict pointers to point into the progs edicts
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+ {
+ host_client->spawned = false;
+ host_client->edict = PRVM_EDICT_NUM(i + 1);
+ PRVM_ED_ClearEdict(host_client->edict);
+ }
+
// 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)
+ if (sv_entpatch.integer && (entities = (char *)FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true, NULL)))
{
Con_Printf("Loaded maps/%s.ent\n", sv.name);
PRVM_ED_LoadFromFile (entities);
// LordHavoc: clear world angles (to fix e3m3.bsp)
VectorClear(prog->edicts->fields.server->angles);
- sv.active = true;
-
// all setup is completed, any further precache statements are errors
sv.state = ss_active;
prog->allowworldwrites = false;
// run two frames to allow everything to settle
for (i = 0;i < 2;i++)
{
- sv.frametime = host_frametime = 0.1;
+ sv.frametime = 0.1;
SV_Physics ();
}
if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
SV_CreateBaseline ();
-// send serverinfo to all connected clients
- // (note this also handles botclients coming back from a level change)
+// send serverinfo to all connected clients, and set up botclients coming back from a level change
for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
- if (host_client->active)
+ {
+ if (!host_client->active)
+ continue;
+ if (host_client->netconnection)
SV_SendServerinfo(host_client);
+ else
+ {
+ int j;
+ // if client is a botclient coming from a level change, we need to
+ // set up client info that normally requires networking
+
+ // copy spawn parms out of the client_t
+ for (j=0 ; j< NUM_SPAWN_PARMS ; j++)
+ (&prog->globals.server->parm1)[j] = host_client->spawn_parms[j];
+
+ // call the spawn function
+ host_client->clientconnectcalled = true;
+ prog->globals.server->time = sv.time;
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+ PRVM_ExecuteProgram (prog->globals.server->ClientConnect, "QC function ClientConnect is missing");
+ PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
+ host_client->spawned = true;
+ }
+ }
Con_DPrint("Server spawned.\n");
NetConn_Heartbeat (2);
prvm_edict_t *ent;
PRVM_Free( sv.moved_edicts );
- sv.moved_edicts = PRVM_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
+ sv.moved_edicts = (prvm_edict_t **)PRVM_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
// links don't survive the transition, so unlink everything
for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
// LordHavoc: for consistency set these here
int num = PRVM_NUM_FOR_EDICT(e) - 1;
+ e->priv.server->move = false; // don't move on first frame
+
if (num >= 0 && num < svs.maxclients)
{
prvm_eval_t *val;
val->_float = svs.clients[num].colors;
// NEXUIZ_PLAYERMODEL and NEXUIZ_PLAYERSKIN
if( eval_playermodel )
- PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PRVM_SetEngineString(svs.clients[num].playermodel);
+ PRVM_GETEDICTFIELDVALUE(e, eval_playermodel)->string = PRVM_SetEngineString(svs.clients[num].playermodel);
if( eval_playerskin )
- PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PRVM_SetEngineString(svs.clients[num].playerskin);
+ PRVM_GETEDICTFIELDVALUE(e, eval_playerskin)->string = PRVM_SetEngineString(svs.clients[num].playerskin);
}
}
return true;
}
-cvar_t pr_checkextension = {CVAR_READONLY, "pr_checkextension", "1"};
-cvar_t nomonsters = {0, "nomonsters", "0"};
-cvar_t gamecfg = {0, "gamecfg", "0"};
-cvar_t scratch1 = {0, "scratch1", "0"};
-cvar_t scratch2 = {0,"scratch2", "0"};
-cvar_t scratch3 = {0, "scratch3", "0"};
-cvar_t scratch4 = {0, "scratch4", "0"};
-cvar_t savedgamecfg = {CVAR_SAVE, "savedgamecfg", "0"};
-cvar_t saved1 = {CVAR_SAVE, "saved1", "0"};
-cvar_t saved2 = {CVAR_SAVE, "saved2", "0"};
-cvar_t saved3 = {CVAR_SAVE, "saved3", "0"};
-cvar_t saved4 = {CVAR_SAVE, "saved4", "0"};
-cvar_t decors = {0, "decors", "0"};
-cvar_t nehx00 = {0, "nehx00", "0"};cvar_t nehx01 = {0, "nehx01", "0"};
-cvar_t nehx02 = {0, "nehx02", "0"};cvar_t nehx03 = {0, "nehx03", "0"};
-cvar_t nehx04 = {0, "nehx04", "0"};cvar_t nehx05 = {0, "nehx05", "0"};
-cvar_t nehx06 = {0, "nehx06", "0"};cvar_t nehx07 = {0, "nehx07", "0"};
-cvar_t nehx08 = {0, "nehx08", "0"};cvar_t nehx09 = {0, "nehx09", "0"};
-cvar_t nehx10 = {0, "nehx10", "0"};cvar_t nehx11 = {0, "nehx11", "0"};
-cvar_t nehx12 = {0, "nehx12", "0"};cvar_t nehx13 = {0, "nehx13", "0"};
-cvar_t nehx14 = {0, "nehx14", "0"};cvar_t nehx15 = {0, "nehx15", "0"};
-cvar_t nehx16 = {0, "nehx16", "0"};cvar_t nehx17 = {0, "nehx17", "0"};
-cvar_t nehx18 = {0, "nehx18", "0"};cvar_t nehx19 = {0, "nehx19", "0"};
-cvar_t cutscene = {0, "cutscene", "1"};
+cvar_t pr_checkextension = {CVAR_READONLY, "pr_checkextension", "1", "indicates to QuakeC that the standard quakec extensions system is available (if 0, quakec should not attempt to use extensions)"};
+cvar_t nomonsters = {0, "nomonsters", "0", "unused cvar in quake, can be used by mods"};
+cvar_t gamecfg = {0, "gamecfg", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch1 = {0, "scratch1", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch2 = {0,"scratch2", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch3 = {0, "scratch3", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch4 = {0, "scratch4", "0", "unused cvar in quake, can be used by mods"};
+cvar_t savedgamecfg = {CVAR_SAVE, "savedgamecfg", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved1 = {CVAR_SAVE, "saved1", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved2 = {CVAR_SAVE, "saved2", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved3 = {CVAR_SAVE, "saved3", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved4 = {CVAR_SAVE, "saved4", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t nehx00 = {0, "nehx00", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx01 = {0, "nehx01", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx02 = {0, "nehx02", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx03 = {0, "nehx03", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx04 = {0, "nehx04", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx05 = {0, "nehx05", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx06 = {0, "nehx06", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx07 = {0, "nehx07", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx08 = {0, "nehx08", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx09 = {0, "nehx09", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx10 = {0, "nehx10", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx11 = {0, "nehx11", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx12 = {0, "nehx12", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx13 = {0, "nehx13", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx14 = {0, "nehx14", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx15 = {0, "nehx15", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx16 = {0, "nehx16", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx17 = {0, "nehx17", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx18 = {0, "nehx18", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx19 = {0, "nehx19", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t cutscene = {0, "cutscene", "1", "enables cutscenes in nehahra, can be used by other mods"};
void SV_VM_Init(void)
{
Cvar_RegisterVariable (&saved2);
Cvar_RegisterVariable (&saved3);
Cvar_RegisterVariable (&saved4);
- // LordHavoc: for DarkPlaces, this overrides the number of decors (shell casings, gibs, etc)
- Cvar_RegisterVariable (&decors);
// LordHavoc: Nehahra uses these to pass data around cutscene demos
if (gamemode == GAME_NEHAHRA)
{
- Cvar_RegisterVariable (&nehx00);Cvar_RegisterVariable (&nehx01);
- Cvar_RegisterVariable (&nehx02);Cvar_RegisterVariable (&nehx03);
- Cvar_RegisterVariable (&nehx04);Cvar_RegisterVariable (&nehx05);
- Cvar_RegisterVariable (&nehx06);Cvar_RegisterVariable (&nehx07);
- Cvar_RegisterVariable (&nehx08);Cvar_RegisterVariable (&nehx09);
- Cvar_RegisterVariable (&nehx10);Cvar_RegisterVariable (&nehx11);
- Cvar_RegisterVariable (&nehx12);Cvar_RegisterVariable (&nehx13);
- Cvar_RegisterVariable (&nehx14);Cvar_RegisterVariable (&nehx15);
- Cvar_RegisterVariable (&nehx16);Cvar_RegisterVariable (&nehx17);
- Cvar_RegisterVariable (&nehx18);Cvar_RegisterVariable (&nehx19);
+ Cvar_RegisterVariable (&nehx00);
+ Cvar_RegisterVariable (&nehx01);
+ Cvar_RegisterVariable (&nehx02);
+ Cvar_RegisterVariable (&nehx03);
+ Cvar_RegisterVariable (&nehx04);
+ Cvar_RegisterVariable (&nehx05);
+ Cvar_RegisterVariable (&nehx06);
+ Cvar_RegisterVariable (&nehx07);
+ Cvar_RegisterVariable (&nehx08);
+ Cvar_RegisterVariable (&nehx09);
+ Cvar_RegisterVariable (&nehx10);
+ Cvar_RegisterVariable (&nehx11);
+ Cvar_RegisterVariable (&nehx12);
+ Cvar_RegisterVariable (&nehx13);
+ Cvar_RegisterVariable (&nehx14);
+ Cvar_RegisterVariable (&nehx15);
+ Cvar_RegisterVariable (&nehx16);
+ Cvar_RegisterVariable (&nehx17);
+ Cvar_RegisterVariable (&nehx18);
+ Cvar_RegisterVariable (&nehx19);
}
Cvar_RegisterVariable (&cutscene); // for Nehahra but useful to other mods as well
}
int eval_button6;
int eval_button7;
int eval_button8;
+int eval_button9;
+int eval_button10;
+int eval_button11;
+int eval_button12;
+int eval_button13;
+int eval_button14;
+int eval_button15;
+int eval_button16;
int eval_buttonuse;
int eval_buttonchat;
int eval_glow_size;
int eval_colormod;
int eval_playermodel;
int eval_playerskin;
+int eval_SendEntity;
+int eval_Version;
+int eval_customizeentityforclient;
+int eval_dphitcontentsmask;
+
+int gval_trace_dpstartcontents;
+int gval_trace_dphitcontents;
+int gval_trace_dphitq3surfaceflags;
+int gval_trace_dphittexturename;
mfunction_t *SV_PlayerPhysicsQC;
mfunction_t *EndFrameQC;
//KrimZon - SERVER COMMANDS IN QUAKEC
mfunction_t *SV_ParseClientCommandQC;
+ddef_t *PRVM_ED_FindGlobal(const char *name);
+
void SV_VM_FindEdictFieldOffsets(void)
{
eval_gravity = PRVM_ED_FindFieldOffset("gravity");
eval_button6 = PRVM_ED_FindFieldOffset("button6");
eval_button7 = PRVM_ED_FindFieldOffset("button7");
eval_button8 = PRVM_ED_FindFieldOffset("button8");
+ eval_button9 = PRVM_ED_FindFieldOffset("button9");
+ eval_button10 = PRVM_ED_FindFieldOffset("button10");
+ eval_button11 = PRVM_ED_FindFieldOffset("button11");
+ eval_button12 = PRVM_ED_FindFieldOffset("button12");
+ eval_button13 = PRVM_ED_FindFieldOffset("button13");
+ eval_button14 = PRVM_ED_FindFieldOffset("button14");
+ eval_button15 = PRVM_ED_FindFieldOffset("button15");
+ eval_button16 = PRVM_ED_FindFieldOffset("button16");
eval_buttonuse = PRVM_ED_FindFieldOffset("buttonuse");
eval_buttonchat = PRVM_ED_FindFieldOffset("buttonchat");
eval_glow_size = PRVM_ED_FindFieldOffset("glow_size");
eval_colormod = PRVM_ED_FindFieldOffset("colormod");
eval_playermodel = PRVM_ED_FindFieldOffset("playermodel");
eval_playerskin = PRVM_ED_FindFieldOffset("playerskin");
+ eval_SendEntity = PRVM_ED_FindFieldOffset("SendEntity");
+ eval_Version = PRVM_ED_FindFieldOffset("Version");
+ eval_customizeentityforclient = PRVM_ED_FindFieldOffset("customizeentityforclient");
+ eval_dphitcontentsmask = PRVM_ED_FindFieldOffset("dphitcontentsmask");
// LordHavoc: allowing QuakeC to override the player movement code
SV_PlayerPhysicsQC = PRVM_ED_FindFunction ("SV_PlayerPhysics");
EndFrameQC = PRVM_ED_FindFunction ("EndFrame");
//KrimZon - SERVER COMMANDS IN QUAKEC
SV_ParseClientCommandQC = PRVM_ED_FindFunction ("SV_ParseClientCommand");
+
+ //[515]: init stufftext string (it is sent before svc_serverinfo)
+ if(PRVM_ED_FindGlobal("SV_InitCmd") && PRVM_ED_FindGlobal("SV_InitCmd")->type & ev_string)
+ SV_InitCmd = PRVM_G_STRING(PRVM_ED_FindGlobal("SV_InitCmd")->ofs);
+ else
+ SV_InitCmd = NULL;
+
+ gval_trace_dpstartcontents = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
+ gval_trace_dphitcontents = PRVM_ED_FindGlobalOffset("trace_dphitcontents");
+ gval_trace_dphitq3surfaceflags = PRVM_ED_FindGlobalOffset("trace_dphitq3surfaceflags");
+ gval_trace_dphittexturename = PRVM_ED_FindGlobalOffset("trace_dphittexturename");
}
#define REQFIELDS (sizeof(reqfields) / sizeof(prvm_required_field_t))
{ev_float, "button6"},
{ev_float, "button7"},
{ev_float, "button8"},
+ {ev_float, "button9"},
+ {ev_float, "button10"},
+ {ev_float, "button11"},
+ {ev_float, "button12"},
+ {ev_float, "button13"},
+ {ev_float, "button14"},
+ {ev_float, "button15"},
+ {ev_float, "button16"},
{ev_float, "buttonchat"},
{ev_float, "buttonuse"},
{ev_float, "clientcolors"},
{ev_float, "scale"},
{ev_float, "style"},
{ev_float, "tag_index"},
+ {ev_float, "Version"},
{ev_float, "viewzoom"},
{ev_vector, "color"},
{ev_vector, "colormod"},
{ev_vector, "movement"},
{ev_vector, "punchvector"},
{ev_string, "playermodel"},
- {ev_string, "playerskin"}
+ {ev_string, "playerskin"},
+ {ev_function, "SendEntity"},
+ {ev_function, "customizeentityforclient"},
};
void SV_VM_Setup(void)
PRVM_LoadProgs( sv_progs.string, 0, NULL, REQFIELDS, reqfields );
SV_VM_FindEdictFieldOffsets();
+ VM_AutoSentStats_Clear();//[515]: csqc
+ EntityFrameCSQC_ClearVersions();//[515]: csqc
+
PRVM_End;
}
projects / xonotic / darkplaces.git / blobdiff