int type_size[8] = {1,sizeof(string_t)/4,1,3,1,1,sizeof(func_t)/4,sizeof(void *)/4};
-ddef_t *ED_FieldAtOfs (int ofs);
-qboolean ED_ParseEpair (void *base, ddef_t *key, const char *s);
+ddef_t *ED_FieldAtOfs(int ofs);
+qboolean ED_ParseEpair(edict_t *ent, ddef_t *key, const char *s);
cvar_t pr_checkextension = {0, "pr_checkextension", "1"};
cvar_t nomonsters = {0, "nomonsters", "0"};
int eval_pmodel;
int eval_punchvector;
int eval_viewzoom;
+int eval_clientcolors;
+int eval_tag_entity;
+int eval_tag_index;
mfunction_t *SV_PlayerPhysicsQC;
mfunction_t *EndFrameQC;
+//KrimZon - SERVER COMMANDS IN QUAKEC
+mfunction_t *SV_ParseClientCommandQC;
int FindFieldOffset(const char *field)
{
eval_pmodel = FindFieldOffset("pmodel");
eval_punchvector = FindFieldOffset("punchvector");
eval_viewzoom = FindFieldOffset("viewzoom");
+ eval_clientcolors = FindFieldOffset("clientcolors");
+ eval_tag_entity = FindFieldOffset("tag_entity");
+ eval_tag_index = FindFieldOffset("tag_index");
// LordHavoc: allowing QuakeC to override the player movement code
SV_PlayerPhysicsQC = ED_FindFunction ("SV_PlayerPhysics");
// LordHavoc: support for endframe
EndFrameQC = ED_FindFunction ("EndFrame");
+ //KrimZon - SERVER COMMANDS IN QUAKEC
+ SV_ParseClientCommandQC = ED_FindFunction ("SV_ParseClientCommand");
}
/*
*/
void ED_ClearEdict (edict_t *e)
{
+ int num;
memset (e->v, 0, progs->entityfields * 4);
- e->free = false;
+ e->e->free = false;
+ // LordHavoc: for consistency set these here
+ num = NUM_FOR_EDICT(e) - 1;
+ if (num >= 0 && num < svs.maxclients)
+ {
+ e->v->colormap = num + 1;
+ e->v->team = (svs.clients[num].colors & 15) + 1;
+ e->v->netname = PR_SetString(svs.clients[num].name);
+ }
}
/*
int i;
edict_t *e;
- for ( i=svs.maxclients+1 ; i<sv.num_edicts ; i++)
+ for (i = svs.maxclients + 1;i < sv.num_edicts;i++)
{
e = EDICT_NUM(i);
// the first couple seconds of server time can involve a lot of
// freeing and allocating, so relax the replacement policy
- if (e->free && ( e->freetime < 2 || sv.time - e->freetime > 0.5 ) )
+ if (e->e->free && ( e->e->freetime < 2 || sv.time - e->e->freetime > 0.5 ) )
{
ED_ClearEdict (e);
return e;
Host_Error ("ED_Alloc: no free edicts");
sv.num_edicts++;
+ if (sv.num_edicts >= sv.max_edicts)
+ SV_IncreaseEdicts();
e = EDICT_NUM(i);
ED_ClearEdict (e);
{
SV_UnlinkEdict (ed); // unlink from world bsp
- ed->free = true;
+ ed->e->free = true;
ed->v->model = 0;
ed->v->takedamage = 0;
ed->v->modelindex = 0;
ed->v->nextthink = -1;
ed->v->solid = 0;
- ed->freetime = sv.time;
+ ed->e->freetime = sv.time;
}
//===========================================================================
sprintf (line, "%s", PR_GetString(val->string));
break;
case ev_entity:
- n = NoCrash_NUM_FOR_EDICT(PROG_TO_EDICT(val->edict));
+ //n = NoCrash_NUM_FOR_EDICT(PROG_TO_EDICT(val->edict));
+ n = val->edict;
if (n < 0 || n >= MAX_EDICTS)
sprintf (line, "entity %i (invalid!)", n);
else
val = (void *)&pr_globals[ofs];
def = ED_GlobalAtOfs(ofs);
if (!def)
- sprintf (line,"%i(?)", ofs);
+ snprintf (line, sizeof (line), "%i(?)", ofs);
else
{
s = PR_ValueString (def->type, val);
- sprintf (line,"%i(%s)%s", ofs, PR_GetString(def->s_name), s);
+ snprintf (line, sizeof (line), "%i(%s)%s", ofs, PR_GetString(def->s_name), s);
}
i = strlen(line);
for ( ; i<20 ; i++)
- strcat (line," ");
- strcat (line," ");
+ strlcat (line, " ", sizeof (line));
+ strlcat (line, " ", sizeof (line));
return line;
}
def = ED_GlobalAtOfs(ofs);
if (!def)
- sprintf (line,"%i(?)", ofs);
+ snprintf (line, sizeof (line), "%i(?)", ofs);
else
- sprintf (line,"%i(%s)", ofs, PR_GetString(def->s_name));
+ snprintf (line, sizeof (line), "%i(%s)", ofs, PR_GetString(def->s_name));
i = strlen(line);
for ( ; i<20 ; i++)
- strcat (line," ");
- strcat (line," ");
+ strlcat (line, " ", sizeof (line));
+ strlcat (line, " ", sizeof (line));
return line;
}
int type;
char tempstring[8192], tempstring2[260]; // temporary string buffers
- if (ed->free)
+ if (ed->e->free)
{
Con_Printf ("FREE\n");
return;
tempstring2[259] = 0;
name = tempstring2;
}
- strcat(tempstring, name);
+ strlcat (tempstring, name, sizeof (tempstring));
for (l = strlen(name);l < 14;l++)
strcat(tempstring, " ");
strcat(tempstring, " ");
tempstring2[259] = 0;
name = tempstring2;
}
- strcat(tempstring, name);
- strcat(tempstring, "\n");
+ strlcat (tempstring, name, sizeof (tempstring));
+ strlcat (tempstring, "\n", sizeof (tempstring));
if (strlen(tempstring) >= 4096)
{
Con_Printf("%s", tempstring);
FS_Printf (f, "{\n");
- if (ed->free)
+ if (ed->e->free)
{
FS_Printf (f, "}\n");
return;
for (i=0 ; i<sv.num_edicts ; i++)
{
ent = EDICT_NUM(i);
- if (ent->free)
+ if (ent->e->free)
continue;
active++;
if (ent->v->solid)
while (1)
{
// parse key
- if (!COM_ParseToken (&data))
+ if (!COM_ParseToken(&data, false))
Host_Error ("ED_ParseEntity: EOF without closing brace");
if (com_token[0] == '}')
break;
strcpy (keyname, com_token);
// parse value
- if (!COM_ParseToken (&data))
+ if (!COM_ParseToken(&data, false))
Host_Error ("ED_ParseEntity: EOF without closing brace");
if (com_token[0] == '}')
continue;
}
- if (!ED_ParseEpair ((void *)pr_globals, key, com_token))
+ if (!ED_ParseEpair(NULL, key, com_token))
Host_Error ("ED_ParseGlobals: parse error");
}
}
returns false if error
=============
*/
-qboolean ED_ParseEpair (void *base, ddef_t *key, const char *s)
+qboolean ED_ParseEpair(edict_t *ent, ddef_t *key, const char *s)
{
- int i;
- char string[128];
- ddef_t *def;
- char *v, *w;
- void *d;
- mfunction_t *func;
-
- d = (void *)((int *)base + key->ofs);
+ int i;
+ ddef_t *def;
+ eval_t *val;
+ mfunction_t *func;
+ if (ent)
+ val = (eval_t *)((int *)ent->v + key->ofs);
+ else
+ val = (eval_t *)((int *)pr_globals + key->ofs);
switch (key->type & ~DEF_SAVEGLOBAL)
{
case ev_string:
- *(string_t *)d = PR_SetString(ED_NewString(s));
+ val->string = PR_SetString(ED_NewString(s));
break;
case ev_float:
- *(float *)d = atof (s);
+ while (*s && *s <= ' ')
+ s++;
+ val->_float = atof(s);
break;
case ev_vector:
- strcpy (string, s);
- v = string;
- w = string;
- for (i=0 ; i<3 ; i++)
+ for (i = 0;i < 3;i++)
{
- while (*v && *v != ' ')
- v++;
- *v = 0;
- ((float *)d)[i] = atof (w);
- w = v = v+1;
+ while (*s && *s <= ' ')
+ s++;
+ if (!*s)
+ break;
+ val->vector[i] = atof(s);
+ while (*s > ' ')
+ s++;
+ if (!*s)
+ break;
}
break;
case ev_entity:
- *(int *)d = EDICT_TO_PROG(EDICT_NUM(atoi (s)));
+ while (*s && *s <= ' ')
+ s++;
+ i = atoi(s);
+ if (i < 0 || i >= MAX_EDICTS)
+ Con_Printf("ED_ParseEpair: ev_entity reference too large (edict %i >= MAX_EDICTS %i)\n", i, MAX_EDICTS);
+ while (i >= sv.max_edicts)
+ SV_IncreaseEdicts();
+ // if SV_IncreaseEdicts was called the base pointer needs to be updated
+ if (ent)
+ val = (eval_t *)((int *)ent->v + key->ofs);
+ val->edict = EDICT_TO_PROG(EDICT_NUM(i));
break;
case ev_field:
- def = ED_FindField (s);
+ def = ED_FindField(s);
if (!def)
{
- // LordHavoc: don't warn about worldspawn sky/fog fields because they don't require mod support
- if (strcmp(s, "sky") && strcmp(s, "fog") && strncmp(s, "fog_", 4) && strcmp(s, "farclip"))
- Con_DPrintf ("Can't find field %s\n", s);
+ Con_DPrintf("ED_ParseEpair: Can't find field %s\n", s);
return false;
}
- *(int *)d = G_INT(def->ofs);
+ val->_int = G_INT(def->ofs);
break;
case ev_function:
- func = ED_FindFunction (s);
+ func = ED_FindFunction(s);
if (!func)
{
- Con_DPrintf ("Can't find function %s\n", s);
+ Con_Printf ("ED_ParseEpair: Can't find function %s\n", s);
return false;
}
- *(func_t *)d = func - pr_functions;
+ val->function = func - pr_functions;
break;
default:
- break;
+ Con_Printf("ED_ParseEpair: Unknown key->type %i for key \"%s\"\n", key->type, PR_GetString(key->s_name));
+ return false;
}
return true;
}
while (1)
{
// parse key
- if (!COM_ParseToken (&data))
+ if (!COM_ParseToken(&data, false))
Host_Error ("ED_ParseEntity: EOF without closing brace");
if (com_token[0] == '}')
break;
}
// parse value
- if (!COM_ParseToken (&data))
+ if (!COM_ParseToken(&data, false))
Host_Error ("ED_ParseEntity: EOF without closing brace");
if (com_token[0] == '}')
sprintf (com_token, "0 %s 0", temp);
}
- if (!ED_ParseEpair ((void *)ent->v, key, com_token))
+ if (!ED_ParseEpair(ent, key, com_token))
Host_Error ("ED_ParseEdict: parse error");
}
if (!init)
- ent->free = true;
+ ent->e->free = true;
return data;
}
void ED_LoadFromFile (const char *data)
{
edict_t *ent;
- int inhibit;
+ int parsed, inhibited, spawned, died;
mfunction_t *func;
ent = NULL;
- inhibit = 0;
+ parsed = 0;
+ inhibited = 0;
+ spawned = 0;
+ died = 0;
pr_global_struct->time = sv.time;
// parse ents
while (1)
{
// parse the opening brace
- if (!COM_ParseToken (&data))
+ if (!COM_ParseToken(&data, false))
break;
if (com_token[0] != '{')
Host_Error ("ED_LoadFromFile: found %s when expecting {",com_token);
else
ent = ED_Alloc ();
data = ED_ParseEdict (data, ent);
+ parsed++;
// remove things from different skill levels or deathmatch
if (deathmatch.integer)
if (((int)ent->v->spawnflags & SPAWNFLAG_NOT_DEATHMATCH))
{
ED_Free (ent);
- inhibit++;
+ inhibited++;
continue;
}
}
|| (current_skill >= 2 && ((int)ent->v->spawnflags & SPAWNFLAG_NOT_HARD )))
{
ED_Free (ent);
- inhibit++;
+ inhibited++;
continue;
}
pr_global_struct->self = EDICT_TO_PROG(ent);
PR_ExecuteProgram (func - pr_functions, "");
+ spawned++;
+ if (ent->e->free)
+ died++;
}
- Con_DPrintf ("%i entities inhibited\n", inhibit);
+ Con_DPrintf ("%i entities parsed, %i inhibited, %i spawned (%i removed self, %i stayed)\n", parsed, inhibited, spawned, died, spawned - died);
}
{ev_float, "ping"},
{ev_vector, "movement"},
{ev_float, "pmodel"},
- {ev_vector, "punchvector"}
+ {ev_vector, "punchvector"},
+ {ev_float, "clientcolors"},
+ {ev_entity, "tag_entity"},
+ {ev_float, "tag_index"}
};
/*
return;
}
counts = Mem_Alloc(tempmempool, progs->numfielddefs * sizeof(int));
- for (ednum = 0;ednum < MAX_EDICTS;ednum++)
+ for (ednum = 0;ednum < sv.max_edicts;ednum++)
{
ed = EDICT_NUM(ednum);
- if (ed->free)
+ if (ed->e->free)
continue;
for (i = 1;i < progs->numfielddefs;i++)
{
switch(d->type & ~DEF_SAVEGLOBAL)
{
case ev_string:
- strcat(tempstring, "string ");
+ strlcat (tempstring, "string ", sizeof (tempstring));
break;
case ev_entity:
- strcat(tempstring, "entity ");
+ strlcat (tempstring, "entity ", sizeof (tempstring));
break;
case ev_function:
- strcat(tempstring, "function ");
+ strlcat (tempstring, "function ", sizeof (tempstring));
break;
case ev_field:
- strcat(tempstring, "field ");
+ strlcat (tempstring, "field ", sizeof (tempstring));
break;
case ev_void:
- strcat(tempstring, "void ");
+ strlcat (tempstring, "void ", sizeof (tempstring));
break;
case ev_float:
- strcat(tempstring, "float ");
+ strlcat (tempstring, "float ", sizeof (tempstring));
break;
case ev_vector:
- strcat(tempstring, "vector ");
+ strlcat (tempstring, "vector ", sizeof (tempstring));
break;
case ev_pointer:
- strcat(tempstring, "pointer ");
+ strlcat (tempstring, "pointer ", sizeof (tempstring));
break;
default:
- sprintf (tempstring2, "bad type %i ", d->type & ~DEF_SAVEGLOBAL);
- strcat(tempstring, tempstring2);
+ snprintf (tempstring2, sizeof (tempstring2), "bad type %i ", d->type & ~DEF_SAVEGLOBAL);
+ strlcat (tempstring, tempstring2, sizeof (tempstring));
break;
}
if (strlen(name) > 256)
tempstring2[259] = 0;
name = tempstring2;
}
- strcat(tempstring, name);
+ strcat (tempstring, name);
for (j = strlen(name);j < 25;j++)
strcat(tempstring, " ");
- sprintf(tempstring2, "%5d", counts[i]);
- strcat(tempstring, tempstring2);
- strcat(tempstring, "\n");
+ snprintf (tempstring2, sizeof (tempstring2), "%5d", counts[i]);
+ strlcat (tempstring, tempstring2, sizeof (tempstring));
+ strlcat (tempstring, "\n", sizeof (tempstring));
if (strlen(tempstring) >= 4096)
{
Con_Printf("%s", tempstring);
}
}
Mem_Free(counts);
- Con_Printf("%i entity fields (%i in use), totalling %i bytes per edict (%i in use), %i edicts, %i bytes total spent on edict fields (%i needed)\n", progs->entityfields, used, progs->entityfields * 4, usedamount * 4, MAX_EDICTS, progs->entityfields * 4 * MAX_EDICTS, usedamount * 4 * MAX_EDICTS);
+ Con_Printf("%i entity fields (%i in use), totalling %i bytes per edict (%i in use), %i edicts allocated, %i bytes total spent on edict fields (%i needed)\n", progs->entityfields, used, progs->entityfields * 4, usedamount * 4, sv.max_edicts, progs->entityfields * 4 * sv.max_edicts, usedamount * 4 * sv.max_edicts);
}
void PR_Globals_f (void)
}
// LordHavoc: turned EDICT_NUM into a #define for speed reasons
-edict_t *EDICT_NUM_ERROR(int n)
+edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline)
{
- Host_Error ("EDICT_NUM: bad number %i", n);
+ Host_Error ("EDICT_NUM: bad number %i (called at %s:%i)", n, filename, fileline);
return NULL;
}
+/*
+int NUM_FOR_EDICT_ERROR(edict_t *e)
+{
+ Host_Error ("NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, sv.edicts, e - sv.edicts);
+ return 0;
+}
+
int NUM_FOR_EDICT(edict_t *e)
{
int n;
return n;
}
-int NoCrash_NUM_FOR_EDICT(edict_t *e)
-{
- return e - sv.edicts;
-}
+//int NoCrash_NUM_FOR_EDICT(edict_t *e)
+//{
+// return e - sv.edicts;
+//}
//#define EDICT_TO_PROG(e) ((qbyte *)(((edict_t *)e)->v) - (qbyte *)(sv.edictsfields))
-//#define PROG_TO_EDICT(e) (sv.edictstable[(e) / (progs->entityfields * 4)])
+//#define PROG_TO_EDICT(e) (sv.edicts + ((e) / (progs->entityfields * 4)))
int EDICT_TO_PROG(edict_t *e)
{
int n;
{
if ((unsigned int)n >= (unsigned int)sv.max_edicts)
Host_Error("PROG_TO_EDICT: invalid edict number %i\n", n);
- return sv.edictstable[n]; // EXPERIMENTAL
- //return sv.edictstable[(n) / (progs->entityfields * 4)];
+ return sv.edicts + n; // EXPERIMENTAL
+ //return sv.edicts + ((n) / (progs->entityfields * 4));
}
+*/
projects / xonotic / darkplaces.git / blobdiff