From 17ba7ef92fb4853d68e08b671acf303f5c95c431 Mon Sep 17 00:00:00 2001 From: Adam Olsen Date: Wed, 22 Aug 2001 03:24:25 +0000 Subject: [PATCH] - move alot of the builtins to libQFgamecode_builtins - move the init into qw and nq --- include/QF/progs.h | 2 +- libs/gamecode/builtins/pr_cmds.c | 1617 +----------------------------- libs/gamecode/engine/pr_edict.c | 1 - nq/source/pr_cmds.c | 298 +----- qw/source/sv_pr_cmds.c | 414 +------- 5 files changed, 58 insertions(+), 2274 deletions(-) diff --git a/include/QF/progs.h b/include/QF/progs.h index 746ea289f..044e431a4 100644 --- a/include/QF/progs.h +++ b/include/QF/progs.h @@ -192,7 +192,7 @@ extern struct cvar_s *pr_debug; // PR Cmds stuff // -void PR_Cmds_Init (void); +void PR_Cmds_Init (progs_t *pr); //============================================================================ diff --git a/libs/gamecode/builtins/pr_cmds.c b/libs/gamecode/builtins/pr_cmds.c index 992c2b139..bcfd4b586 100644 --- a/libs/gamecode/builtins/pr_cmds.c +++ b/libs/gamecode/builtins/pr_cmds.c @@ -32,12 +32,17 @@ #ifdef HAVE_STRING_H # include #endif +#include #include "QF/clip_hull.h" #include "QF/cmd.h" #include "QF/cvar.h" #include "QF/msg.h" #include "QF/va.h" +#include "QF/progs.h" +#include "QF/zone.h" +#include "QF/mathlib.h" +#include "QF/console.h" #if 0 #include "compat.h" @@ -55,7 +60,6 @@ BUILT-IN FUNCTIONS */ -#if 0 const char * PF_VarString (progs_t *pr, int first) { @@ -72,229 +76,6 @@ PF_VarString (progs_t *pr, int first) } -/* - PF_error - - This is a TERMINAL error, which will kill off the entire server. - Dumps self. - - error(value) -*/ -void -PF_error (progs_t *pr) -{ - const char *s; - edict_t *ed; - - s = PF_VarString (pr, 0); - SV_Printf ("======SERVER ERROR in %s:\n%s\n", - PR_GetString (pr, pr->pr_xfunction->s_name), s); - ed = PROG_TO_EDICT (pr, *sv_globals.self); - ED_Print (pr, ed); - - SV_Error ("Program error"); -} - -/* - PF_objerror - - Dumps out self, then an error message. The program is aborted and self is - removed, but the level can continue. - - objerror(value) -*/ -void -PF_objerror (progs_t *pr) -{ - const char *s; - edict_t *ed; - - s = PF_VarString (pr, 0); - SV_Printf ("======OBJECT ERROR in %s:\n%s\n", - PR_GetString (pr, pr->pr_xfunction->s_name), s); - ed = PROG_TO_EDICT (pr, *sv_globals.self); - ED_Print (pr, ed); - ED_Free (pr, ed); - - SV_Error ("Program error"); -} - - - -/* - PF_makevectors - - Writes new values for v_forward, v_up, and v_right based on angles - makevectors(vector) -*/ -void -PF_makevectors (progs_t *pr) -{ - AngleVectors (G_VECTOR (pr, OFS_PARM0), *sv_globals.v_forward, - *sv_globals.v_right, *sv_globals.v_up); -} - -/* - PF_setorigin - - This is the only valid way to move an object without using the physics of the world (setting velocity and waiting). Directly changing origin will not set internal links correctly, so clipping would be messed up. This should be called when an object is spawned, and then only if it is teleported. - - setorigin (entity, origin) -*/ -void -PF_setorigin (progs_t *pr) -{ - edict_t *e; - float *org; - - e = G_EDICT (pr, OFS_PARM0); - org = G_VECTOR (pr, OFS_PARM1); - VectorCopy (org, SVvector (e, origin)); - SV_LinkEdict (e, false); -} - - -/* - PF_setsize - - the size box is rotated by the current angle - - setsize (entity, minvector, maxvector) -*/ -void -PF_setsize (progs_t *pr) -{ - edict_t *e; - float *min, *max; - - e = G_EDICT (pr, OFS_PARM0); - min = G_VECTOR (pr, OFS_PARM1); - max = G_VECTOR (pr, OFS_PARM2); - VectorCopy (min, SVvector (e, mins)); - VectorCopy (max, SVvector (e, maxs)); - VectorSubtract (max, min, SVvector (e, size)); - SV_LinkEdict (e, false); -} - - -/* - PF_setmodel - - setmodel(entity, model) - Also sets size, mins, and maxs for inline bmodels -*/ -void -PF_setmodel (progs_t *pr) -{ - edict_t *e; - const char *m, **check; - model_t *mod; - int i; - - e = G_EDICT (pr, OFS_PARM0); - m = G_STRING (pr, 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) - PR_RunError (pr, "no precache: %s\n", m); - - SVstring (e, model) = PR_SetString (pr, m); - SVfloat (e, modelindex) = i; - -// if it is an inline model, get the size information for it - if (m[0] == '*') { - mod = Mod_ForName (m, true); - VectorCopy (mod->mins, SVvector (e, mins)); - VectorCopy (mod->maxs, SVvector (e, maxs)); - VectorSubtract (mod->maxs, mod->mins, SVvector (e, size)); - SV_LinkEdict (e, false); - } - -} - -/* - PF_bprint - - broadcast print to everyone on server - - bprint(value) -*/ -void -PF_bprint (progs_t *pr) -{ - const char *s; - int level; - - level = G_FLOAT (pr, OFS_PARM0); - - s = PF_VarString (pr, 1); - SV_BroadcastPrintf (level, "%s", s); -} - -/* - PF_sprint - - single print to a specific client - - sprint(clientent, value) -*/ -void -PF_sprint (progs_t *pr) -{ - const char *s; - client_t *client; - int entnum; - int level; - - entnum = G_EDICTNUM (pr, OFS_PARM0); - level = G_FLOAT (pr, OFS_PARM1); - - s = PF_VarString (pr, 2); - - if (entnum < 1 || entnum > MAX_CLIENTS) { - SV_Printf ("tried to sprint to a non-client\n"); - return; - } - - client = &svs.clients[entnum - 1]; - - SV_ClientPrintf (client, level, "%s", s); -} - - -/* - PF_centerprint - - single print to a specific client - - centerprint(clientent, value) -*/ -void -PF_centerprint (progs_t *pr) -{ - const char *s; - int entnum; - client_t *cl; - - entnum = G_EDICTNUM (pr, OFS_PARM0); - s = PF_VarString (pr, 1); - - if (entnum < 1 || entnum > MAX_CLIENTS) { - SV_Printf ("tried to sprint to a non-client\n"); - return; - } - - cl = &svs.clients[entnum - 1]; - - ClientReliableWrite_Begin (cl, svc_centerprint, 2 + strlen (s)); - ClientReliableWrite_String (cl, s); -} - - /* PF_normalize @@ -421,76 +202,6 @@ PF_random (progs_t *pr) G_FLOAT (pr, OFS_RETURN) = num; } - -/* - PF_ambientsound -*/ -void -PF_ambientsound (progs_t *pr) -{ - const char **check; - const char *samp; - float *pos; - float vol, attenuation; - int i, soundnum; - - pos = G_VECTOR (pr, OFS_PARM0); - samp = G_STRING (pr, OFS_PARM1); - vol = G_FLOAT (pr, OFS_PARM2); - attenuation = G_FLOAT (pr, 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) { - SV_Printf ("no precache: %s\n", samp); - return; - } -// add an svc_spawnambient command to the level signon packet - - MSG_WriteByte (&sv.signon, svc_spawnstaticsound); - for (i = 0; i < 3; i++) - MSG_WriteCoord (&sv.signon, pos[i]); - - MSG_WriteByte (&sv.signon, soundnum); - - MSG_WriteByte (&sv.signon, vol * 255); - MSG_WriteByte (&sv.signon, attenuation * 64); - -} - -/* - PF_sound - - Each entity can have eight independant sound sources, like voice, - weapon, feet, etc. - - Channel 0 is an auto-allocate channel, the others override anything - already running on that entity/channel pair. - - An attenuation of 0 will play full volume everywhere in the level. - Larger attenuations will drop off. -*/ -void -PF_sound (progs_t *pr) -{ - const char *sample; - int channel; - edict_t *entity; - int volume; - float attenuation; - - entity = G_EDICT (pr, OFS_PARM0); - channel = G_FLOAT (pr, OFS_PARM1); - sample = G_STRING (pr, OFS_PARM2); - volume = G_FLOAT (pr, OFS_PARM3) * 255; - attenuation = G_FLOAT (pr, OFS_PARM4); - - SV_StartSound (entity, channel, sample, volume, attenuation); -} - /* PF_break @@ -499,258 +210,16 @@ PF_sound (progs_t *pr) void PF_break (progs_t *pr) { - SV_Printf ("break statement\n"); + Con_Printf ("break statement\n"); *(int *) -4 = 0; // dump to debugger // PR_RunError (pr, "break statement"); } -/* - PF_traceline - - Used for use tracing and shot targeting - Traces are blocked by bbox and exact bsp entityes, and also slide box - entities if the tryents flag is set. - - traceline (vector1, vector2, tryents) -*/ -void -PF_traceline (progs_t *pr) -{ - float *v1, *v2; - trace_t trace; - int nomonsters; - edict_t *ent; - - v1 = G_VECTOR (pr, OFS_PARM0); - v2 = G_VECTOR (pr, OFS_PARM1); - nomonsters = G_FLOAT (pr, OFS_PARM2); - ent = G_EDICT (pr, OFS_PARM3); - - trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters, ent); - - *sv_globals.trace_allsolid = trace.allsolid; - *sv_globals.trace_startsolid = trace.startsolid; - *sv_globals.trace_fraction = trace.fraction; - *sv_globals.trace_inwater = trace.inwater; - *sv_globals.trace_inopen = trace.inopen; - VectorCopy (trace.endpos, *sv_globals.trace_endpos); - VectorCopy (trace.plane.normal, *sv_globals.trace_plane_normal); - *sv_globals.trace_plane_dist = trace.plane.dist; - if (trace.ent) - *sv_globals.trace_ent = EDICT_TO_PROG (pr, trace.ent); - else - *sv_globals.trace_ent = EDICT_TO_PROG (pr, sv.edicts); -} - -/* - PF_checkmove - - Wrapper around SV_Move, this makes PF_movetoground and PF_traceline - redundant. - - checkmove (start, mins, maxs, end, type, passent) -*/ -void -PF_checkmove (progs_t *pr) -{ - float *start, *end, *mins, *maxs; - trace_t trace; - int type; - edict_t *ent; - - start = G_VECTOR (pr, OFS_PARM0); - mins = G_VECTOR (pr, OFS_PARM1); - maxs = G_VECTOR (pr, OFS_PARM2); - end = G_VECTOR (pr, OFS_PARM3); - type = G_FLOAT (pr, OFS_PARM4); - ent = G_EDICT (pr, OFS_PARM5); - - trace = SV_Move (start, mins, maxs, end, type, ent); - - *sv_globals.trace_allsolid = trace.allsolid; - *sv_globals.trace_startsolid = trace.startsolid; - *sv_globals.trace_fraction = trace.fraction; - *sv_globals.trace_inwater = trace.inwater; - *sv_globals.trace_inopen = trace.inopen; - VectorCopy (trace.endpos, *sv_globals.trace_endpos); - VectorCopy (trace.plane.normal, *sv_globals.trace_plane_normal); - *sv_globals.trace_plane_dist = trace.plane.dist; - if (trace.ent) - *sv_globals.trace_ent = EDICT_TO_PROG (pr, trace.ent); - else - *sv_globals.trace_ent = EDICT_TO_PROG (pr, sv.edicts); -} - -/* - PF_checkpos - - Returns true if the given entity can move to the given position from it's - current position by walking or rolling. - FIXME: make work... - scalar checkpos (entity, vector) -*/ -void -PF_checkpos (progs_t *pr) -{ -} - -//============================================================================ - -byte checkpvs[MAX_MAP_LEAFS / 8]; - -int -PF_newcheckclient (progs_t *pr, int check) -{ - int i; - byte *pvs; - edict_t *ent; - mleaf_t *leaf; - vec3_t org; - -// cycle to the next one - - if (check < 1) - check = 1; - if (check > MAX_CLIENTS) - check = MAX_CLIENTS; - - if (check == MAX_CLIENTS) - i = 1; - else - i = check + 1; - - for (;; i++) { - if (i == MAX_CLIENTS + 1) - i = 1; - - ent = EDICT_NUM (pr, i); - - if (i == check) - break; // didn't find anything else - - if (ent->free) - continue; - if (SVfloat (ent, health) <= 0) - continue; - if ((int) SVfloat (ent, flags) & FL_NOTARGET) - continue; - - // anything that is a client, or has a client as an enemy - break; - } - -// get the PVS for the entity - VectorAdd (SVvector (ent, origin), SVvector (ent, view_ofs), org); - leaf = Mod_PointInLeaf (org, sv.worldmodel); - pvs = Mod_LeafPVS (leaf, sv.worldmodel); - memcpy (checkpvs, pvs, (sv.worldmodel->numleafs + 7) >> 3); - - return i; -} - -/* - PF_checkclient - - Returns a client (or object that has a client enemy) that would be a - valid target. - - If there are more than one valid options, they are cycled each frame - - If (self.origin + self.viewofs) is not in the PVS of the current target, - it is not returned at all. - - name checkclient () -*/ -#define MAX_CHECK 16 -int c_invis, c_notvis; -void -PF_checkclient (progs_t *pr) -{ - edict_t *ent, *self; - mleaf_t *leaf; - int l; - vec3_t view; - -// find a new check if on a new frame - if (sv.time - sv.lastchecktime >= 0.1) { - sv.lastcheck = PF_newcheckclient (pr, sv.lastcheck); - sv.lastchecktime = sv.time; - } -// return check if it might be visible - ent = EDICT_NUM (pr, sv.lastcheck); - if (ent->free || SVfloat (ent, health) <= 0) { - RETURN_EDICT (pr, sv.edicts); - return; - } -// if current entity can't possibly see the check entity, return 0 - self = PROG_TO_EDICT (pr, *sv_globals.self); - VectorAdd (SVvector (self, origin), SVvector (self, view_ofs), view); - leaf = Mod_PointInLeaf (view, sv.worldmodel); - l = (leaf - sv.worldmodel->leafs) - 1; - if ((l < 0) || !(checkpvs[l >> 3] & (1 << (l & 7)))) { - c_notvis++; - RETURN_EDICT (pr, sv.edicts); - return; - } -// might be able to see it - c_invis++; - RETURN_EDICT (pr, ent); -} - -//============================================================================ - - -/* - PF_stuffcmd - - Sends text over to the client's execution buffer - - stuffcmd (clientent, value) -*/ -void -PF_stuffcmd (progs_t *pr) -{ - int entnum; - const char *str; - client_t *cl; - char *buf; - char *p; - - entnum = G_EDICTNUM (pr, OFS_PARM0); - if (entnum < 1 || entnum > MAX_CLIENTS) - PR_RunError (pr, "Parm 0 not a client"); - str = G_STRING (pr, OFS_PARM1); - - cl = &svs.clients[entnum - 1]; - - buf = cl->stufftext_buf; - if (strlen (buf) + strlen (str) >= MAX_STUFFTEXT) - PR_RunError (pr, "stufftext buffer overflow"); - strcat (buf, str); - - if (!strcmp (buf, "disconnect\n")) { - // so long and thanks for all the fish - cl->drop = true; - buf[0] = 0; - return; - } - - p = strrchr (buf, '\n'); - if (p) { - char t = p[1]; - p[1] = 0; - ClientReliableWrite_Begin (cl, svc_stufftext, 2 + p - buf); - ClientReliableWrite_String (cl, buf); - p[1] = t; - strcpy (buf, p + 1); // safe because this is a downward, in - // buffer move - } -} - +#if 0 /* PF_localcmd - Sends text over to the client's execution buffer + Sends text to the host's execution buffer localcmd (string) */ @@ -762,6 +231,7 @@ PF_localcmd (progs_t *pr) str = G_STRING (pr, OFS_PARM0); Cbuf_AddText (str); } +#endif /* PF_cvar @@ -796,67 +266,13 @@ PF_cvar_set (progs_t *pr) var = Cvar_FindAlias (var_name); if (!var) { // FIXME: make Con_DPrint? - SV_Printf ("PF_cvar_set: variable %s not found\n", var_name); + Con_Printf ("PF_cvar_set: variable %s not found\n", var_name); return; } Cvar_Set (var, val); } -/* - PF_findradius - - Returns a chain of entities that have origins within a spherical area - - findradius (origin, radius) -*/ -void -PF_findradius (progs_t *pr) -{ - edict_t *ent, *chain; - float rad; - float *org, *eorigin, *emins, *emaxs; - vec3_t eorg; - int i, j; - - chain = (edict_t *) sv.edicts; - - org = G_VECTOR (pr, OFS_PARM0); - rad = G_FLOAT (pr, OFS_PARM1); - rad *= rad; // Square early, sqrt never. - - ent = NEXT_EDICT (pr, sv.edicts); - for (i = 1; i < sv.num_edicts; i++, ent = NEXT_EDICT (pr, ent)) { - if (ent->free) - continue; - if (SVfloat (ent, solid) == SOLID_NOT) - continue; - eorigin = SVvector (ent, origin); - emins = SVvector (ent, mins); - emaxs = SVvector (ent, maxs); - - for (j = 0; j < 3; j++) - eorg[j] = org[j] - (eorigin[j] + (emins[j] + emaxs[j]) * 0.5); - if (DotProduct (eorg, eorg) > rad) - continue; - - SVentity (ent, chain) = EDICT_TO_PROG (pr, chain); - chain = ent; - } - - RETURN_EDICT (pr, chain); -} - - -/* - PF_dprint -*/ -void -PF_dprint (progs_t *pr) -{ - SV_Printf ("%s", PF_VarString (pr, 0)); -} - char pr_string_temp[128]; void @@ -901,25 +317,6 @@ PF_vtos (progs_t *pr) G_INT (pr, OFS_RETURN) = PR_SetString (pr, pr_string_temp); } -void -PF_Spawn (progs_t *pr) -{ - edict_t *ed; - - ed = ED_Alloc (pr); - RETURN_EDICT (pr, ed); -} - -void -PF_Remove (progs_t *pr) -{ - edict_t *ed; - - ed = G_EDICT (pr, OFS_PARM0); - ED_Free (pr, ed); -} - - // entity (entity start, .string field, string match) find = #5; void PF_Find (progs_t *pr) @@ -935,7 +332,7 @@ PF_Find (progs_t *pr) if (!s) PR_RunError (pr, "PF_Find: bad search string"); - for (e++; e < sv.num_edicts; e++) { + for (e++; e < *pr->num_edicts; e++) { ed = EDICT_NUM (pr, e); if (ed->free) continue; @@ -948,74 +345,9 @@ PF_Find (progs_t *pr) } } - RETURN_EDICT (pr, sv.edicts); + RETURN_EDICT (pr, *pr->edicts); } -void -PR_CheckEmptyString (progs_t *pr, const char *s) -{ - if (s[0] <= ' ') - PR_RunError (pr, "Bad string"); -} - -void -PF_precache_file (progs_t *pr) -{ // precache_file is only used to copy - // files with qcc, it does nothing - G_INT (pr, OFS_RETURN) = G_INT (pr, OFS_PARM0); -} - -void -PF_precache_sound (progs_t *pr) -{ - const char *s; - int i; - - if (sv.state != ss_loading) - PR_RunError - (pr, "PF_Precache_*: Precache can only be done in spawn functions"); - - s = G_STRING (pr, OFS_PARM0); - G_INT (pr, OFS_RETURN) = G_INT (pr, OFS_PARM0); - PR_CheckEmptyString (pr, s); - - for (i = 0; i < MAX_SOUNDS; i++) { - if (!sv.sound_precache[i]) { - sv.sound_precache[i] = s; - return; - } - if (!strcmp (sv.sound_precache[i], s)) - return; - } - PR_RunError (pr, "PF_precache_sound: overflow"); -} - -void -PF_precache_model (progs_t *pr) -{ - const char *s; - int i; - - if (sv.state != ss_loading) - PR_RunError - (pr, "PF_Precache_*: Precache can only be done in spawn functions"); - - s = G_STRING (pr, OFS_PARM0); - G_INT (pr, OFS_RETURN) = G_INT (pr, OFS_PARM0); - PR_CheckEmptyString (pr, s); - - for (i = 0; i < MAX_MODELS; i++) { - if (!sv.model_precache[i]) { - sv.model_precache[i] = s; - return; - } - if (!strcmp (sv.model_precache[i], s)) - return; - } - PR_RunError (pr, "PF_precache_model: overflow"); -} - - void PF_coredump (progs_t *pr) { @@ -1041,106 +373,12 @@ PF_eprint (progs_t *pr) } /* - PF_walkmove - - float(float yaw, float dist) walkmove + PF_dprint */ void -PF_walkmove (progs_t *pr) +PF_dprint (progs_t *pr) { - edict_t *ent; - float yaw, dist; - vec3_t move; - dfunction_t *oldf; - int oldself; - - ent = PROG_TO_EDICT (pr, *sv_globals.self); - yaw = G_FLOAT (pr, OFS_PARM0); - dist = G_FLOAT (pr, OFS_PARM1); - - if (!((int) SVfloat (ent, flags) & (FL_ONGROUND | FL_FLY | FL_SWIM))) { - G_FLOAT (pr, OFS_RETURN) = 0; - return; - } - - yaw = yaw * M_PI * 2 / 360; - - move[0] = cos (yaw) * dist; - move[1] = sin (yaw) * dist; - move[2] = 0; - -// save program state, because SV_movestep may call other progs - oldf = pr->pr_xfunction; - oldself = *sv_globals.self; - - G_FLOAT (pr, OFS_RETURN) = SV_movestep (ent, move, true); - - -// restore program state - pr->pr_xfunction = oldf; - *sv_globals.self = oldself; -} - -/* - PF_droptofloor - - void() droptofloor -*/ -void -PF_droptofloor (progs_t *pr) -{ - edict_t *ent; - vec3_t end; - trace_t trace; - - ent = PROG_TO_EDICT (pr, *sv_globals.self); - - VectorCopy (SVvector (ent, origin), end); - end[2] -= 256; - - trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins), SVvector (ent, maxs), end, false, ent); - - if (trace.fraction == 1 || trace.allsolid) - G_FLOAT (pr, OFS_RETURN) = 0; - else { - VectorCopy (trace.endpos, SVvector (ent, origin)); - SV_LinkEdict (ent, false); - SVfloat (ent, flags) = (int) SVfloat (ent, flags) | FL_ONGROUND; - SVentity (ent, groundentity) = EDICT_TO_PROG (pr, trace.ent); - G_FLOAT (pr, OFS_RETURN) = 1; - } -} - -/* - PF_lightstyle - - void(float style, string value) lightstyle -*/ -void -PF_lightstyle (progs_t *pr) -{ - int style; - const char *val; - client_t *client; - int j; - - style = G_FLOAT (pr, OFS_PARM0); - val = G_STRING (pr, OFS_PARM1); - -// change the string in sv - sv.lightstyles[style] = val; - -// send message to all clients on this server - if (sv.state != ss_active) - return; - - for (j = 0, client = svs.clients; j < MAX_CLIENTS; j++, client++) - if (client->state == cs_spawned) { - ClientReliableWrite_Begin (client, svc_lightstyle, - strlen (val) + 3); - ClientReliableWrite_Char (client, style); - ClientReliableWrite_String (client, val); - } + Con_Printf ("%s", PF_VarString (pr, 0)); } void @@ -1167,33 +405,6 @@ PF_ceil (progs_t *pr) G_FLOAT (pr, OFS_RETURN) = ceil (G_FLOAT (pr, OFS_PARM0)); } - -/* - PF_checkbottom -*/ -void -PF_checkbottom (progs_t *pr) -{ - edict_t *ent; - - ent = G_EDICT (pr, OFS_PARM0); - - G_FLOAT (pr, OFS_RETURN) = SV_CheckBottom (ent); -} - -/* - PF_pointcontents -*/ -void -PF_pointcontents (progs_t *pr) -{ - float *v; - - v = G_VECTOR (pr, OFS_PARM0); - - G_FLOAT (pr, OFS_RETURN) = SV_PointContents (v); -} - /* PF_nextent @@ -1208,8 +419,8 @@ PF_nextent (progs_t *pr) i = G_EDICTNUM (pr, OFS_PARM0); while (1) { i++; - if (i == sv.num_edicts) { - RETURN_EDICT (pr, sv.edicts); + if (i == *pr->num_edicts) { + RETURN_EDICT (pr, *pr->edicts); return; } ent = EDICT_NUM (pr, i); @@ -1220,433 +431,6 @@ PF_nextent (progs_t *pr) } } -/* - PF_aim - - Pick a vector for the player to shoot along - vector aim(entity, missilespeed) -*/ -cvar_t *sv_aim; -void -PF_aim (progs_t *pr) -{ - edict_t *ent, *check, *bestent; - vec3_t start, dir, end, bestdir; - int i, j; - trace_t tr; - float dist, bestdist; - float speed; - const char *noaim; - - ent = G_EDICT (pr, OFS_PARM0); - speed = G_FLOAT (pr, OFS_PARM1); - - VectorCopy (SVvector (ent, origin), start); - start[2] += 20; - -// noaim option - i = NUM_FOR_EDICT (pr, ent); - if (i > 0 && i < MAX_CLIENTS) { - noaim = Info_ValueForKey (svs.clients[i - 1].userinfo, "noaim"); - if (atoi (noaim) > 0) { - VectorCopy (*sv_globals.v_forward, G_VECTOR (pr, OFS_RETURN)); - return; - } - } -// try sending a trace straight - VectorCopy (*sv_globals.v_forward, dir); - VectorMA (start, 2048, dir, end); - tr = SV_Move (start, vec3_origin, vec3_origin, end, false, ent); - if (tr.ent && SVfloat (tr.ent, takedamage) == DAMAGE_AIM - && (!teamplay->int_val || SVfloat (ent, team) <= 0 - || SVfloat (ent, team) != SVfloat (tr.ent, team))) { - VectorCopy (*sv_globals.v_forward, G_VECTOR (pr, OFS_RETURN)); - return; - } - -// try all possible entities - VectorCopy (dir, bestdir); - bestdist = sv_aim->value; - bestent = NULL; - - check = NEXT_EDICT (pr, sv.edicts); - for (i = 1; i < sv.num_edicts; i++, check = NEXT_EDICT (pr, check)) { - if (SVfloat (check, takedamage) != DAMAGE_AIM) - continue; - if (check == ent) - continue; - if (teamplay->int_val && SVfloat (ent, team) > 0 - && SVfloat (ent, team) == SVfloat (check, team)) continue; // don't aim at - // teammate - for (j = 0; j < 3; j++) - end[j] = SVvector (check, origin)[j] - + 0.5 * (SVvector (check, mins)[j] + SVvector (check, maxs)[j]); - VectorSubtract (end, start, dir); - VectorNormalize (dir); - dist = DotProduct (dir, *sv_globals.v_forward); - if (dist < bestdist) - continue; // to far to turn - tr = SV_Move (start, vec3_origin, vec3_origin, end, false, ent); - if (tr.ent == check) { // can shoot at this one - bestdist = dist; - bestent = check; - } - } - - if (bestent) { - VectorSubtract (SVvector (bestent, origin), SVvector (ent, origin), dir); - dist = DotProduct (dir, *sv_globals.v_forward); - VectorScale (*sv_globals.v_forward, dist, end); - end[2] = dir[2]; - VectorNormalize (end); - VectorCopy (end, G_VECTOR (pr, OFS_RETURN)); - } else { - VectorCopy (bestdir, G_VECTOR (pr, OFS_RETURN)); - } -} - -/* - PF_changeyaw - - This was a major timewaster in progs, so it was converted to C -*/ -void -PF_changeyaw (progs_t *pr) -{ - edict_t *ent; - float ideal, current, move, speed; - - ent = PROG_TO_EDICT (pr, *sv_globals.self); - current = anglemod (SVvector (ent, angles)[1]); - ideal = SVfloat (ent, ideal_yaw); - speed = SVfloat (ent, yaw_speed); - - if (current == ideal) - return; - move = ideal - current; - if (ideal > current) { - if (move >= 180) - move = move - 360; - } else { - if (move <= -180) - move = move + 360; - } - if (move > 0) { - if (move > speed) - move = speed; - } else { - if (move < -speed) - move = -speed; - } - - SVvector (ent, angles)[1] = anglemod (current + move); -} - -/* - MESSAGE WRITING -*/ - -#define MSG_BROADCAST 0 // unreliable to all -#define MSG_ONE 1 // reliable to one (msg_entity) -#define MSG_ALL 2 // reliable to all -#define MSG_INIT 3 // write to the init string -#define MSG_MULTICAST 4 // for multicast() - -sizebuf_t * -WriteDest (progs_t *pr) -{ - int dest; - - dest = G_FLOAT (pr, OFS_PARM0); - switch (dest) { - case MSG_BROADCAST: - return &sv.datagram; - - case MSG_ONE: - SV_Error ("Shouldn't be at MSG_ONE"); -#if 0 - ent = PROG_TO_EDICT (pr, *sv_globals.msg_entity); - entnum = NUM_FOR_EDICT (pr, ent); - if (entnum < 1 || entnum > MAX_CLIENTS) - PR_RunError (pr, "WriteDest: not a client"); - return &svs.clients[entnum - 1].netchan.message; -#endif - - case MSG_ALL: - return &sv.reliable_datagram; - - case MSG_INIT: - if (sv.state != ss_loading) - PR_RunError - (pr, "PF_Write_*: MSG_INIT can only be written in spawn functions"); - return &sv.signon; - - case MSG_MULTICAST: - return &sv.multicast; - - default: - PR_RunError (pr, "WriteDest: bad destination"); - break; - } - - return NULL; -} - -static client_t * -Write_GetClient (progs_t *pr) -{ - int entnum; - edict_t *ent; - - ent = PROG_TO_EDICT (pr, *sv_globals.msg_entity); - entnum = NUM_FOR_EDICT (pr, ent); - if (entnum < 1 || entnum > MAX_CLIENTS) - PR_RunError (pr, "Write_GetClient: not a client"); - return &svs.clients[entnum - 1]; -} - - -void -PF_WriteByte (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 1); - ClientReliableWrite_Byte (cl, G_FLOAT (pr, OFS_PARM1)); - } else - MSG_WriteByte (WriteDest (pr), G_FLOAT (pr, OFS_PARM1)); -} - -void -PF_WriteChar (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 1); - ClientReliableWrite_Char (cl, G_FLOAT (pr, OFS_PARM1)); - } else - MSG_WriteChar (WriteDest (pr), G_FLOAT (pr, OFS_PARM1)); -} - -void -PF_WriteShort (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 2); - ClientReliableWrite_Short (cl, G_FLOAT (pr, OFS_PARM1)); - } else - MSG_WriteShort (WriteDest (pr), G_FLOAT (pr, OFS_PARM1)); -} - -void -PF_WriteLong (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 4); - ClientReliableWrite_Long (cl, G_FLOAT (pr, OFS_PARM1)); - } else - MSG_WriteLong (WriteDest (pr), G_FLOAT (pr, OFS_PARM1)); -} - -void -PF_WriteAngle (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 1); - ClientReliableWrite_Angle (cl, G_FLOAT (pr, OFS_PARM1)); - } else - MSG_WriteAngle (WriteDest (pr), G_FLOAT (pr, OFS_PARM1)); -} - -void -PF_WriteCoord (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 2); - ClientReliableWrite_Coord (cl, G_FLOAT (pr, OFS_PARM1)); - } else - MSG_WriteCoord (WriteDest (pr), G_FLOAT (pr, OFS_PARM1)); -} - -void -PF_WriteString (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 1 + strlen (G_STRING (pr, OFS_PARM1))); - ClientReliableWrite_String (cl, G_STRING (pr, OFS_PARM1)); - } else - MSG_WriteString (WriteDest (pr), G_STRING (pr, OFS_PARM1)); -} - - -void -PF_WriteEntity (progs_t *pr) -{ - if (G_FLOAT (pr, OFS_PARM0) == MSG_ONE) { - client_t *cl = Write_GetClient (pr); - - ClientReliableCheckBlock (cl, 2); - ClientReliableWrite_Short (cl, G_EDICTNUM (pr, OFS_PARM1)); - } else - MSG_WriteShort (WriteDest (pr), G_EDICTNUM (pr, OFS_PARM1)); -} - -//============================================================================= - -int SV_ModelIndex (const char *name); - -void -PF_makestatic (progs_t *pr) -{ - edict_t *ent; - int i; - const char *model; - - ent = G_EDICT (pr, OFS_PARM0); - - MSG_WriteByte (&sv.signon, svc_spawnstatic); - - model = PR_GetString (pr, SVstring (ent, model)); -//SV_Printf ("Model: %d %s\n", SVstring (ent, model), model); - MSG_WriteByte (&sv.signon, SV_ModelIndex (model)); - - MSG_WriteByte (&sv.signon, SVfloat (ent, frame)); - MSG_WriteByte (&sv.signon, SVfloat (ent, colormap)); - MSG_WriteByte (&sv.signon, SVfloat (ent, skin)); - for (i = 0; i < 3; i++) { - MSG_WriteCoord (&sv.signon, SVvector (ent, origin)[i]); - MSG_WriteAngle (&sv.signon, SVvector (ent, angles)[i]); - } - -// throw the entity away now - ED_Free (pr, ent); -} - -//============================================================================= - -/* - PF_setspawnparms -*/ -void -PF_setspawnparms (progs_t *pr) -{ - edict_t *ent; - int i; - client_t *client; - - ent = G_EDICT (pr, OFS_PARM0); - i = NUM_FOR_EDICT (pr, ent); - if (i < 1 || i > MAX_CLIENTS) - PR_RunError (pr, "Entity is not a client"); - - // copy spawn parms out of the client_t - client = svs.clients + (i - 1); - - for (i = 0; i < NUM_SPAWN_PARMS; i++) - sv_globals.parms[i] = client->spawn_parms[i]; -} - -/* - PF_changelevel -*/ -void -PF_changelevel (progs_t *pr) -{ - const char *s; - static int last_spawncount; - -// make sure we don't issue two changelevels - if (svs.spawncount == last_spawncount) - return; - last_spawncount = svs.spawncount; - - s = G_STRING (pr, OFS_PARM0); - Cbuf_AddText (va ("map %s\n", s)); -} - - -/* - PF_logfrag - - logfrag (killer, killee) -*/ -void -PF_logfrag (progs_t *pr) -{ - edict_t *ent1, *ent2; - int e1, e2; - const char *s; - - ent1 = G_EDICT (pr, OFS_PARM0); - ent2 = G_EDICT (pr, OFS_PARM1); - - e1 = NUM_FOR_EDICT (pr, ent1); - e2 = NUM_FOR_EDICT (pr, ent2); - - if (e1 < 1 || e1 > MAX_CLIENTS || e2 < 1 || e2 > MAX_CLIENTS) - return; - - s = va ("\\%s\\%s\\\n", svs.clients[e1 - 1].name, svs.clients[e2 - 1].name); - - SZ_Print (&svs.log[svs.logsequence & 1], s); - if (sv_fraglogfile) { - Qprintf (sv_fraglogfile, s); - Qflush (sv_fraglogfile); - } -} - - -/* - PF_infokey - - string(entity e, string key) infokey -*/ -void -PF_infokey (progs_t *pr) -{ - edict_t *e; - int e1; - const char *value; - const char *key; - static char ov[256]; - - e = G_EDICT (pr, OFS_PARM0); - e1 = NUM_FOR_EDICT (pr, e); - key = G_STRING (pr, OFS_PARM1); - - if (e1 == 0) { - if ((value = Info_ValueForKey (svs.info, key)) == NULL || !*value) - value = Info_ValueForKey (localinfo, key); - } else if (e1 <= MAX_CLIENTS) { - if (!strcmp (key, "ip")) - value = - strcpy (ov, - NET_BaseAdrToString (svs.clients[e1 - 1].netchan. - remote_address)); - else if (!strcmp (key, "ping")) { - int ping = SV_CalcPing (&svs.clients[e1 - 1]); - - snprintf (ov, sizeof (ov), "%d", ping); - value = ov; - } else - value = Info_ValueForKey (svs.clients[e1 - 1].userinfo, key); - } else - value = ""; - - RETURN_STRING (pr, value); -} /* PF_stof @@ -1664,23 +448,6 @@ PF_stof (progs_t *pr) } -/* - PF_multicast - - void(vector where, float set) multicast -*/ -void -PF_multicast (progs_t *pr) -{ - float *o; - int to; - - o = G_VECTOR (pr, OFS_PARM0); - to = G_FLOAT (pr, OFS_PARM1); - - SV_Multicast (o, to); -} - /* PF_strlen @@ -1721,7 +488,7 @@ PF_charcount (progs_t *pr) G_FLOAT (pr, OFS_RETURN) = count; } - +#if 0 /* PF_cfopen @@ -1787,110 +554,7 @@ PF_cfquota (progs_t *pr) { G_FLOAT (pr, OFS_RETURN) = CF_Quota(); } - - -void -PF_setinfokey (progs_t *pr) -{ - edict_t *edict = G_EDICT (pr, OFS_PARM0); - int e1 = NUM_FOR_EDICT (pr, edict); - const char *key = G_STRING (pr, OFS_PARM1); - const char *value = G_STRING (pr, OFS_PARM2); - - if (e1 == 0) { - Info_SetValueForKey (localinfo, key, value, MAX_LOCALINFO_STRING, - !sv_highchars->int_val); - } else if (e1 <= MAX_CLIENTS) { - Info_SetValueForKey (svs.clients[e1 - 1].userinfo, key, value, - MAX_INFO_STRING, !sv_highchars->int_val); - SV_ExtractFromUserinfo (&svs.clients[e1 - 1]); - MSG_WriteByte (&sv.reliable_datagram, svc_setinfo); - MSG_WriteByte (&sv.reliable_datagram, e1 - 1); - MSG_WriteString (&sv.reliable_datagram, key); - MSG_WriteString (&sv.reliable_datagram, - Info_ValueForKey (svs.clients[e1 - 1].userinfo, key)); - } -} - - -static void -PF_testentitypos (progs_t *pr) -{ - edict_t *ent = G_EDICT (pr, OFS_PARM0); - ent = SV_TestEntityPosition (ent); - RETURN_EDICT (pr, ent ? ent : sv.edicts); -} - - -#define MAX_PF_HULLS 64 // FIXME make dynamic? -clip_hull_t *pf_hull_list[MAX_PF_HULLS]; - -static void -PF_hullpointcontents (progs_t *pr) -{ - edict_t *edict = G_EDICT (pr, OFS_PARM0); - float *mins = G_VECTOR (pr, OFS_PARM1); - float *maxs = G_VECTOR (pr, OFS_PARM2); - float *point = G_VECTOR (pr, OFS_PARM3); - hull_t *hull; - vec3_t offset; - - hull = SV_HullForEntity (edict, mins, maxs, offset); - VectorSubtract (point, offset, offset); - G_INT (pr, OFS_RETURN) = SV_HullPointContents (hull, 0, offset); -} - -static void -PF_getboxbounds (progs_t *pr) -{ - int h = G_INT (pr, OFS_PARM0) - 1; - clip_hull_t *ch; - - if (h < 0 || h > MAX_PF_HULLS - 1 || !(ch = pf_hull_list[h])) - PR_RunError (pr, "PF_freeboxhull: invalid box hull handle\n"); - - if (G_INT (pr, OFS_PARM1)) { - VectorCopy (ch->maxs, G_VECTOR (pr, OFS_RETURN)); - } else { - VectorCopy (ch->mins, G_VECTOR (pr, OFS_RETURN)); - } -} - -static void -PF_getboxhull (progs_t *pr) -{ - clip_hull_t *ch = 0; - int i; - - for (i = 0; i < MAX_PF_HULLS; i++) { - if (!pf_hull_list[i]) { - ch = MOD_Alloc_Hull (6, 6); - break; - } - } - - if (ch) { - pf_hull_list[i] = ch; - G_INT (pr, OFS_RETURN) = i + 1; - for (i = 0; i < MAX_MAP_HULLS; i++) - SV_InitHull (ch->hulls[i], ch->hulls[i]->clipnodes, - ch->hulls[i]->planes); - } else { - G_INT (pr, OFS_RETURN) = 0; - } -} - -static void -PF_freeboxhull (progs_t *pr) -{ - int h = G_INT (pr, OFS_PARM0) - 1; - clip_hull_t *ch; - - if (h < 0 || h > MAX_PF_HULLS - 1 || !(ch = pf_hull_list[h])) - PR_RunError (pr, "PF_freeboxhull: invalid box hull handle\n"); - pf_hull_list[h] = 0; - MOD_Free_Hull (ch); -} +#endif static vec_t calc_dist (vec3_t p, vec3_t n, vec3_t *offsets) @@ -1909,101 +573,12 @@ calc_dist (vec3_t p, vec3_t n, vec3_t *offsets) return DotProduct (v, n); } -static void -PF_rotate_bbox (progs_t *pr) -{ - int h = G_INT (pr, OFS_PARM0) - 1; - float *dir[3] = { - G_VECTOR (pr, OFS_PARM1), - G_VECTOR (pr, OFS_PARM2), - G_VECTOR (pr, OFS_PARM3), - }; - float *mi = G_VECTOR (pr, OFS_PARM4); - float *ma = G_VECTOR (pr, OFS_PARM5); - - vec3_t mins, maxs; - float *verts[6] = {maxs, mins, maxs, mins, maxs, mins}; - - vec3_t offsets[3][2] = { - { { 0, 0, 0 }, { 0, 0, 0} }, - { { -16, -16, -32 }, { 16, 16, 24} }, - { { -32, -32, -64 }, { 32, 32, 24} }, - }; - vec3_t v[8], d; - hull_t *hull; - clip_hull_t *ch; - int i, j; - float l; - - if (h < 0 || h > MAX_PF_HULLS - 1 || !(ch = pf_hull_list[h])) - PR_RunError (pr, "PF_freeboxhull: invalid box hull handle\n"); - - // set up the rotation matrix. the three orientation vectors form the - // columns of the rotation matrix - for (i = 0; i < 3; i++) { - for (j = 0; j < 3; j++) { - ch->axis[i][j] = dir[j][i]; - } - } - // rotate the bounding box points - for (i = 0; i < 3; i++) { - mins[i] = DotProduct (ch->axis[i], mi); - maxs[i] = DotProduct (ch->axis[i], ma); - } - // find all 8 corners of the rotated box - VectorCopy (mins, v[0]); - VectorCopy (maxs, v[1]); - VectorSubtract (maxs, mins, d); - for (i = 0; i < 3; i++) { - vec3_t x; - - l = DotProduct (d, dir[i]); - VectorScale (dir[i], l, x); - VectorAdd (mins, x, v[2 + i * 2]); - VectorSubtract (maxs, x, v[3 + i * 2]); - } - // now find the aligned bounding box - VectorCopy (v[0], ch->mins); - VectorCopy (v[0], ch->maxs); - for (i = 0; i < 8; i++) { - //Con_Printf ("'%0.1f %0.1f %0.1f'\n", v[i][0], v[i][1], v[i][2]); - for (j = 0; j < 3; j++) { - ch->mins[j] = min (ch->mins[j], v[i][j]); - ch->maxs[j] = max (ch->maxs[j], v[i][j]); - } - } - - // set up the 3 size based hulls - for (j = 0; j < 3; j++) { - hull = ch->hulls[j]; - VectorScale (offsets[j][1], -1, hull->clip_mins); - VectorScale (offsets[j][0], -1, hull->clip_maxs); - // set up the clip planes - for (i = 0; i < 6; i++) { - hull->planes[i].dist = calc_dist (verts[i], dir[i / 2], offsets[j]); - hull->planes[i].type = 4; - VectorCopy (dir[i / 2], hull->planes[i].normal); - //Con_Printf ("%f %f %f %f\n", - // hull->planes[i].dist, - // hull->planes[i].normal[0], hull->planes[i].normal[1], - // hull->planes[i].normal[2]); - } - } -} - - void PF_Fixme (progs_t *pr) { PR_RunError (pr, "unimplemented bulitin"); } -void -PF_Checkextension (progs_t *pr) -{ - G_FLOAT(pr, OFS_RETURN) = 0; //FIXME make this function actually useful :P -} - void PF_checkbuiltin (progs_t *pr) { @@ -2022,130 +597,44 @@ PF_getbuiltin (progs_t *pr) PR_RunError (pr, "PF_getfunction: function '%s' not found!\n", name); G_FUNCTION (pr, OFS_RETURN) = -i; } -#endif void -PR_Cmds_Init () +PR_Cmds_Init (progs_t *pr) { + PR_AddBuiltin (pr, "break", PF_break, 6); // void() break = #6 + PR_AddBuiltin (pr, "random", PF_random, 7); // float() random = #7 + PR_AddBuiltin (pr, "normalize", PF_normalize, 9); // vector(vector v) normalize = #9 + PR_AddBuiltin (pr, "vlen", PF_vlen, 12); // float(vector v) vlen = #12 + PR_AddBuiltin (pr, "vectoyaw", PF_vectoyaw, 13); // float(vector v) vectoyaw = #13 + PR_AddBuiltin (pr, "find", PF_Find, 18); // entity(entity start, .string fld, string match) find = #18 + PR_AddBuiltin (pr, "dprint", PF_dprint, 25); // void(string s) dprint = #25 + PR_AddBuiltin (pr, "ftos", PF_ftos, 26); // void(string s) ftos = #26 + PR_AddBuiltin (pr, "vtos", PF_vtos, 27); // void(string s) vtos = #27 + PR_AddBuiltin (pr, "coredump", PF_coredump, 28); // void() coredump = #28 + PR_AddBuiltin (pr, "traceon", PF_traceon, 29); // void() traceon = #29 + PR_AddBuiltin (pr, "traceoff", PF_traceoff, 30); // void() traceoff = #30 + PR_AddBuiltin (pr, "eprint", PF_eprint, 31); // void(entity e) = #31 debug print an entire entity + PR_AddBuiltin (pr, "rint", PF_rint, 36); // float(float v) rint = #36 + PR_AddBuiltin (pr, "floor", PF_floor, 37); // float(float v) floor = #37 + PR_AddBuiltin (pr, "ceil", PF_ceil, 38); // float(float v) ceil = #38 + PR_AddBuiltin (pr, "fabs", PF_fabs, 43); // float(float f) fabs = #43 + PR_AddBuiltin (pr, "cvar", PF_cvar, 45); // float(string s) cvar = #45 #if 0 - PR_AddBuiltin (&sv_pr_state, "makevectors", PF_makevectors, 1); // void(entity e) makevectors = #1 - PR_AddBuiltin (&sv_pr_state, "setorigin", PF_setorigin, 2); // void(entity e, vector o) setorigin = #2 - PR_AddBuiltin (&sv_pr_state, "setmodel", PF_setmodel, 3); // void(entity e, string m) setmodel = #3 - PR_AddBuiltin (&sv_pr_state, "setsize", PF_setsize, 4); // void(entity e, vector min, vector max) setsize = #4 - PR_AddBuiltin (&sv_pr_state, "fixme", PF_Fixme, 5); // void(entity e, vector min, vector max) setabssize = #5 - PR_AddBuiltin (&sv_pr_state, "break", PF_break, 6); // void() break = #6 - PR_AddBuiltin (&sv_pr_state, "random", PF_random, 7); // float() random = #7 - PR_AddBuiltin (&sv_pr_state, "sound", PF_sound, 8); // void(entity e, float chan, string samp) sound = #8 - PR_AddBuiltin (&sv_pr_state, "normalize", PF_normalize, 9); // vector(vector v) normalize = #9 - PR_AddBuiltin (&sv_pr_state, "error", PF_error, 10); // void(string e) error = #10 - PR_AddBuiltin (&sv_pr_state, "objerror", PF_objerror, 11); // void(string e) objerror = #11 - PR_AddBuiltin (&sv_pr_state, "vlen", PF_vlen, 12); // float(vector v) vlen = #12 - PR_AddBuiltin (&sv_pr_state, "vectoyaw", PF_vectoyaw, 13); // float(vector v) vectoyaw = #13 - PR_AddBuiltin (&sv_pr_state, "spawn", PF_Spawn, 14); // entity() spawn = #14 - PR_AddBuiltin (&sv_pr_state, "remove", PF_Remove, 15); // void(entity e) remove = #15 - PR_AddBuiltin (&sv_pr_state, "traceline", PF_traceline, 16); // float(vector v1, vector v2, float tryents) traceline = #16 - PR_AddBuiltin (&sv_pr_state, "checkclient", PF_checkclient, 17); // entity() clientlist = #17 - PR_AddBuiltin (&sv_pr_state, "find", PF_Find, 18); // entity(entity start, .string fld, string match) find = #18 - PR_AddBuiltin (&sv_pr_state, "precache_sound", PF_precache_sound, 19); // void(string s) precache_sound = #19 - PR_AddBuiltin (&sv_pr_state, "precache_model", PF_precache_model, 20); // void(string s) precache_model = #20 - PR_AddBuiltin (&sv_pr_state, "stuffcmd", PF_stuffcmd, 21); // void(entity client, string s) stuffcmd = #21 - PR_AddBuiltin (&sv_pr_state, "findradius", PF_findradius, 22); // entity(vector org, float rad) findradius = #22 - PR_AddBuiltin (&sv_pr_state, "bprint", PF_bprint, 23); // void(string s) bprint = #23 - PR_AddBuiltin (&sv_pr_state, "sprint", PF_sprint, 24); // void(entity client, string s) sprint = #24 - PR_AddBuiltin (&sv_pr_state, "dprint", PF_dprint, 25); // void(string s) dprint = #25 - PR_AddBuiltin (&sv_pr_state, "ftos", PF_ftos, 26); // void(string s) ftos = #26 - PR_AddBuiltin (&sv_pr_state, "vtos", PF_vtos, 27); // void(string s) vtos = #27 - PR_AddBuiltin (&sv_pr_state, "coredump", PF_coredump, 28); // void() coredump = #28 - PR_AddBuiltin (&sv_pr_state, "traceon", PF_traceon, 29); // void() traceon = #29 - PR_AddBuiltin (&sv_pr_state, "traceoff", PF_traceoff, 30); // void() traceoff = #30 - PR_AddBuiltin (&sv_pr_state, "eprint", PF_eprint, 31); // void(entity e) = #31 debug print an entire entity - PR_AddBuiltin (&sv_pr_state, "walkmove", PF_walkmove, 32); // float(float yaw, float dist) walkmove = #32 - // no 33 - PR_AddBuiltin (&sv_pr_state, "droptofloor", PF_droptofloor, 34); // float() droptofloor = #34 - PR_AddBuiltin (&sv_pr_state, "lightstyle", PF_lightstyle, 35); // void(float style, string value) lightstyle = #35 - PR_AddBuiltin (&sv_pr_state, "rint", PF_rint, 36); // float(float v) rint = #36 - PR_AddBuiltin (&sv_pr_state, "floor", PF_floor, 37); // float(float v) floor = #37 - PR_AddBuiltin (&sv_pr_state, "ceil", PF_ceil, 38); // float(float v) ceil = #38 - // no 39 - PR_AddBuiltin (&sv_pr_state, "checkbottom", PF_checkbottom, 40); // float(entity e) checkbottom = #40 - PR_AddBuiltin (&sv_pr_state, "pointcontents", PF_pointcontents, 41); // float(vector v) pointcontents = #41 - // no 42 - PR_AddBuiltin (&sv_pr_state, "fabs", PF_fabs, 43); // float(float f) fabs = #43 - PR_AddBuiltin (&sv_pr_state, "aim", PF_aim, 44); // vector(entity e, float speed) aim = #44 - PR_AddBuiltin (&sv_pr_state, "cvar", PF_cvar, 45); // float(string s) cvar = #45 - PR_AddBuiltin (&sv_pr_state, "localcmd", PF_localcmd, 46); // void(string s) localcmd = #46 - PR_AddBuiltin (&sv_pr_state, "nextent", PF_nextent, 47); // entity(entity e) nextent = #47 - // no 48 - PR_AddBuiltin (&sv_pr_state, "changeyaw", PF_changeyaw, 49); // void() ChangeYaw = #49 - // no 50 - PR_AddBuiltin (&sv_pr_state, "vectoangles", PF_vectoangles, 51); // vector(vector v) vectoangles = #51 + PR_AddBuiltin (pr, "localcmd", PF_localcmd, 46); // void(string s) localcmd = #46 +#endif + PR_AddBuiltin (pr, "nextent", PF_nextent, 47); // entity(entity e) nextent = #47 + PR_AddBuiltin (pr, "vectoangles", PF_vectoangles, 51); // vector(vector v) vectoangles = #51 + PR_AddBuiltin (pr, "cvar_set", PF_cvar_set, 72); // void(string var, string val) cvar_set = #72 - PR_AddBuiltin (&sv_pr_state, "writebyte", PF_WriteByte, 52); // void(float to, float f) WriteByte = #52 - PR_AddBuiltin (&sv_pr_state, "writechar", PF_WriteChar, 53); // void(float to, float f) WriteChar = #53 - PR_AddBuiltin (&sv_pr_state, "writeshort", PF_WriteShort, 54); // void(float to, float f) WriteShort = #54 - PR_AddBuiltin (&sv_pr_state, "writelong", PF_WriteLong, 55); // void(float to, float f) WriteLong = #55 - PR_AddBuiltin (&sv_pr_state, "writecoord", PF_WriteCoord, 56); // void(float to, float f) WriteCoord = #56 - PR_AddBuiltin (&sv_pr_state, "writeangle", PF_WriteAngle, 57); // void(float to, float f) WriteAngle = #57 - PR_AddBuiltin (&sv_pr_state, "writestring", PF_WriteString, 58); // void(float to, string s) WriteString = #58 - PR_AddBuiltin (&sv_pr_state, "writeentity", PF_WriteEntity, 59); // void(float to, entity s) WriteEntity = #59 - - // 60 - // 61 - // 62 - // 63 - // 64 - // 65 - // 66 - - PR_AddBuiltin (&sv_pr_state, "movetogoal", SV_MoveToGoal, 67); // void(float step) movetogoal = #67 - PR_AddBuiltin (&sv_pr_state, "precache_file", PF_precache_file, 68); // string(string s) precache_file = #68 - PR_AddBuiltin (&sv_pr_state, "makestatic", PF_makestatic, 69); // void(entity e) makestatic = #69 - - PR_AddBuiltin (&sv_pr_state, "changelevel", PF_changelevel, 70); // void(string s) changelevel = #70 - // 71 - - PR_AddBuiltin (&sv_pr_state, "cvar_set", PF_cvar_set, 72); // void(string var, string val) cvar_set = #72 - PR_AddBuiltin (&sv_pr_state, "centerprint", PF_centerprint, 73); // void(...) centerprint = #73 - - PR_AddBuiltin (&sv_pr_state, "ambientsound", PF_ambientsound, 74); // void(vector pos, string samp, float vol, float atten) ambientsound = #74 - - PR_AddBuiltin (&sv_pr_state, "precache_model", PF_precache_model, 75); // string(string s) precache_model2 = #75 - PR_AddBuiltin (&sv_pr_state, "precache_sound", PF_precache_sound, 76); // string(string s) precache_sound2 = #76 precache_sound2 is different only for qcc - PR_AddBuiltin (&sv_pr_state, "precache_file", PF_precache_file, 77); // string(string s) precache_file2 = #77 - - PR_AddBuiltin (&sv_pr_state, "setspawnparms", PF_setspawnparms, 78); // void(entity e) setspawnparms = #78 - - PR_AddBuiltin (&sv_pr_state, "logfrag", PF_logfrag, 79); // void(entity killer, entity killee) logfrag = #79 - - PR_AddBuiltin (&sv_pr_state, "infokey", PF_infokey, 80); // string(entity e, string key) infokey = #80 - PR_AddBuiltin (&sv_pr_state, "stof", PF_stof, 81); // float(string s) stof = #81 - PR_AddBuiltin (&sv_pr_state, "multicast", PF_multicast, 82); // void(vector where, float set) multicast = #82 - - // 83 - // 84 - // 85 - // 86 - // 87 - // 88 - // 89 - // 90 - // 91 - PR_AddBuiltin (&sv_pr_state, "testentitypos", PF_testentitypos, 92); // entity (entity ent) testentitypos = #92 - PR_AddBuiltin (&sv_pr_state, "hullpointcontents", PF_hullpointcontents, 93); // integer (entity ent, vector point) hullpointcontents = #93 - PR_AddBuiltin (&sv_pr_state, "getboxbounds", PF_getboxbounds, 94); // vector (integer hull, integer max) getboxbounds = #94 - PR_AddBuiltin (&sv_pr_state, "getboxhull", PF_getboxhull, 95); // integer () getboxhull = #95 - PR_AddBuiltin (&sv_pr_state, "freeboxhull", PF_freeboxhull, 96); // void (integer hull) freeboxhull = #96 - PR_AddBuiltin (&sv_pr_state, "rotate_bbox", PF_rotate_bbox, 97); // void (integer hull, vector right, vector forward, vector up, vector mins, vector maxs) rotate_bbox = #97 - PR_AddBuiltin (&sv_pr_state, "checkmove", PF_checkmove, 98); // void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove = #98 - PR_AddBuiltin (&sv_pr_state, "checkextension", PF_Checkextension, 99); // = #99 - PR_AddBuiltin (&sv_pr_state, "strlen", PF_strlen, 100); // = #100 - PR_AddBuiltin (&sv_pr_state, "charcount", PF_charcount, 101); // = #101 - PR_AddBuiltin (&sv_pr_state, "setinfokey", PF_setinfokey, 102); // void (entity ent, string key, string value) setinfokey = #102 - PR_AddBuiltin (&sv_pr_state, "cfopen", PF_cfopen, 103); // float (string path, string mode) cfopen = #103 - PR_AddBuiltin (&sv_pr_state, "cfclose", PF_cfclose, 104); // void (float desc) cfclose = #104 - PR_AddBuiltin (&sv_pr_state, "cfread", PF_cfread, 105); // string (float desc) cfread = #105 - PR_AddBuiltin (&sv_pr_state, "cfwrite", PF_cfwrite, 106); // float (float desc, string buf) cfwrite = #106 - PR_AddBuiltin (&sv_pr_state, "cfeof", PF_cfeof, 107); // float (float desc) cfeof = #107 - PR_AddBuiltin (&sv_pr_state, "cfquota", PF_cfquota, 108); // float () cfquota = #108 + PR_AddBuiltin (pr, "stof", PF_stof, 81); // float(string s) stof = #81 + PR_AddBuiltin (pr, "strlen", PF_strlen, 100); // = #100 + PR_AddBuiltin (pr, "charcount", PF_charcount, 101); // = #101 +#if 0 + PR_AddBuiltin (pr, "cfopen", PF_cfopen, 103); // float (string path, string mode) cfopen = #103 + PR_AddBuiltin (pr, "cfclose", PF_cfclose, 104); // void (float desc) cfclose = #104 + PR_AddBuiltin (pr, "cfread", PF_cfread, 105); // string (float desc) cfread = #105 + PR_AddBuiltin (pr, "cfwrite", PF_cfwrite, 106); // float (float desc, string buf) cfwrite = #106 + PR_AddBuiltin (pr, "cfeof", PF_cfeof, 107); // float (float desc) cfeof = #107 + PR_AddBuiltin (pr, "cfquota", PF_cfquota, 108); // float () cfquota = #108 #endif }; diff --git a/libs/gamecode/engine/pr_edict.c b/libs/gamecode/engine/pr_edict.c index 41c79eb36..45e51eda2 100644 --- a/libs/gamecode/engine/pr_edict.c +++ b/libs/gamecode/engine/pr_edict.c @@ -1380,7 +1380,6 @@ PR_Init (void) { PR_Opcode_Init (); PR_Debug_Init (); - PR_Cmds_Init (); } #define PR_AUTOBUILTIN 120 diff --git a/nq/source/pr_cmds.c b/nq/source/pr_cmds.c index 769431ff3..9210b9a0f 100644 --- a/nq/source/pr_cmds.c +++ b/nq/source/pr_cmds.c @@ -54,21 +54,6 @@ BUILT-IN FUNCTIONS */ -const char * -PF_VarString (progs_t *pr, int first) -{ - int i; - int len; - char *out; - - for (len = 0, i = first; i < pr->pr_argc; i++) - len += strlen (G_STRING (pr, (OFS_PARM0 + i * 3))); - out = Hunk_TempAlloc (len + 1); - for (i = first; i < pr->pr_argc; i++) - strcat (out, G_STRING (pr, (OFS_PARM0 + i * 3))); - return out; -} - /* PF_error @@ -356,132 +341,6 @@ PF_centerprint (progs_t *pr) } -/* - PF_normalize - - vector normalize(vector) -*/ -void -PF_normalize (progs_t *pr) -{ - float *value1; - vec3_t newvalue; - float new; - - value1 = G_VECTOR (pr, OFS_PARM0); - - new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2] * value1[2]; - new = sqrt (new); - - if (new == 0) - newvalue[0] = newvalue[1] = newvalue[2] = 0; - else { - new = 1 / new; - newvalue[0] = value1[0] * new; - newvalue[1] = value1[1] * new; - newvalue[2] = value1[2] * new; - } - - VectorCopy (newvalue, G_VECTOR (pr, OFS_RETURN)); -} - -/* - PF_vlen - - scalar vlen(vector) -*/ -void -PF_vlen (progs_t *pr) -{ - float *value1; - float new; - - value1 = G_VECTOR (pr, OFS_PARM0); - - new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2] * value1[2]; - new = sqrt (new); - - G_FLOAT (pr, OFS_RETURN) = new; -} - -/* - PF_vectoyaw - - float vectoyaw(vector) -*/ -void -PF_vectoyaw (progs_t *pr) -{ - float *value1; - float yaw; - - value1 = G_VECTOR (pr, OFS_PARM0); - - if (value1[1] == 0 && value1[0] == 0) - yaw = 0; - else { - yaw = (int) (atan2 (value1[1], value1[0]) * 180 / M_PI); - if (yaw < 0) - yaw += 360; - } - - G_FLOAT (pr, OFS_RETURN) = yaw; -} - - -/* - PF_vectoangles - - vector vectoangles(vector) -*/ -void -PF_vectoangles (progs_t *pr) -{ - float *value1; - float forward; - float yaw, pitch; - - value1 = G_VECTOR (pr, OFS_PARM0); - - if (value1[1] == 0 && value1[0] == 0) { - yaw = 0; - if (value1[2] > 0) - pitch = 90; - else - pitch = 270; - } else { - yaw = (int) (atan2 (value1[1], value1[0]) * 180 / M_PI); - if (yaw < 0) - yaw += 360; - - forward = sqrt (value1[0] * value1[0] + value1[1] * value1[1]); - pitch = (int) (atan2 (value1[2], forward) * 180 / M_PI); - if (pitch < 0) - pitch += 360; - } - - G_FLOAT (pr, OFS_RETURN + 0) = pitch; - G_FLOAT (pr, OFS_RETURN + 1) = yaw; - G_FLOAT (pr, OFS_RETURN + 2) = 0; -} - -/* - PF_Random - - Returns a number from 0<= num < 1 - - random() -*/ -void -PF_random (progs_t *pr) -{ - float num; - - num = (rand () & 0x7fff) / ((float) 0x7fff); - - G_FLOAT (pr, OFS_RETURN) = num; -} - /* PF_particle @@ -580,18 +439,6 @@ PF_sound (progs_t *pr) SV_StartSound (entity, channel, sample, volume, attenuation); } -/* - PF_break - - break() -*/ -void -PF_break (progs_t *pr) -{ - Con_Printf ("break statement\n"); - *(int *) -4 = 0; // dump to debugger -// PR_RunError ("break statement"); -} /* PF_traceline @@ -905,50 +752,6 @@ PF_findradius (progs_t *pr) } -/* - PF_dprint -*/ -void -PF_dprint (progs_t *pr) -{ - Con_DPrintf ("%s", PF_VarString (pr, 0)); -} - -char pr_string_temp[128]; - -void -PF_ftos (progs_t *pr) -{ - float v; - - v = G_FLOAT (pr, OFS_PARM0); - - if (v == (int) v) - snprintf (pr_string_temp, sizeof (pr_string_temp), "%d", (int) v); - else - snprintf (pr_string_temp, sizeof (pr_string_temp), "%5.1f", v); - G_INT (pr, OFS_RETURN) = PR_SetString (pr, pr_string_temp); -} - -void -PF_fabs (progs_t *pr) -{ - float v; - - v = G_FLOAT (pr, OFS_PARM0); - G_FLOAT (pr, OFS_RETURN) = fabs (v); -} - -void -PF_vtos (progs_t *pr) -{ - snprintf (pr_string_temp, sizeof (pr_string_temp), - "'%5.1f %5.1f %5.1f'", G_VECTOR (pr, OFS_PARM0)[0], G_VECTOR (pr, - OFS_PARM0) - [1], G_VECTOR (pr, OFS_PARM0)[2]); - G_INT (pr, OFS_RETURN) = PR_SetString (pr, pr_string_temp); -} - #ifdef QUAKE2 void PF_etos (progs_t *pr) @@ -978,84 +781,6 @@ PF_Remove (progs_t *pr) } -// entity (entity start, .string field, string match) find = #5; -void -PF_Find (progs_t *pr) -#ifdef QUAKE2 -{ - int e; - int f; - const char *s, *t; - edict_t *ed; - edict_t *first; - edict_t *second; - edict_t *last; - - first = second = last = (edict_t *) sv.edicts; - e = G_EDICTNUM (pr, OFS_PARM0); - f = G_INT (pr, OFS_PARM1); - s = G_STRING (pr, OFS_PARM2); - if (!s) - PR_RunError (pr, "PF_Find: bad search string"); - - for (e++; e < sv.num_edicts; e++) { - ed = EDICT_NUM (pr, e); - if (ed->free) - continue; - t = E_STRING (pr, ed, f); - if (!t) - continue; - if (!strcmp (t, s)) { - if (first == (edict_t *) sv.edicts) - first = ed; - else if (second == (edict_t *) sv.edicts) - second = ed; - SVentity (ed, chain) = EDICT_TO_PROG (pr, last); - last = ed; - } - } - - if (first != last) { - if (last != second) - SVentity (first, chain) = SVentity (last, chain); - else - SVentity (first, chain) = EDICT_TO_PROG (pr, last); - SVentity (last, chain) = EDICT_TO_PROG (pr, (edict_t *) sv.edicts); - if (second && second != last) - SVentity (second, chain) = EDICT_TO_PROG (pr, last); - } - RETURN_EDICT (pr, first); -} -#else -{ - int e; - int f; - const char *s, *t; - edict_t *ed; - - e = G_EDICTNUM (pr, OFS_PARM0); - f = G_INT (pr, OFS_PARM1); - s = G_STRING (pr, OFS_PARM2); - if (!s) - PR_RunError (pr, "PF_Find: bad search string"); - - for (e++; e < sv.num_edicts; e++) { - ed = EDICT_NUM (pr, e); - if (ed->free) - continue; - t = E_STRING (pr, ed, f); - if (!t) - continue; - if (!strcmp (t, s)) { - RETURN_EDICT (pr, ed); - return; - } - } - - RETURN_EDICT (pr, sv.edicts); -} -#endif - void PR_CheckEmptyString (progs_t *pr, const char *s) { @@ -1828,57 +1553,39 @@ PF_checkextension (progs_t *pr) void SV_PR_Cmds_Init () { + PR_Cmds_Init (&sv_pr_state); + PR_AddBuiltin (&sv_pr_state, "makevectors", PF_makevectors, 1); // void(entity e) makevectors = #1 PR_AddBuiltin (&sv_pr_state, "setorigin", PF_setorigin, 2); // void(entity e, vector o) setorigin = #2 PR_AddBuiltin (&sv_pr_state, "setmodel", PF_setmodel, 3); // void(entity e, string m) setmodel = #3 PR_AddBuiltin (&sv_pr_state, "setsize", PF_setsize, 4); // void(entity e, vector min, vector max) setsize = #4 PR_AddBuiltin (&sv_pr_state, "fixme", PF_Fixme, 5); // void(entity e, vector min, vector max) setabssize = #5 - PR_AddBuiltin (&sv_pr_state, "break", PF_break, 6); // void() break = #6 - PR_AddBuiltin (&sv_pr_state, "random", PF_random, 7); // float() random = #7 PR_AddBuiltin (&sv_pr_state, "sound", PF_sound, 8); // void(entity e, float chan, string samp) sound = #8 - PR_AddBuiltin (&sv_pr_state, "normalize", PF_normalize, 9); // vector(vector v) normalize = #9 PR_AddBuiltin (&sv_pr_state, "error", PF_error, 10); // void(string e) error = #10 PR_AddBuiltin (&sv_pr_state, "objerror", PF_objerror, 11); // void(string e) objerror = #11 - PR_AddBuiltin (&sv_pr_state, "vlen", PF_vlen, 12); // float(vector v) vlen = #12 - PR_AddBuiltin (&sv_pr_state, "vectoyaw", PF_vectoyaw, 13); // float(vector v) vectoyaw = #13 PR_AddBuiltin (&sv_pr_state, "spawn", PF_Spawn, 14); // entity() spawn = #14 PR_AddBuiltin (&sv_pr_state, "remove", PF_Remove, 15); // void(entity e) remove = #15 PR_AddBuiltin (&sv_pr_state, "traceline", PF_traceline, 16); // float(vector v1, vector v2, float tryents) traceline = #16 PR_AddBuiltin (&sv_pr_state, "checkclient", PF_checkclient, 17); // entity() clientlist = #17 - PR_AddBuiltin (&sv_pr_state, "find", PF_Find, 18); // entity(entity start, .string fld, string match) find = #18 PR_AddBuiltin (&sv_pr_state, "precache_sound", PF_precache_sound, 19); // void(string s) precache_sound = #19 PR_AddBuiltin (&sv_pr_state, "precache_model", PF_precache_model, 20); // void(string s) precache_model = #20 PR_AddBuiltin (&sv_pr_state, "stuffcmd", PF_stuffcmd, 21); // void(entity client, string s) stuffcmd = #21 PR_AddBuiltin (&sv_pr_state, "findradius", PF_findradius, 22); // entity(vector org, float rad) findradius = #22 PR_AddBuiltin (&sv_pr_state, "bprint", PF_bprint, 23); // void(string s) bprint = #23 PR_AddBuiltin (&sv_pr_state, "sprint", PF_sprint, 24); // void(entity client, string s) sprint = #24 - PR_AddBuiltin (&sv_pr_state, "dprint", PF_dprint, 25); // void(string s) dprint = #25 - PR_AddBuiltin (&sv_pr_state, "ftos", PF_ftos, 26); // void(string s) ftos = #26 - PR_AddBuiltin (&sv_pr_state, "vtos", PF_vtos, 27); // void(string s) vtos = #27 - PR_AddBuiltin (&sv_pr_state, "coredump", PF_coredump, 28); // void() coredump = #28 - PR_AddBuiltin (&sv_pr_state, "traceon", PF_traceon, 29); // void() traceon = #29 - PR_AddBuiltin (&sv_pr_state, "traceoff", PF_traceoff, 30); // void() traceoff = #30 - PR_AddBuiltin (&sv_pr_state, "eprint", PF_eprint, 31); // void(entity e) = #31 debug print an entire entity PR_AddBuiltin (&sv_pr_state, "walkmove", PF_walkmove, 32); // float(float yaw, float dist) walkmove = #32 // 33 PR_AddBuiltin (&sv_pr_state, "droptofloor", PF_droptofloor, 34); // float() droptofloor = #34 PR_AddBuiltin (&sv_pr_state, "lightstyle", PF_lightstyle, 35); // void(float style, string value) lightstyle = #35 - PR_AddBuiltin (&sv_pr_state, "rint", PF_rint, 36); // float(float v) rint = #36 - PR_AddBuiltin (&sv_pr_state, "floor", PF_floor, 37); // float(float v) floor = #37 - PR_AddBuiltin (&sv_pr_state, "ceil", PF_ceil, 38); // float(float v) ceil = #38 // 39 PR_AddBuiltin (&sv_pr_state, "checkbottom", PF_checkbottom, 40); // float(entity e) checkbottom = #40 PR_AddBuiltin (&sv_pr_state, "pointcontents", PF_pointcontents, 41); // float(vector v) pointcontents = #41 // 42 - PR_AddBuiltin (&sv_pr_state, "fabs", PF_fabs, 43); // float(float f) fabs = #43 PR_AddBuiltin (&sv_pr_state, "aim", PF_aim, 44); // vector(entity e, float speed) aim = #44 - PR_AddBuiltin (&sv_pr_state, "cvar", PF_cvar, 45); // float(string s) cvar = #45 PR_AddBuiltin (&sv_pr_state, "localcmd", PF_localcmd, 46); // void(string s) localcmd = #46 - PR_AddBuiltin (&sv_pr_state, "nextent", PF_nextent, 47); // entity(entity e) nextent = #47 PR_AddBuiltin (&sv_pr_state, "particle", PF_particle, 48); PR_AddBuiltin (&sv_pr_state, "changeyaw", PF_changeyaw, 49); // void() ChangeYaw = #49 // 50 - PR_AddBuiltin (&sv_pr_state, "vectoangles", PF_vectoangles, 51); // vector(vector v) vectoangles = #51 PR_AddBuiltin (&sv_pr_state, "writebyte", PF_WriteByte, 52); // void(float to, float f) WriteByte = #52 PR_AddBuiltin (&sv_pr_state, "writechar", PF_WriteChar, 53); // void(float to, float f) WriteChar = #53 @@ -1906,7 +1613,6 @@ SV_PR_Cmds_Init () PR_AddBuiltin (&sv_pr_state, "changelevel", PF_changelevel, 70); // void(string s) changelevel = #70 // 71 - PR_AddBuiltin (&sv_pr_state, "cvar_set", PF_cvar_set, 72); // void(string var, string val) cvar_set = #72 PR_AddBuiltin (&sv_pr_state, "centerprint", PF_centerprint, 73); // void(...) centerprint = #73 PR_AddBuiltin (&sv_pr_state, "ambientsound", PF_ambientsound, 74); // void(vector pos, string samp, float vol, float atten) ambientsound = #74 diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c index 5c9701513..476dd147a 100644 --- a/qw/source/sv_pr_cmds.c +++ b/qw/source/sv_pr_cmds.c @@ -53,21 +53,6 @@ BUILT-IN FUNCTIONS */ -const char * -PF_VarString (progs_t *pr, int first) -{ - int i; - int len; - char *out; - - for (len = 0, i = first; i < pr->pr_argc; i++) - len += strlen (G_STRING (pr, (OFS_PARM0 + i * 3))); - out = Hunk_TempAlloc (len + 1); - for (i = first; i < pr->pr_argc; i++) - strcat (out, G_STRING (pr, (OFS_PARM0 + i * 3))); - return out; -} - /* PF_error @@ -292,133 +277,6 @@ PF_centerprint (progs_t *pr) } -/* - PF_normalize - - vector normalize(vector) -*/ -void -PF_normalize (progs_t *pr) -{ - float *value1; - vec3_t newvalue; - float new; - - value1 = G_VECTOR (pr, OFS_PARM0); - - new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2] * value1[2]; - new = sqrt (new); - - if (new == 0) - newvalue[0] = newvalue[1] = newvalue[2] = 0; - else { - new = 1 / new; - newvalue[0] = value1[0] * new; - newvalue[1] = value1[1] * new; - newvalue[2] = value1[2] * new; - } - - VectorCopy (newvalue, G_VECTOR (pr, OFS_RETURN)); -} - -/* - PF_vlen - - scalar vlen(vector) -*/ -void -PF_vlen (progs_t *pr) -{ - float *value1; - float new; - - value1 = G_VECTOR (pr, OFS_PARM0); - - new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2] * value1[2]; - new = sqrt (new); - - G_FLOAT (pr, OFS_RETURN) = new; -} - -/* - PF_vectoyaw - - float vectoyaw(vector) -*/ -void -PF_vectoyaw (progs_t *pr) -{ - float *value1; - float yaw; - - value1 = G_VECTOR (pr, OFS_PARM0); - - if (value1[1] == 0 && value1[0] == 0) - yaw = 0; - else { - yaw = (int) (atan2 (value1[1], value1[0]) * 180 / M_PI); - if (yaw < 0) - yaw += 360; - } - - G_FLOAT (pr, OFS_RETURN) = yaw; -} - - -/* - PF_vectoangles - - vector vectoangles(vector) -*/ -void -PF_vectoangles (progs_t *pr) -{ - float *value1; - float forward; - float yaw, pitch; - - value1 = G_VECTOR (pr, OFS_PARM0); - - if (value1[1] == 0 && value1[0] == 0) { - yaw = 0; - if (value1[2] > 0) - pitch = 90; - else - pitch = 270; - } else { - yaw = (int) (atan2 (value1[1], value1[0]) * 180 / M_PI); - if (yaw < 0) - yaw += 360; - - forward = sqrt (value1[0] * value1[0] + value1[1] * value1[1]); - pitch = (int) (atan2 (value1[2], forward) * 180 / M_PI); - if (pitch < 0) - pitch += 360; - } - - G_FLOAT (pr, OFS_RETURN + 0) = pitch; - G_FLOAT (pr, OFS_RETURN + 1) = yaw; - G_FLOAT (pr, OFS_RETURN + 2) = 0; -} - -/* - PF_Random - - Returns a number from 0<= num < 1 - - random() -*/ -void -PF_random (progs_t *pr) -{ - float num; - - num = (rand () & 0x7fff) / ((float) 0x7fff); - - G_FLOAT (pr, OFS_RETURN) = num; -} - - /* PF_ambientsound */ @@ -488,18 +346,6 @@ PF_sound (progs_t *pr) SV_StartSound (entity, channel, sample, volume, attenuation); } -/* - PF_break - - break() -*/ -void -PF_break (progs_t *pr) -{ - SV_Printf ("break statement\n"); - *(int *) -4 = 0; // dump to debugger -// PR_RunError (pr, "break statement"); -} /* PF_traceline @@ -845,59 +691,6 @@ PF_findradius (progs_t *pr) } -/* - PF_dprint -*/ -void -PF_dprint (progs_t *pr) -{ - SV_Printf ("%s", PF_VarString (pr, 0)); -} - -char pr_string_temp[128]; - -void -PF_ftos (progs_t *pr) -{ - float v; - int i; // 1999-07-25 FTOS fix by Maddes - - v = G_FLOAT (pr, OFS_PARM0); - - if (v == (int) v) - snprintf (pr_string_temp, sizeof (pr_string_temp), "%d", (int) v); - else -// 1999-07-25 FTOS fix by Maddes start - { - snprintf (pr_string_temp, sizeof (pr_string_temp), "%1f", v); - for (i = strlen (pr_string_temp) - 1; - i > 0 && pr_string_temp[i] == '0' && pr_string_temp[i - 1] != '.'; - i--) { - pr_string_temp[i] = 0; - } - } -// 1999-07-25 FTOS fix by Maddes end - G_INT (pr, OFS_RETURN) = PR_SetString (pr, pr_string_temp); -} - -void -PF_fabs (progs_t *pr) -{ - float v; - - v = G_FLOAT (pr, OFS_PARM0); - G_FLOAT (pr, OFS_RETURN) = fabs (v); -} - -void -PF_vtos (progs_t *pr) -{ - snprintf (pr_string_temp, sizeof (pr_string_temp), "'%5.1f %5.1f %5.1f'", - G_VECTOR (pr, OFS_PARM0)[0], G_VECTOR (pr, OFS_PARM0)[1], - G_VECTOR (pr, OFS_PARM0)[2]); - G_INT (pr, OFS_RETURN) = PR_SetString (pr, pr_string_temp); -} - void PF_Spawn (progs_t *pr) { @@ -917,37 +710,6 @@ PF_Remove (progs_t *pr) } -// entity (entity start, .string field, string match) find = #5; -void -PF_Find (progs_t *pr) -{ - int e; - int f; - const char *s, *t; - edict_t *ed; - - e = G_EDICTNUM (pr, OFS_PARM0); - f = G_INT (pr, OFS_PARM1); - s = G_STRING (pr, OFS_PARM2); - if (!s) - PR_RunError (pr, "PF_Find: bad search string"); - - for (e++; e < sv.num_edicts; e++) { - ed = EDICT_NUM (pr, e); - if (ed->free) - continue; - t = E_STRING (pr, ed, f); - if (!t) - continue; - if (!strcmp (t, s)) { - RETURN_EDICT (pr, ed); - return; - } - } - - RETURN_EDICT (pr, sv.edicts); -} - void PR_CheckEmptyString (progs_t *pr, const char *s) { @@ -1013,30 +775,6 @@ PF_precache_model (progs_t *pr) } -void -PF_coredump (progs_t *pr) -{ - ED_PrintEdicts (pr, ""); -} - -void -PF_traceon (progs_t *pr) -{ - pr->pr_trace = true; -} - -void -PF_traceoff (progs_t *pr) -{ - pr->pr_trace = false; -} - -void -PF_eprint (progs_t *pr) -{ - ED_PrintNum (pr, G_EDICTNUM (pr, OFS_PARM0)); -} - /* PF_walkmove @@ -1140,31 +878,6 @@ PF_lightstyle (progs_t *pr) } } -void -PF_rint (progs_t *pr) -{ - float f; - - f = G_FLOAT (pr, OFS_PARM0); - if (f > 0) - G_FLOAT (pr, OFS_RETURN) = (int) (f + 0.5); - else - G_FLOAT (pr, OFS_RETURN) = (int) (f - 0.5); -} - -void -PF_floor (progs_t *pr) -{ - G_FLOAT (pr, OFS_RETURN) = floor (G_FLOAT (pr, OFS_PARM0)); -} - -void -PF_ceil (progs_t *pr) -{ - G_FLOAT (pr, OFS_RETURN) = ceil (G_FLOAT (pr, OFS_PARM0)); -} - - /* PF_checkbottom */ @@ -1191,32 +904,6 @@ PF_pointcontents (progs_t *pr) G_FLOAT (pr, OFS_RETURN) = SV_PointContents (v); } -/* - PF_nextent - - entity nextent(entity) -*/ -void -PF_nextent (progs_t *pr) -{ - int i; - edict_t *ent; - - i = G_EDICTNUM (pr, OFS_PARM0); - while (1) { - i++; - if (i == sv.num_edicts) { - RETURN_EDICT (pr, sv.edicts); - return; - } - ent = EDICT_NUM (pr, i); - if (!ent->free) { - RETURN_EDICT (pr, ent); - return; - } - } -} - /* PF_aim @@ -1645,22 +1332,6 @@ PF_infokey (progs_t *pr) RETURN_STRING (pr, value); } -/* - PF_stof - - float(string s) stof -*/ -void -PF_stof (progs_t *pr) -{ - const char *s; - - s = G_STRING (pr, OFS_PARM0); - - G_FLOAT (pr, OFS_RETURN) = atof (s); -} - - /* PF_multicast @@ -1678,47 +1349,6 @@ PF_multicast (progs_t *pr) SV_Multicast (o, to); } -/* - PF_strlen - - float(string s) strlen -*/ -void -PF_strlen (progs_t *pr) -{ - const char *s; - - s = G_STRING (pr, OFS_PARM0); - G_FLOAT (pr, OFS_RETURN) = strlen(s); -} - -/* - PF_charcount - - float(string char, string s) charcount -*/ -void -PF_charcount (progs_t *pr) -{ - const char *s; - char goal; - int count; - - goal = (G_STRING (pr, OFS_PARM0))[0]; - if (goal == '\0') - G_FLOAT (pr, OFS_RETURN) = 0; - - count = 0; - s = G_STRING (pr, OFS_PARM1); - while (*s) { - if (*s == goal) - count++; - s++; - } - G_FLOAT (pr, OFS_RETURN) = count; -} - - /* PF_cfopen @@ -2001,79 +1631,42 @@ PF_Checkextension (progs_t *pr) G_FLOAT(pr, OFS_RETURN) = 0; //FIXME make this function actually useful :P } -void -PF_checkbuiltin (progs_t *pr) -{ - G_FUNCTION (pr, OFS_RETURN) = -PR_FindBuiltin (pr, G_STRING (pr, OFS_PARM0)); -} - -void -PF_getbuiltin (progs_t *pr) -{ - int i; - const char *name; - - name = G_STRING (pr, OFS_PARM0); - i = PR_FindBuiltin (pr, name); - if (!i) - PR_RunError (pr, "PF_getfunction: function '%s' not found!\n", name); - G_FUNCTION (pr, OFS_RETURN) = -i; -} - void SV_PR_Cmds_Init () { + PR_Cmds_Init (&sv_pr_state); + PR_AddBuiltin (&sv_pr_state, "makevectors", PF_makevectors, 1); // void(entity e) makevectors = #1 PR_AddBuiltin (&sv_pr_state, "setorigin", PF_setorigin, 2); // void(entity e, vector o) setorigin = #2 PR_AddBuiltin (&sv_pr_state, "setmodel", PF_setmodel, 3); // void(entity e, string m) setmodel = #3 PR_AddBuiltin (&sv_pr_state, "setsize", PF_setsize, 4); // void(entity e, vector min, vector max) setsize = #4 PR_AddBuiltin (&sv_pr_state, "fixme", PF_Fixme, 5); // void(entity e, vector min, vector max) setabssize = #5 - PR_AddBuiltin (&sv_pr_state, "break", PF_break, 6); // void() break = #6 - PR_AddBuiltin (&sv_pr_state, "random", PF_random, 7); // float() random = #7 PR_AddBuiltin (&sv_pr_state, "sound", PF_sound, 8); // void(entity e, float chan, string samp) sound = #8 - PR_AddBuiltin (&sv_pr_state, "normalize", PF_normalize, 9); // vector(vector v) normalize = #9 PR_AddBuiltin (&sv_pr_state, "error", PF_error, 10); // void(string e) error = #10 PR_AddBuiltin (&sv_pr_state, "objerror", PF_objerror, 11); // void(string e) objerror = #11 - PR_AddBuiltin (&sv_pr_state, "vlen", PF_vlen, 12); // float(vector v) vlen = #12 - PR_AddBuiltin (&sv_pr_state, "vectoyaw", PF_vectoyaw, 13); // float(vector v) vectoyaw = #13 PR_AddBuiltin (&sv_pr_state, "spawn", PF_Spawn, 14); // entity() spawn = #14 PR_AddBuiltin (&sv_pr_state, "remove", PF_Remove, 15); // void(entity e) remove = #15 PR_AddBuiltin (&sv_pr_state, "traceline", PF_traceline, 16); // float(vector v1, vector v2, float tryents) traceline = #16 PR_AddBuiltin (&sv_pr_state, "checkclient", PF_checkclient, 17); // entity() clientlist = #17 - PR_AddBuiltin (&sv_pr_state, "find", PF_Find, 18); // entity(entity start, .string fld, string match) find = #18 PR_AddBuiltin (&sv_pr_state, "precache_sound", PF_precache_sound, 19); // void(string s) precache_sound = #19 PR_AddBuiltin (&sv_pr_state, "precache_model", PF_precache_model, 20); // void(string s) precache_model = #20 PR_AddBuiltin (&sv_pr_state, "stuffcmd", PF_stuffcmd, 21); // void(entity client, string s) stuffcmd = #21 PR_AddBuiltin (&sv_pr_state, "findradius", PF_findradius, 22); // entity(vector org, float rad) findradius = #22 PR_AddBuiltin (&sv_pr_state, "bprint", PF_bprint, 23); // void(string s) bprint = #23 PR_AddBuiltin (&sv_pr_state, "sprint", PF_sprint, 24); // void(entity client, string s) sprint = #24 - PR_AddBuiltin (&sv_pr_state, "dprint", PF_dprint, 25); // void(string s) dprint = #25 - PR_AddBuiltin (&sv_pr_state, "ftos", PF_ftos, 26); // void(string s) ftos = #26 - PR_AddBuiltin (&sv_pr_state, "vtos", PF_vtos, 27); // void(string s) vtos = #27 - PR_AddBuiltin (&sv_pr_state, "coredump", PF_coredump, 28); // void() coredump = #28 - PR_AddBuiltin (&sv_pr_state, "traceon", PF_traceon, 29); // void() traceon = #29 - PR_AddBuiltin (&sv_pr_state, "traceoff", PF_traceoff, 30); // void() traceoff = #30 - PR_AddBuiltin (&sv_pr_state, "eprint", PF_eprint, 31); // void(entity e) = #31 debug print an entire entity PR_AddBuiltin (&sv_pr_state, "walkmove", PF_walkmove, 32); // float(float yaw, float dist) walkmove = #32 // no 33 PR_AddBuiltin (&sv_pr_state, "droptofloor", PF_droptofloor, 34); // float() droptofloor = #34 PR_AddBuiltin (&sv_pr_state, "lightstyle", PF_lightstyle, 35); // void(float style, string value) lightstyle = #35 - PR_AddBuiltin (&sv_pr_state, "rint", PF_rint, 36); // float(float v) rint = #36 - PR_AddBuiltin (&sv_pr_state, "floor", PF_floor, 37); // float(float v) floor = #37 - PR_AddBuiltin (&sv_pr_state, "ceil", PF_ceil, 38); // float(float v) ceil = #38 // no 39 PR_AddBuiltin (&sv_pr_state, "checkbottom", PF_checkbottom, 40); // float(entity e) checkbottom = #40 PR_AddBuiltin (&sv_pr_state, "pointcontents", PF_pointcontents, 41); // float(vector v) pointcontents = #41 // no 42 - PR_AddBuiltin (&sv_pr_state, "fabs", PF_fabs, 43); // float(float f) fabs = #43 - PR_AddBuiltin (&sv_pr_state, "aim", PF_aim, 44); // vector(entity e, float speed) aim = #44 PR_AddBuiltin (&sv_pr_state, "cvar", PF_cvar, 45); // float(string s) cvar = #45 PR_AddBuiltin (&sv_pr_state, "localcmd", PF_localcmd, 46); // void(string s) localcmd = #46 - PR_AddBuiltin (&sv_pr_state, "nextent", PF_nextent, 47); // entity(entity e) nextent = #47 // no 48 PR_AddBuiltin (&sv_pr_state, "changeyaw", PF_changeyaw, 49); // void() ChangeYaw = #49 // no 50 - PR_AddBuiltin (&sv_pr_state, "vectoangles", PF_vectoangles, 51); // vector(vector v) vectoangles = #51 PR_AddBuiltin (&sv_pr_state, "writebyte", PF_WriteByte, 52); // void(float to, float f) WriteByte = #52 PR_AddBuiltin (&sv_pr_state, "writechar", PF_WriteChar, 53); // void(float to, float f) WriteChar = #53 @@ -2113,7 +1706,6 @@ SV_PR_Cmds_Init () PR_AddBuiltin (&sv_pr_state, "logfrag", PF_logfrag, 79); // void(entity killer, entity killee) logfrag = #79 PR_AddBuiltin (&sv_pr_state, "infokey", PF_infokey, 80); // string(entity e, string key) infokey = #80 - PR_AddBuiltin (&sv_pr_state, "stof", PF_stof, 81); // float(string s) stof = #81 PR_AddBuiltin (&sv_pr_state, "multicast", PF_multicast, 82); // void(vector where, float set) multicast = #82 // 83 @@ -2133,8 +1725,6 @@ SV_PR_Cmds_Init () PR_AddBuiltin (&sv_pr_state, "rotate_bbox", PF_rotate_bbox, 97); // void (integer hull, vector right, vector forward, vector up, vector mins, vector maxs) rotate_bbox = #97 PR_AddBuiltin (&sv_pr_state, "checkmove", PF_checkmove, 98); // void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove = #98 PR_AddBuiltin (&sv_pr_state, "checkextension", PF_Checkextension, 99); // = #99 - PR_AddBuiltin (&sv_pr_state, "strlen", PF_strlen, 100); // = #100 - PR_AddBuiltin (&sv_pr_state, "charcount", PF_charcount, 101); // = #101 PR_AddBuiltin (&sv_pr_state, "setinfokey", PF_setinfokey, 102); // void (entity ent, string key, string value) setinfokey = #102 PR_AddBuiltin (&sv_pr_state, "cfopen", PF_cfopen, 103); // float (string path, string mode) cfopen = #103 PR_AddBuiltin (&sv_pr_state, "cfclose", PF_cfclose, 104); // void (float desc) cfclose = #104