entnum = G_EDICTNUM(OFS_PARM0);
s = PF_VarString(1);
- if (entnum < 1 || entnum > svs.maxclients)
+ if (entnum < 1 || entnum > MAX_SCOREBOARD || !svs.connectedclients[entnum-1])
{
Con_Printf ("tried to sprint to a non-client\n");
return;
}
- client = &svs.clients[entnum-1];
-
- MSG_WriteChar (&client->message,svc_print);
- MSG_WriteString (&client->message, s );
+ client = svs.connectedclients[entnum-1];
+ MSG_WriteChar(&client->message,svc_print);
+ MSG_WriteString(&client->message, s );
}
entnum = G_EDICTNUM(OFS_PARM0);
s = PF_VarString(1);
- if (entnum < 1 || entnum > svs.maxclients)
+ if (entnum < 1 || entnum > MAX_SCOREBOARD || !svs.connectedclients[entnum-1])
{
Con_Printf ("tried to sprint to a non-client\n");
return;
}
- client = &svs.clients[entnum-1];
-
- MSG_WriteChar (&client->message,svc_centerprint);
- MSG_WriteString (&client->message, s );
+ client = svs.connectedclients[entnum-1];
+ MSG_WriteChar(&client->message,svc_centerprint);
+ MSG_WriteString(&client->message, s );
}
//============================================================================
+int checkpvsbytes;
qbyte checkpvs[MAX_MAP_LEAFS/8];
int PF_newcheckclient (int check)
// cycle to the next one
- if (check < 1)
- check = 1;
- if (check > svs.maxclients)
- check = svs.maxclients;
-
- if (check == svs.maxclients)
+ check = bound(1, check, MAX_SCOREBOARD);
+ if (check == MAX_SCOREBOARD)
i = 1;
else
i = check + 1;
for ( ; ; i++)
{
+ // count the cost
pr_xfunction->builtinsprofile++;
- if (i == svs.maxclients+1)
+ // wrap around
+ if (i == MAX_SCOREBOARD+1)
i = 1;
-
+ // look up the client's edict
ent = EDICT_NUM(i);
-
- if (i == check)
- break; // didn't find anything else
-
- if (ent->e->free)
- continue;
- if (ent->v->health <= 0)
- continue;
- if ((int)ent->v->flags & FL_NOTARGET)
+ // check if it is to be ignored, but never ignore the one we started on (prevent infinite loop)
+ if (i != check && (ent->e->free || ent->v->health <= 0 || ((int)ent->v->flags & FL_NOTARGET)))
continue;
-
- // anything that is a client, or has a client as an enemy
+ // found a valid client (possibly the same one again)
break;
}
// get the PVS for the entity
- VectorAdd (ent->v->origin, ent->v->view_ofs, org);
- memcpy (checkpvs, sv.worldmodel->brushq1.LeafPVS(sv.worldmodel, sv.worldmodel->brushq1.PointInLeaf(sv.worldmodel, org)), (sv.worldmodel->brushq1.numleafs+7)>>3 );
+ VectorAdd(ent->v->origin, ent->v->view_ofs, org);
+ checkpvsbytes = 0;
+ if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
+ checkpvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, org, 0, checkpvs, sizeof(checkpvs));
return i;
}
void PF_checkclient (void)
{
edict_t *ent, *self;
- mleaf_t *leaf;
- int l;
vec3_t view;
// find a new check if on a new frame
// if current entity can't possibly see the check entity, return 0
self = PROG_TO_EDICT(pr_global_struct->self);
- VectorAdd (self->v->origin, self->v->view_ofs, view);
- leaf = sv.worldmodel->brushq1.PointInLeaf(sv.worldmodel, view);
- if (leaf)
+ VectorAdd(self->v->origin, self->v->view_ofs, view);
+ if (sv.worldmodel && checkpvsbytes && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, checkpvs, view, view))
{
- l = (leaf - sv.worldmodel->brushq1.leafs) - 1;
- if ( (l<0) || !(checkpvs[l>>3] & (1<<(l&7)) ) )
- {
- c_notvis++;
- RETURN_EDICT(sv.edicts);
- return;
- }
+ c_notvis++;
+ RETURN_EDICT(sv.edicts);
+ return;
}
// might be able to see it
client_t *old;
entnum = G_EDICTNUM(OFS_PARM0);
- if (entnum < 1 || entnum > svs.maxclients)
+ if (entnum < 1 || entnum > MAX_SCOREBOARD)
Host_Error ("Parm 0 not a client");
str = G_STRING(OFS_PARM1);
old = host_client;
- host_client = &svs.clients[entnum-1];
- Host_ClientCommands ("%s", str);
+ if ((host_client = svs.connectedclients[entnum-1]))
+ Host_ClientCommands ("%s", str);
host_client = old;
}
ed = G_EDICT(OFS_PARM0);
if (ed == sv.edicts)
Host_Error("remove: tried to remove world\n");
- if (NUM_FOR_EDICT(ed) <= svs.maxclients)
+ if (NUM_FOR_EDICT(ed) <= MAX_SCOREBOARD)
Host_Error("remove: tried to remove a client\n");
ED_Free (ed);
}
Host_Error ("PF_Precache_*: Precache can only be done in spawn functions");
s = G_STRING(OFS_PARM0);
- if (sv.worldmodel->brushq1.ishlbsp && ((!s) || (!s[0])))
+ if (sv.worldmodel->brush.ishlbsp && ((!s) || (!s[0])))
return;
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
PR_CheckEmptyString (s);
if (sv.state != ss_active)
return;
- for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
- if (client->active || client->spawned)
+ for (j = 0;j < MAX_SCOREBOARD;j++)
+ {
+ if ((client = svs.connectedclients[j]))
{
MSG_WriteChar (&client->message, svc_lightstyle);
MSG_WriteChar (&client->message,style);
MSG_WriteString (&client->message, val);
}
+ }
}
void PF_rint (void)
*/
void PF_pointcontents (void)
{
- G_FLOAT(OFS_RETURN) = SV_PointContents(G_VECTOR(OFS_PARM0));
+ G_FLOAT(OFS_RETURN) = SV_PointQ1Contents(G_VECTOR(OFS_PARM0));
}
/*
case MSG_ONE:
ent = PROG_TO_EDICT(pr_global_struct->msg_entity);
entnum = NUM_FOR_EDICT(ent);
- if (entnum < 1 || entnum > svs.maxclients)
- Host_Error ("WriteDest: not a client");
- return &svs.clients[entnum-1].message;
+ if (entnum < 1 || entnum > MAX_SCOREBOARD || svs.connectedclients[entnum-1] == NULL)
+ Host_Error("WriteDest: not a client");
+ return &svs.connectedclients[entnum-1]->message;
case MSG_ALL:
return &sv.reliable_datagram;
ent = G_EDICT(OFS_PARM0);
i = NUM_FOR_EDICT(ent);
- if (i < 1 || i > svs.maxclients)
+ if (i < 1 || i > MAX_SCOREBOARD || !svs.connectedclients[i-1])
Host_Error ("Entity is not a client");
// copy spawn parms out of the client_t
- client = svs.clients + (i-1);
-
+ client = svs.connectedclients[i-1];
for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
(&pr_global_struct->parm1)[i] = client->spawn_parms[i];
}
VectorCopy (temp, G_VECTOR(OFS_RETURN));
}
-void SV_LightPoint (vec3_t color, vec3_t p);
/*
=================
PF_GetLight
*/
void PF_GetLight (void)
{
- vec3_t color;
- vec_t* p;
+ vec3_t ambientcolor, diffusecolor, diffusenormal;
+ vec_t *p;
p = G_VECTOR(OFS_PARM0);
- SV_LightPoint (color, p);
- VectorCopy (color, G_VECTOR(OFS_RETURN));
+ VectorClear(ambientcolor);
+ VectorClear(diffusecolor);
+ VectorClear(diffusenormal);
+ if (sv.worldmodel && sv.worldmodel->brush.LightPoint)
+ sv.worldmodel->brush.LightPoint(sv.worldmodel, p, ambientcolor, diffusecolor, diffusenormal);
+ VectorMA(ambientcolor, 0.5, diffusecolor, G_VECTOR(OFS_RETURN));
}
#define MAX_QC_CVARS 128
entnum = G_EDICTNUM(OFS_PARM0);
i = G_FLOAT(OFS_PARM1);
- if (entnum < 1 || entnum > svs.maxclients)
+ if (entnum < 1 || entnum > MAX_SCOREBOARD || !(client = svs.connectedclients[entnum-1]))
{
Con_Printf ("tried to setcolor a non-client\n");
return;
}
- client = &svs.clients[entnum-1];
if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
val->_float = i;
client->colors = i;
if (modelindex < 1 || modelindex >= MAX_MODELS)
return NULL;
model = sv.models[modelindex];
- if (model->type != mod_brush)
- return NULL;
if (surfnum < 0 || surfnum >= model->brushq1.nummodelsurfaces)
return NULL;
return model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
if (modelindex < 1 || modelindex >= MAX_MODELS)
return;
model = sv.models[modelindex];
- if (model->type != mod_brush)
+ if (!model->brushq1.numsurfaces)
return;
// FIXME: implement rotation/scaling
//string(string s, float start, float length) substring = #116; // returns a section of a string as a tempstring
void PF_substring(void)
{
- int i, start, end;
- char *s, string[MAX_VARSTRING];
+ int i, start, length;
+ char *s, *string = PR_GetTempString();
s = G_STRING(OFS_PARM0);
start = G_FLOAT(OFS_PARM1);
- end = G_FLOAT(OFS_PARM2) + start;
+ length = G_FLOAT(OFS_PARM2);
if (!s)
s = "";
for (i = 0;i < start && *s;i++, s++);
- for (i = 0;i < MAX_VARSTRING - 1 && *s && i < end;i++, s++)
+ for (i = 0;i < STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
string[i] = *s;
string[i] = 0;
G_INT(OFS_RETURN) = PR_SetString(string);
//find client for this entity
i = (NUM_FOR_EDICT(G_EDICT(OFS_PARM0)) - 1);
- if (i < 0 || i >= svs.maxclients)
+ if (i < 0 || i >= MAX_SCOREBOARD || !svs.connectedclients[i])
Host_Error("PF_clientcommand: entity is not a client");
temp_client = host_client;
- host_client = &svs.clients[i];
+ host_client = svs.connectedclients[i];
Cmd_ExecuteString (G_STRING(OFS_PARM1), src_client);
host_client = temp_client;
}
tokens = Z_Malloc(strlen(str) * sizeof(char *));
max_tokens = strlen(str);
- for (p = str;COM_ParseToken(&p) && num_tokens < max_tokens;num_tokens++)
+ for (p = str;COM_ParseToken(&p, false) && num_tokens < max_tokens;num_tokens++)
{
tokens[num_tokens] = Z_Malloc(strlen(com_token) + 1);
strcpy(tokens[num_tokens], com_token);
if (modelindex >= 0 && modelindex < MAX_MODELS)
{
model = sv.models[modelindex];
- if (model->alias.aliasnum_tags)
+ if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
+ for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
+ if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
+ v->_float = i + 1;
+ if (v->_float == 0 && model->alias.aliasnum_tags)
for (i = 0;i < model->alias.aliasnum_tags;i++)
if (!strcmp(tagname, model->alias.aliasdata_tags[i].name))
v->_float = i + 1;
projects / xonotic / darkplaces.git / blobdiff