cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2"}; //"0.93"}; // LordHavoc: disabled autoaim by default
cvar_t pr_zone_min_strings = {0, "pr_zone_min_strings", "64"};
-mempool_t *pr_strings_mempool;
-
// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
#define STRINGTEMP_BUFFERS 16
#define STRINGTEMP_LENGTH 4096
}
char *ENGINE_EXTENSIONS =
+"DP_BUTTONCHAT "
+"DP_BUTTONUSE "
"DP_CL_LOADSKY "
+"DP_CON_SET "
+"DP_CON_SETA "
+"DP_CON_STARTMAP "
"DP_EF_ADDITIVE "
"DP_EF_BLUE "
"DP_EF_FLAME "
"DP_GFX_SKYBOX "
"DP_HALFLIFE_MAP "
"DP_HALFLIFE_MAP_CVAR "
+"DP_HALFLIFE_SPRITE "
"DP_INPUTBUTTONS "
+"DP_LITSPRITES "
"DP_LITSUPPORT "
"DP_MONSTERWALK "
"DP_MOVETYPEBOUNCEMISSILE "
"DP_QC_FS_SEARCH " // Black: same as in the menu qc
"DP_QC_GETLIGHT "
"DP_QC_GETSURFACE "
+"DP_QC_GETTAGINFO "
"DP_QC_MINMAXBOUND "
"DP_QC_MULTIPLETEMPSTRINGS "
"DP_QC_RANDOMVEC "
"DP_QC_TRACE_MOVETYPE_WORLDONLY "
"DP_QC_VECTORVECTORS "
"DP_QUAKE2_MODEL "
+"DP_QUAKE2_SPRITE "
"DP_QUAKE3_MODEL "
"DP_REGISTERCVAR "
"DP_SND_DIRECTIONLESSATTNNONE "
+"DP_SND_FAKETRACKS "
"DP_SND_OGGVORBIS "
"DP_SND_STEREOWAV "
"DP_SOLIDCORPSE "
"DP_SPRITE32 "
+"DP_SV_BOTCLIENT "
+"DP_SV_CLIENTCOLORS "
+"DP_SV_CLIENTNAME "
"DP_SV_DRAWONLYTOCLIENT "
+"DP_SV_DROPCLIENT "
"DP_SV_EFFECT "
-"DP_SV_EXTERIORMODELTOCLIENT "
"DP_SV_NODRAWTOCLIENT "
+"DP_SV_PING "
"DP_SV_PLAYERPHYSICS "
+"DP_SV_PUNCHVECTOR "
"DP_SV_ROTATINGBMODEL "
"DP_SV_SETCOLOR "
"DP_SV_SLOWMO "
"NEH_CMD_PLAY2 "
"NEH_RESTOREGAME "
"NXQ_GFX_LETTERBOX "
+"PRYDON_CLIENTCURSOR "
"TENEBRAE_GFX_DLIGHTS "
"TW_SV_STEPCONTROL "
+"NEXUIZ_PLAYERMODEL "
+"NEXUIZ_PLAYERSKIN "
;
qboolean checkextension(char *name)
setmodel(entity, model)
=================
*/
+static vec3_t quakemins = {-16, -16, -16}, quakemaxs = {16, 16, 16};
void PF_setmodel (void)
{
edict_t *e;
- char *m, **check;
model_t *mod;
int i;
PF_WARNING("setmodel: can not modify world entity\n");
if (e->e->free)
PF_WARNING("setmodel: can not modify free entity\n");
- m = G_STRING(OFS_PARM1);
-
-// check to see if model was properly precached
- for (i=0, check = sv.model_precache ; *check ; i++, check++)
- if (!strcmp(*check, m))
- break;
-
- if (!*check)
- PF_WARNING("setmodel: no precache\n");
-
-
- e->v->model = PR_SetString(*check);
+ i = SV_ModelIndex(G_STRING(OFS_PARM1), 1);
+ e->v->model = PR_SetString(sv.model_precache[i]);
e->v->modelindex = i;
- mod = sv.models[ (int)e->v->modelindex];
+ mod = sv.models[i];
if (mod)
- SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true);
+ {
+ if (mod->type != mod_alias || sv_gameplayfix_setmodelrealbox.integer)
+ SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true);
+ else
+ SetMinMaxSize (e, quakemins, quakemaxs, true);
+ }
else
SetMinMaxSize (e, vec3_origin, vec3_origin, true);
}
}
client = svs.clients + entnum-1;
- if (!client->netconnection)
- return;
PF_VarString(1, string, sizeof(string));
MSG_WriteChar(&client->message,svc_print);
MSG_WriteString(&client->message, string);
}
client = svs.clients + entnum-1;
- if (!client->netconnection)
- return;
PF_VarString(1, string, sizeof(string));
MSG_WriteChar(&client->message,svc_centerprint);
MSG_WriteString(&client->message, string);
*/
void PF_random (void)
{
- float num;
-
- num = (rand ()&0x7fff) / ((float)0x7fff);
-
- G_FLOAT(OFS_RETURN) = num;
+ G_FLOAT(OFS_RETURN) = lhrandom(0, 1);
}
/*
*/
void PF_ambientsound (void)
{
- char **check;
char *samp;
float *pos;
float vol, attenuation;
attenuation = G_FLOAT(OFS_PARM3);
// check to see if samp was properly precached
- for (soundnum=0, check = sv.sound_precache ; *check ; check++, soundnum++)
- if (!strcmp(*check,samp))
- break;
-
- if (!*check)
- {
- Con_Printf("no precache: %s\n", samp);
+ soundnum = SV_SoundIndex(samp, 1);
+ if (!soundnum)
return;
- }
large = false;
if (soundnum >= 256)
str = G_STRING(OFS_PARM1);
old = host_client;
- if ((host_client = svs.clients + entnum-1) && host_client->netconnection)
- Host_ClientCommands ("%s", str);
+ host_client = svs.clients + entnum-1;
+ Host_ClientCommands ("%s", str);
host_client = old;
}
radius = G_FLOAT(OFS_PARM1);
radius2 = radius * radius;
- mins[0] = org[0] - radius;
- mins[1] = org[1] - radius;
- mins[2] = org[2] - radius;
- maxs[0] = org[0] + radius;
- maxs[1] = org[1] + radius;
- maxs[2] = org[2] + radius;
+ mins[0] = org[0] - (radius + 1);
+ mins[1] = org[1] - (radius + 1);
+ mins[2] = org[2] - (radius + 1);
+ maxs[0] = org[0] + (radius + 1);
+ maxs[1] = org[1] + (radius + 1);
+ maxs[2] = org[2] + (radius + 1);
numtouchedicts = SV_EntitiesInBox(mins, maxs, MAX_EDICTS, touchedicts);
if (numtouchedicts > MAX_EDICTS)
{
{
ent = touchedicts[i];
pr_xfunction->builtinsprofile++;
+ // Quake did not return non-solid entities but darkplaces does
+ // (note: this is the reason you can't blow up fallen zombies)
+ if (ent->v->solid == SOLID_NOT && !sv_gameplayfix_blowupfallenzombies.integer)
+ continue;
// LordHavoc: compare against bounding box rather than center so it
// doesn't miss large objects, and use DotProduct instead of Length
// for a major speedup
- eorg[0] = (org[0] - ent->v->origin[0]) - bound(ent->v->mins[0], (org[0] - ent->v->origin[0]), ent->v->maxs[0]);
- eorg[1] = (org[1] - ent->v->origin[1]) - bound(ent->v->mins[1], (org[1] - ent->v->origin[1]), ent->v->maxs[1]);
- eorg[2] = (org[2] - ent->v->origin[2]) - bound(ent->v->mins[2], (org[2] - ent->v->origin[2]), ent->v->maxs[2]);
+ VectorSubtract(org, ent->v->origin, eorg);
+ if (sv_gameplayfix_findradiusdistancetobox.integer)
+ {
+ eorg[0] -= bound(ent->v->mins[0], eorg[0], ent->v->maxs[0]);
+ eorg[1] -= bound(ent->v->mins[1], eorg[1], ent->v->maxs[1]);
+ eorg[2] -= bound(ent->v->mins[2], eorg[2], ent->v->maxs[2]);
+ }
+ else
+ VectorMAMAM(1, eorg, 0.5f, ent->v->mins, 0.5f, ent->v->maxs, eorg);
if (DotProduct(eorg, eorg) < radius2)
{
ent->v->chain = EDICT_TO_PROG(chain);
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
}
+
void PF_precache_sound (void)
{
- char *s;
- int i;
- int limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_SOUNDS);
-
- if (sv.state != ss_loading)
- PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions");
-
- s = G_STRING(OFS_PARM0);
+ SV_SoundIndex(G_STRING(OFS_PARM0), 2);
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
- PR_CheckEmptyString (s);
-
- for (i=0 ; i<limit ; i++)
- {
- if (!sv.sound_precache[i])
- {
- sv.sound_precache[i] = s;
- return;
- }
- if (!strcmp(sv.sound_precache[i], s))
- return;
- }
- PF_ERROR("PF_precache_sound: overflow");
}
void PF_precache_model (void)
{
- char *s;
- int i;
- int limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_MODELS);
-
- if (sv.state != ss_loading)
- PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions");
-
- s = G_STRING(OFS_PARM0);
- if (sv.worldmodel->brush.ishlbsp && ((!s) || (!s[0])))
- return;
+ SV_ModelIndex(G_STRING(OFS_PARM0), 2);
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
- PR_CheckEmptyString (s);
-
- for (i = 0;i < limit;i++)
- {
- if (!sv.model_precache[i])
- {
- sv.model_precache[i] = s;
- sv.models[i] = Mod_ForName (s, true, false, false);
- return;
- }
- if (!strcmp(sv.model_precache[i], s))
- return;
- }
- PF_ERROR("PF_precache_model: overflow");
}
// assume failure if it returns early
G_FLOAT(OFS_RETURN) = 0;
-
+
ent = PROG_TO_EDICT(pr_global_struct->self);
if (ent == sv.edicts)
PF_WARNING("walkmove: can not modify world entity\n");
for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
- if (client->netconnection)
+ if (client->active)
{
MSG_WriteChar (&client->message, svc_lightstyle);
MSG_WriteChar (&client->message,style);
}
client = svs.clients + entnum-1;
- if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
- val->_float = i;
+ if (client->edict)
+ {
+ if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
+ val->_float = i;
+ client->edict->v->team = (i & 15) + 1;
+ }
client->colors = i;
- client->old_colors = i;
- client->edict->v->team = (i & 15) + 1;
-
- MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
- MSG_WriteByte (&sv.reliable_datagram, entnum - 1);
- MSG_WriteByte (&sv.reliable_datagram, i);
+ if (client->old_colors != client->colors)
+ {
+ client->old_colors = client->colors;
+ // send notification to all clients
+ MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
+ MSG_WriteByte (&sv.reliable_datagram, client - svs.clients);
+ MSG_WriteByte (&sv.reliable_datagram, client->colors);
+ }
}
/*
if (!s || !s[0])
PF_WARNING("effect: no model specified\n");
- i = SV_ModelIndex(s);
- if (i < 0)
+ i = SV_ModelIndex(s, 1);
+ if (!i)
PF_WARNING("effect: model not precached\n");
SV_StartEffect(G_VECTOR(OFS_PARM0), i, G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4));
}
// radius
MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM1) / 8 - 1, 255));
// lifetime
- MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM2) / 256 - 1, 255));
+ MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM2) * 256 - 1, 255));
// color
MSG_WriteByte(&sv.datagram, bound(0, G_VECTOR(OFS_PARM3)[0] * 255, 255));
MSG_WriteByte(&sv.datagram, bound(0, G_VECTOR(OFS_PARM3)[1] * 255, 255));
MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
-static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
+static void clippointtosurface(msurface_t *surface, vec3_t p, vec3_t out)
{
- int i, j;
- vec3_t v1, clipplanenormal, normal;
- vec_t clipplanedist, clipdist;
+ int i, j, k;
+ float *v[3], facenormal[3], edgenormal[3], sidenormal[3], temp[3], offsetdist, dist, bestdist;
+ const int *e;
+ bestdist = 1000000000;
VectorCopy(p, out);
- if (surf->flags & SURF_PLANEBACK)
- VectorNegate(surf->plane->normal, normal);
- else
- VectorCopy(surf->plane->normal, normal);
- for (i = 0, j = surf->poly_numverts - 1;i < surf->poly_numverts;j = i, i++)
- {
- VectorSubtract(&surf->poly_verts[j * 3], &surf->poly_verts[i * 3], v1);
- VectorNormalizeFast(v1);
- CrossProduct(v1, normal, clipplanenormal);
- clipplanedist = DotProduct(&surf->poly_verts[i * 3], clipplanenormal);
- clipdist = DotProduct(out, clipplanenormal) - clipplanedist;
- if (clipdist > 0)
+ for (i = 0, e = (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle);i < surface->num_triangles;i++, e += 3)
+ {
+ // clip original point to each triangle of the surface and find the
+ // triangle that is closest
+ v[0] = surface->groupmesh->data_vertex3f + e[0] * 3;
+ v[1] = surface->groupmesh->data_vertex3f + e[1] * 3;
+ v[2] = surface->groupmesh->data_vertex3f + e[2] * 3;
+ TriangleNormal(v[0], v[1], v[2], facenormal);
+ VectorNormalize(facenormal);
+ offsetdist = DotProduct(v[0], facenormal) - DotProduct(p, facenormal);
+ VectorMA(p, offsetdist, facenormal, temp);
+ for (j = 0, k = 2;j < 3;k = j, j++)
{
- clipdist = -clipdist;
- VectorMA(out, clipdist, clipplanenormal, out);
+ VectorSubtract(v[k], v[j], edgenormal);
+ CrossProduct(edgenormal, facenormal, sidenormal);
+ VectorNormalize(sidenormal);
+ offsetdist = DotProduct(v[k], sidenormal) - DotProduct(temp, sidenormal);
+ if (offsetdist < 0)
+ VectorMA(temp, offsetdist, sidenormal, temp);
+ }
+ dist = VectorDistance2(temp, p);
+ if (bestdist > dist)
+ {
+ bestdist = dist;
+ VectorCopy(temp, out);
}
}
}
-static msurface_t *getsurface(edict_t *ed, int surfnum)
+static msurface_t *getsurface(edict_t *ed, int surfacenum)
{
int modelindex;
model_t *model;
if (modelindex < 1 || modelindex >= MAX_MODELS)
return NULL;
model = sv.models[modelindex];
- if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
+ if (surfacenum < 0 || surfacenum >= model->nummodelsurfaces)
return NULL;
- return model->brushq1.surfaces + surfnum + model->firstmodelsurface;
+ return model->brush.data_surfaces + surfacenum + model->firstmodelsurface;
}
//PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints = #434;
void PF_getsurfacenumpoints(void)
{
- msurface_t *surf;
+ msurface_t *surface;
// return 0 if no such surface
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
{
G_FLOAT(OFS_RETURN) = 0;
return;
}
- G_FLOAT(OFS_RETURN) = surf->poly_numverts;
+ // note: this (incorrectly) assumes it is a simple polygon
+ G_FLOAT(OFS_RETURN) = surface->num_vertices;
}
//PF_getsurfacepoint, // #435 vector(entity e, float s, float n) getsurfacepoint = #435;
void PF_getsurfacepoint(void)
{
edict_t *ed;
- msurface_t *surf;
+ msurface_t *surface;
int pointnum;
VectorClear(G_VECTOR(OFS_RETURN));
ed = G_EDICT(OFS_PARM0);
if (!ed || ed->e->free)
return;
- if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
return;
+ // note: this (incorrectly) assumes it is a simple polygon
pointnum = G_FLOAT(OFS_PARM2);
- if (pointnum < 0 || pointnum >= surf->poly_numverts)
+ if (pointnum < 0 || pointnum >= surface->num_vertices)
return;
// FIXME: implement rotation/scaling
- VectorAdd(&surf->poly_verts[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
+ VectorAdd(&(surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
}
//PF_getsurfacenormal, // #436 vector(entity e, float s) getsurfacenormal = #436;
void PF_getsurfacenormal(void)
{
- msurface_t *surf;
+ msurface_t *surface;
+ vec3_t normal;
VectorClear(G_VECTOR(OFS_RETURN));
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
return;
// FIXME: implement rotation/scaling
- if (surf->flags & SURF_PLANEBACK)
- VectorNegate(surf->plane->normal, G_VECTOR(OFS_RETURN));
- else
- VectorCopy(surf->plane->normal, G_VECTOR(OFS_RETURN));
+ // note: this (incorrectly) assumes it is a simple polygon
+ // note: this only returns the first triangle, so it doesn't work very
+ // well for curved surfaces or arbitrary meshes
+ TriangleNormal((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex), (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + 3, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + 6, normal);
+ VectorNormalize(normal);
+ VectorCopy(normal, G_VECTOR(OFS_RETURN));
}
//PF_getsurfacetexture, // #437 string(entity e, float s) getsurfacetexture = #437;
void PF_getsurfacetexture(void)
{
- msurface_t *surf;
+ msurface_t *surface;
G_INT(OFS_RETURN) = 0;
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
return;
- G_INT(OFS_RETURN) = PR_SetString(surf->texinfo->texture->name);
+ G_INT(OFS_RETURN) = PR_SetString(surface->texture->name);
}
//PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
void PF_getsurfacenearpoint(void)
{
- int surfnum, best, modelindex;
+ int surfacenum, best, modelindex;
vec3_t clipped, p;
vec_t dist, bestdist;
edict_t *ed;
model_t *model;
- msurface_t *surf;
+ msurface_t *surface;
vec_t *point;
G_FLOAT(OFS_RETURN) = -1;
ed = G_EDICT(OFS_PARM0);
if (modelindex < 1 || modelindex >= MAX_MODELS)
return;
model = sv.models[modelindex];
- if (!model->brushq1.numsurfaces)
+ if (!model->brush.num_surfaces)
return;
// FIXME: implement rotation/scaling
VectorSubtract(point, ed->v->origin, p);
best = -1;
bestdist = 1000000000;
- for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
- {
- surf = model->brushq1.surfaces + surfnum + model->firstmodelsurface;
- dist = PlaneDiff(p, surf->plane);
- dist = dist * dist;
+ for (surfacenum = 0;surfacenum < model->nummodelsurfaces;surfacenum++)
+ {
+ surface = model->brush.data_surfaces + surfacenum + model->firstmodelsurface;
+ // first see if the nearest point on the surface's box is closer than the previous match
+ clipped[0] = bound(surface->mins[0], p[0], surface->maxs[0]) - p[0];
+ clipped[1] = bound(surface->mins[1], p[1], surface->maxs[1]) - p[1];
+ clipped[2] = bound(surface->mins[2], p[2], surface->maxs[2]) - p[2];
+ dist = VectorLength2(clipped);
if (dist < bestdist)
{
- clippointtosurface(surf, p, clipped);
+ // it is, check the nearest point on the actual geometry
+ clippointtosurface(surface, p, clipped);
VectorSubtract(clipped, p, clipped);
- dist += DotProduct(clipped, clipped);
+ dist += VectorLength2(clipped);
if (dist < bestdist)
{
- best = surfnum;
+ // that's closer too, store it as the best match
+ best = surfacenum;
bestdist = dist;
}
}
void PF_getsurfaceclippedpoint(void)
{
edict_t *ed;
- msurface_t *surf;
+ msurface_t *surface;
vec3_t p, out;
VectorClear(G_VECTOR(OFS_RETURN));
ed = G_EDICT(OFS_PARM0);
if (!ed || ed->e->free)
return;
- if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
return;
// FIXME: implement rotation/scaling
VectorSubtract(G_VECTOR(OFS_PARM2), ed->v->origin, p);
- clippointtosurface(surf, p, out);
+ clippointtosurface(surface, p, out);
// FIXME: implement rotation/scaling
VectorAdd(out, ed->v->origin, G_VECTOR(OFS_RETURN));
}
//float(string filename, float mode) fopen = #110; // opens a file inside quake/gamedir/data/ (mode is FILE_READ, FILE_APPEND, or FILE_WRITE), returns fhandle >= 0 if successful, or fhandle < 0 if unable to open file for any reason
void PF_fopen(void)
{
- int filenum, mode, i;
+ int filenum, mode;
char *modestring, *filename;
for (filenum = 0;filenum < MAX_PRFILES;filenum++)
if (pr_files[filenum] == NULL)
return;
}
filename = G_STRING(OFS_PARM0);
- // control characters do not cause issues with any platforms I know of, but they are usually annoying to deal with
- // ../ is parent directory on many platforms
- // // is parent directory on Amiga
- // / at the beginning of a path is root on unix, and parent directory on Amiga
- // : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea)
- // \ is a windows-ism (so it's naughty to use it, / works on all platforms)
- for (i = 0;filename[i];i++)
- {
- if (filename[i] < ' ' || (filename[i] == '/' && filename[i+1] == '/') || (filename[i] == '.' && filename[i+1] == '.') || filename[i] == ':' || filename[i] == '\\' || filename[0] == '/')
- {
- Con_Printf("PF_fopen: dangerous/confusing/annoying/non-portable filename \"%s\" not allowed. (contains control characters or // or .. or : or \\ or begins with /)\n", filename);
- G_FLOAT(OFS_RETURN) = -4;
- return;
- }
- }
- pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+ // -4 failure (dangerous/non-portable filename) removed, FS_Open checks
+ pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false, false);
if (pr_files[filenum] == NULL && modestring == "rb")
- pr_files[filenum] = FS_Open(filename, modestring, false);
+ pr_files[filenum] = FS_Open(filename, modestring, false, false);
if (pr_files[filenum] == NULL)
G_FLOAT(OFS_RETURN) = -1;
string[end] = 0;
// remove \n following \r
if (c == '\r')
+ {
c = FS_Getc(pr_files[filenum]);
+ if (c != '\n')
+ FS_UnGetc(pr_files[filenum], (unsigned char)c);
+ }
if (developer.integer)
Con_Printf("fgets: %s\n", string);
if (c >= 0 || end)
{
char *in, *out;
in = G_STRING(OFS_PARM0);
- out = Mem_Alloc(pr_strings_mempool, strlen(in) + 1);
+ out = PR_Alloc(strlen(in) + 1);
strcpy(out, in);
G_INT(OFS_RETURN) = PR_SetString(out);
}
//void(string s) strunzone = #119; // removes a copy of a string from the string zone (you can not use that string again or it may crash!!!)
void PF_strunzone(void)
{
- Mem_Free(G_STRING(OFS_PARM0));
+ PR_Free(G_STRING(OFS_PARM0));
}
//void(entity e, string s) clientcommand = #440; // executes a command string as if it came from the specified client
edict_t *tagentity = G_EDICT(OFS_PARM1);
char *tagname = G_STRING(OFS_PARM2);
eval_t *v;
- int i, modelindex;
+ int modelindex;
model_t *model;
if (e == sv.edicts)
modelindex = (int)tagentity->v->modelindex;
if (modelindex >= 0 && modelindex < MAX_MODELS && (model = sv.models[modelindex]))
{
- 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;
- // FIXME: use a model function to get tag info (need to handle skeletal)
- 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;
+ v->_float = Mod_Alias_GetTagIndexForName(model, tagentity->v->skin, tagname);
if (v->_float == 0)
Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity), model->name);
}
}
}
+/////////////////////////////////////////
+// DP_MD3_TAGINFO extension coded by VorteX
+
+int SV_GetTagIndex (edict_t *e, char *tagname)
+{
+ int i;
+ model_t *model;
+
+ i = e->v->modelindex;
+ if (i < 1 || i >= MAX_MODELS)
+ return -1;
+ model = sv.models[i];
+
+ return Mod_Alias_GetTagIndexForName(model, e->v->skin, tagname);
+};
+
+// Warnings/errors code:
+// 0 - normal (everything all-right)
+// 1 - world entity
+// 2 - free entity
+// 3 - null or non-precached model
+// 4 - no tags with requested index
+// 5 - runaway loop at attachment chain
+extern cvar_t cl_bob;
+extern cvar_t cl_bobcycle;
+extern cvar_t cl_bobup;
+int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex)
+{
+ eval_t *val;
+ int modelindex, reqframe, attachloop;
+ matrix4x4_t entitymatrix, tagmatrix, attachmatrix;
+ edict_t *attachent;
+ model_t *model;
+
+ Matrix4x4_CreateIdentity(out); // warnings and errors return identical matrix
+
+ if (ent == sv.edicts)
+ return 1;
+ if (ent->e->free)
+ return 2;
+
+ modelindex = (int)ent->v->modelindex;
+ if (modelindex <= 0 || modelindex > MAX_MODELS)
+ return 3;
+
+ model = sv.models[modelindex];
+
+ if (ent->v->frame >= 0 && ent->v->frame < model->numframes && model->animscenes)
+ reqframe = model->animscenes[(int)ent->v->frame].firstframe;
+ else
+ reqframe = 0; // if model has wrong frame, engine automatically switches to model first frame
+
+ // get initial tag matrix
+ if (tagindex)
+ {
+ int ret = Mod_Alias_GetTagMatrix(model, reqframe, tagindex - 1, &tagmatrix);
+ if (ret)
+ return ret;
+ }
+ else
+ Matrix4x4_CreateIdentity(&tagmatrix);
+
+ if ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict)
+ { // DP_GFX_QUAKE3MODELTAGS, scan all chain and stop on unattached entity
+ attachloop = 0;
+ do
+ {
+ attachent = EDICT_NUM(val->edict); // to this it entity our entity is attached
+ val = GETEDICTFIELDVALUE(ent, eval_tag_index);
+ if (val->_float >= 1 && attachent->v->modelindex >= 1 && attachent->v->modelindex < MAX_MODELS && (model = sv.models[(int)attachent->v->modelindex]) && model->animscenes && attachent->v->frame >= 0 && attachent->v->frame < model->numframes)
+ Mod_Alias_GetTagMatrix(model, model->animscenes[(int)attachent->v->frame].firstframe, val->_float - 1, &attachmatrix);
+ else
+ Matrix4x4_CreateIdentity(&attachmatrix);
+
+ // apply transformation by child entity matrix
+ val = GETEDICTFIELDVALUE(ent, eval_scale);
+ if (val->_float == 0)
+ val->_float = 1;
+ Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], -ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], val->_float);
+ Matrix4x4_Concat(out, &entitymatrix, &tagmatrix);
+ out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]);
+ out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]);
+ out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]);
+ Matrix4x4_Copy(&tagmatrix, out);
+
+ // finally transformate by matrix of tag on parent entity
+ Matrix4x4_Concat(out, &attachmatrix, &tagmatrix);
+ out->m[0][3] = attachmatrix.m[0][3] + attachmatrix.m[0][0]*tagmatrix.m[0][3] + attachmatrix.m[0][1]*tagmatrix.m[1][3] + attachmatrix.m[0][2]*tagmatrix.m[2][3];
+ out->m[1][3] = attachmatrix.m[1][3] + attachmatrix.m[1][0]*tagmatrix.m[0][3] + attachmatrix.m[1][1]*tagmatrix.m[1][3] + attachmatrix.m[1][2]*tagmatrix.m[2][3];
+ out->m[2][3] = attachmatrix.m[2][3] + attachmatrix.m[2][0]*tagmatrix.m[0][3] + attachmatrix.m[2][1]*tagmatrix.m[1][3] + attachmatrix.m[2][2]*tagmatrix.m[2][3];
+ Matrix4x4_Copy(&tagmatrix, out);
+
+ ent = attachent;
+ attachloop += 1;
+ if (attachloop > 255) // prevent runaway looping
+ return 5;
+ }
+ while ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict);
+ }
+
+ // normal or RENDER_VIEWMODEL entity (or main parent entity on attach chain)
+ val = GETEDICTFIELDVALUE(ent, eval_scale);
+ if (val->_float == 0)
+ val->_float = 1;
+ // Alias models have inverse pitch, bmodels can't have tags, so don't check for modeltype...
+ Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], -ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], val->_float);
+ Matrix4x4_Concat(out, &entitymatrix, &tagmatrix);
+ out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]);
+ out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]);
+ out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]);
+
+ if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict)
+ {// RENDER_VIEWMODEL magic
+ Matrix4x4_Copy(&tagmatrix, out);
+ ent = EDICT_NUM(val->edict);
+
+ val = GETEDICTFIELDVALUE(ent, eval_scale);
+ if (val->_float == 0)
+ val->_float = 1;
+
+ Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2] + ent->v->view_ofs[2], ent->v->v_angle[0], ent->v->v_angle[1], ent->v->v_angle[2], val->_float);
+ Matrix4x4_Concat(out, &entitymatrix, &tagmatrix);
+ out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]);
+ out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]);
+ out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]);
+
+ /*
+ // Cl_bob, ported from rendering code
+ if (ent->v->health > 0 && cl_bob.value && cl_bobcycle.value)
+ {
+ double bob, cycle;
+ // LordHavoc: this code is *weird*, but not replacable (I think it
+ // should be done in QC on the server, but oh well, quake is quake)
+ // LordHavoc: figured out bobup: the time at which the sin is at 180
+ // degrees (which allows lengthening or squishing the peak or valley)
+ cycle = sv.time/cl_bobcycle.value;
+ cycle -= (int)cycle;
+ if (cycle < cl_bobup.value)
+ cycle = sin(M_PI * cycle / cl_bobup.value);
+ else
+ cycle = sin(M_PI + M_PI * (cycle-cl_bobup.value)/(1.0 - cl_bobup.value));
+ // bob is proportional to velocity in the xy plane
+ // (don't count Z, or jumping messes it up)
+ bob = sqrt(ent->v->velocity[0]*ent->v->velocity[0] + ent->v->velocity[1]*ent->v->velocity[1])*cl_bob.value;
+ bob = bob*0.3 + bob*0.7*cycle;
+ out->m[2][3] += bound(-7, bob, 4);
+ }
+ */
+ }
+ return 0;
+}
+
+//float(entity ent, string tagname) gettagindex;
+
+void PF_gettagindex (void)
+{
+ edict_t *ent = G_EDICT(OFS_PARM0);
+ char *tag_name = G_STRING(OFS_PARM1);
+ int modelindex, tag_index;
+
+ if (ent == sv.edicts)
+ PF_WARNING("gettagindex: can't affect world entity\n");
+ if (ent->e->free)
+ PF_WARNING("gettagindex: can't affect free entity\n");
+
+ modelindex = (int)ent->v->modelindex;
+ tag_index = 0;
+ if (modelindex <= 0 || modelindex > MAX_MODELS)
+ Con_DPrintf("gettagindex(entity #%i): null or non-precached model\n", NUM_FOR_EDICT(ent));
+ else
+ {
+ tag_index = SV_GetTagIndex(ent, tag_name);
+ if (tag_index == 0)
+ Con_DPrintf("gettagindex(entity #%i): tag \"%s\" not found\n", NUM_FOR_EDICT(ent), tag_name);
+ }
+ G_FLOAT(OFS_RETURN) = tag_index;
+};
+
+//vector(entity ent, float tagindex) gettaginfo;
+void PF_gettaginfo (void)
+{
+ edict_t *e = G_EDICT(OFS_PARM0);
+ int tagindex = (int)G_FLOAT(OFS_PARM1);
+ matrix4x4_t tag_matrix;
+ int returncode;
+
+ returncode = SV_GetTagMatrix(&tag_matrix, e, tagindex);
+ Matrix4x4_ToVectors(&tag_matrix, pr_global_struct->v_forward, pr_global_struct->v_right, pr_global_struct->v_up, G_VECTOR(OFS_RETURN));
+
+ switch(returncode)
+ {
+ case 1:
+ PF_WARNING("gettagindex: can't affect world entity\n");
+ break;
+ case 2:
+ PF_WARNING("gettagindex: can't affect free entity\n");
+ break;
+ case 3:
+ Con_DPrintf("SV_GetTagMatrix(entity #%i): null or non-precached model\n", NUM_FOR_EDICT(e));
+ break;
+ case 4:
+ Con_DPrintf("SV_GetTagMatrix(entity #%i): model has no tag with requested index %i\n", NUM_FOR_EDICT(e), tagindex);
+ break;
+ case 5:
+ Con_DPrintf("SV_GetTagMatrix(entity #%i): runaway loop at attachment chain\n", NUM_FOR_EDICT(e));
+ break;
+ }
+}
+
/////////////////////////////////////////
// DP_QC_FS_SEARCH extension
caseinsens = G_FLOAT(OFS_PARM1);
quiet = G_FLOAT(OFS_PARM2);
-
+
for(handle = 0; handle < MAX_SEARCHES; handle++)
if(!pr_fssearchlist[handle])
break;
int handle;
handle = G_FLOAT(OFS_PARM0);
-
+
if(handle < 0 || handle >= MAX_SEARCHES)
{
Con_Printf("PF_search_end: invalid handle %i\n", handle);
Con_Printf("PF_search_getsize: no such handle %i\n", handle);
return;
}
-
+
G_FLOAT(OFS_RETURN) = pr_fssearchlist[handle]->numfilenames;
}
Con_Printf("PF_search_getfilename: invalid filenum %i\n", filenum);
return;
}
-
+
tmp = PR_GetTempString();
strcpy(tmp, pr_fssearchlist[handle]->filenames[filenum]);
G_INT(OFS_RETURN) = PR_SetString(tmp);
}
+//void(entity clent) dropclient (DP_SV_DROPCLIENT)
+void PF_dropclient (void)
+{
+ int clientnum;
+ client_t *oldhostclient;
+ clientnum = G_EDICTNUM(OFS_PARM0) - 1;
+ if (clientnum < 0 || clientnum >= svs.maxclients)
+ PF_WARNING("dropclient: not a client\n");
+ if (!svs.clients[clientnum].active)
+ PF_WARNING("dropclient: that client slot is not connected\n");
+ oldhostclient = host_client;
+ host_client = svs.clients + clientnum;
+ SV_DropClient(false);
+ host_client = oldhostclient;
+}
+//entity() spawnclient (DP_SV_BOTCLIENT)
+void PF_spawnclient (void)
+{
+ int i;
+ edict_t *ed;
+ pr_xfunction->builtinsprofile += 2;
+ ed = sv.edicts;
+ for (i = 0;i < svs.maxclients;i++)
+ {
+ if (!svs.clients[i].active)
+ {
+ pr_xfunction->builtinsprofile += 100;
+ SV_ConnectClient (i, NULL);
+ ed = EDICT_NUM(i + 1);
+ break;
+ }
+ }
+ RETURN_EDICT(ed);
+}
+
+//float(entity clent) clienttype (DP_SV_BOTCLIENT)
+void PF_clienttype (void)
+{
+ int clientnum;
+ clientnum = G_EDICTNUM(OFS_PARM0) - 1;
+ if (clientnum < 0 || clientnum >= svs.maxclients)
+ G_FLOAT(OFS_RETURN) = 3;
+ else if (!svs.clients[clientnum].active)
+ G_FLOAT(OFS_RETURN) = 0;
+ else if (svs.clients[clientnum].netconnection)
+ G_FLOAT(OFS_RETURN) = 1;
+ else
+ G_FLOAT(OFS_RETURN) = 2;
+}
builtin_t pr_builtin[] =
{
PF_ceil, // #38 float(float v) ceil
NULL, // #39
PF_checkbottom, // #40 float(entity e) checkbottom
-PF_pointcontents , // #41 float(vector v) pointcontents
+PF_pointcontents, // #41 float(vector v) pointcontents
NULL, // #42
PF_fabs, // #43 float(float f) fabs
PF_aim, // #44 vector(entity e, float speed) aim
PF_tokenize, // #441 float(string s) tokenize (KRIMZON_SV_PARSECLIENTCOMMAND)
PF_argv, // #442 string(float n) argv (KRIMZON_SV_PARSECLIENTCOMMAND)
PF_setattachment, // #443 void(entity e, entity tagentity, string tagname) setattachment (DP_GFX_QUAKE3MODELTAGS)
-PF_search_begin, // #444
-PF_search_end, // #445
-PF_search_getsize, // #446
-PF_search_getfilename, // #447
+PF_search_begin, // #444 float(string pattern, float caseinsensitive, float quiet) search_begin (DP_FS_SEARCH)
+PF_search_end, // #445 void(float handle) search_end (DP_FS_SEARCH)
+PF_search_getsize, // #446 float(float handle) search_getsize (DP_FS_SEARCH)
+PF_search_getfilename, // #447 string(float handle, float num) search_getfilename (DP_FS_SEARCH)
PF_cvar_string, // #448 string(string s) cvar_string (DP_QC_CVAR_STRING)
PF_findflags, // #449 entity(entity start, .float fld, float match) findflags (DP_QC_FINDFLAGS)
PF_findchainflags, // #450 entity(.float fld, float match) findchainflags (DP_QC_FINDCHAINFLAGS)
-NULL, // #451
-NULL, // #452
-NULL, // #453
-NULL, // #454
-NULL, // #455
+PF_gettagindex, // #451 float(entity ent, string tagname) gettagindex (DP_QC_GETTAGINFO)
+PF_gettaginfo, // #452 vector(entity ent, float tagindex) gettaginfo (DP_QC_GETTAGINFO)
+PF_dropclient, // #453 void(entity clent) dropclient (DP_SV_DROPCLIENT)
+PF_spawnclient, // #454 entity() spawnclient (DP_SV_BOTCLIENT)
+PF_clienttype, // #455 float(entity clent) clienttype (DP_SV_BOTCLIENT)
NULL, // #456
NULL, // #457
NULL, // #458
void PR_Cmd_Init(void)
{
- pr_strings_mempool = Mem_AllocPool("pr_stringszone", 0, NULL);
PR_Files_Init();
PR_Search_Init();
}
+void PR_Cmd_Shutdown(void)
+{
+}
+
void PR_Cmd_Reset(void)
{
- Mem_EmptyPool(pr_strings_mempool);
PR_Search_Reset();
PR_Files_CloseAll();
}
projects / xonotic / darkplaces.git / blobdiff