#include "cl_collision.h"
#include "clvm_cmds.h"
+#include "csprogs.h"
#include "ft2.h"
#include "mdfour.h"
extern cvar_t prvm_backtraceforwarnings;
+#ifdef USEODE
+extern dllhandle_t ode_dll;
+#endif
-// LordHavoc: changed this to NOT use a return statement, so that it can be used in functions that must return a value
-void VM_Warning(const char *fmt, ...)
+// LadyHavoc: changed this to NOT use a return statement, so that it can be used in functions that must return a value
+void VM_Warning(prvm_prog_t *prog, const char *fmt, ...)
{
va_list argptr;
char msg[MAX_INPUTLINE];
dpvsnprintf(msg,sizeof(msg),fmt,argptr);
va_end(argptr);
- Con_DPrint(msg);
+ Con_Printf(CON_WARN "%s", msg);
// TODO: either add a cvar/cmd to control the state dumping or replace some of the calls with Con_Printf [9/13/2006 Black]
- if(prvm_backtraceforwarnings.integer && recursive != realtime) // NOTE: this compares to the time, just in case if PRVM_PrintState causes a Host_Error and keeps recursive set
+ if(prvm_backtraceforwarnings.integer && recursive != host.realtime) // NOTE: this compares to the time, just in case if PRVM_PrintState causes a Host_Error and keeps recursive set
{
- recursive = realtime;
- PRVM_PrintState();
+ recursive = host.realtime;
+ PRVM_PrintState(prog, 0);
recursive = -1;
}
}
// TODO DONE: move vm_files and vm_fssearchlist to prvm_prog_t struct
// TODO: move vm_files and vm_fssearchlist back [9/13/2006 Black]
-// TODO: (move vm_files and vm_fssearchlist to prvm_prog_t struct again) [2007-01-23 LordHavoc]
-// TODO: will this war ever end? [2007-01-23 LordHavoc]
+// TODO: (move vm_files and vm_fssearchlist to prvm_prog_t struct again) [2007-01-23 LadyHavoc]
+// TODO: will this war ever end? [2007-01-23 LadyHavoc]
-void VM_CheckEmptyString (const char *s)
+void VM_CheckEmptyString(prvm_prog_t *prog, const char *s)
{
if (ISWHITESPACE(s[0]))
- PRVM_ERROR ("%s: Bad string", PRVM_NAME);
+ prog->error_cmd("%s: Bad string", prog->name);
+}
+
+qbool PRVM_ConsoleCommand (prvm_prog_t *prog, const char *text, int *func, qbool preserve_self, int curself, double ptime, qbool prog_loaded, const char *error_message)
+{
+ int restorevm_tempstringsbuf_cursize;
+ int save_self = 0; // hush compiler warning
+ qbool r = false;
+
+ if(!prog_loaded)
+ return false;
+
+ if(func)
+ {
+ if(preserve_self)
+ save_self = PRVM_gameglobaledict(self);
+ if(ptime)
+ PRVM_gameglobalfloat(time) = ptime;
+ PRVM_gameglobaledict(self) = curself;
+ restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
+ PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text);
+ prog->ExecuteProgram(prog, *func, error_message);
+ prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+ if(preserve_self)
+ PRVM_gameglobaledict(self) = save_self;
+ r = (int) PRVM_G_FLOAT(OFS_RETURN) != 0;
+ }
+
+ return r;
}
-void VM_GenerateFrameGroupBlend(framegroupblend_t *framegroupblend, const prvm_edict_t *ed)
+void VM_GenerateFrameGroupBlend(prvm_prog_t *prog, framegroupblend_t *framegroupblend, const prvm_edict_t *ed)
{
// self.frame is the interpolation target (new frame)
// self.frame1time is the animation base time for the interpolation target
framegroupblend[0].lerp = 1 - framegroupblend[1].lerp - framegroupblend[2].lerp - framegroupblend[3].lerp;
}
-// LordHavoc: quite tempting to break apart this function to reuse the
+// LadyHavoc: quite tempting to break apart this function to reuse the
// duplicated code, but I suspect it is better for performance
// this way
-void VM_FrameBlendFromFrameGroupBlend(frameblend_t *frameblend, const framegroupblend_t *framegroupblend, const dp_model_t *model)
+void VM_FrameBlendFromFrameGroupBlend(frameblend_t *frameblend, const framegroupblend_t *framegroupblend, const model_t *model, double curtime)
{
int sub2, numframes, f, i, k;
int isfirstframegroup = true;
memset(blend, 0, MAX_FRAMEBLENDS * sizeof(*blend));
- if (!model || !model->surfmesh.isanimated)
+ // rpolzer: Not testing isanimated here - a model might have
+ // "animations" that move no vertices (but only bones), thus rendering
+ // may assume it's not animated while processing can't.
+ if (!model)
{
blend[0].lerp = 1;
return;
}
- nolerp = (model->type == mod_sprite) ? !r_lerpsprites.integer : !r_lerpmodels.integer;
+ nolerp = ((model->type == mod_sprite) ? !r_lerpsprites.integer : !r_lerpmodels.integer) || (model->nolerp == true);
numframes = model->numframes;
for (k = 0, g = framegroupblend;k < MAX_FRAMEGROUPBLENDS;k++, g++)
{
f = g->frame;
if ((unsigned int)f >= (unsigned int)numframes)
{
- Con_DPrintf("VM_FrameBlendFromFrameGroupBlend: no such frame %d in model %s\n", f, model->name);
+ if (developer_extra.integer)
+ Con_DPrintf("VM_FrameBlendFromFrameGroupBlend: no such frame %d in model %s\n", f, model->name);
f = 0;
}
d = lerp = g->lerp;
if (scene->framecount > 1)
{
// this code path is only used on .zym models and torches
- sublerp = scene->framerate * (cl.time - g->start);
+ sublerp = scene->framerate * (curtime - g->start);
f = (int) floor(sublerp);
sublerp -= f;
sub2 = f + 1;
}
}
-void VM_UpdateEdictSkeleton(prvm_edict_t *ed, const dp_model_t *edmodel, const frameblend_t *frameblend)
+void VM_UpdateEdictSkeleton(prvm_prog_t *prog, prvm_edict_t *ed, const model_t *edmodel, const frameblend_t *frameblend)
{
if (ed->priv.server->skeleton.model != edmodel)
{
- VM_RemoveEdictSkeleton(ed);
+ VM_RemoveEdictSkeleton(prog, ed);
ed->priv.server->skeleton.model = edmodel;
}
if (!ed->priv.server->skeleton.model || !ed->priv.server->skeleton.model->num_bones)
}
}
-void VM_RemoveEdictSkeleton(prvm_edict_t *ed)
+void VM_RemoveEdictSkeleton(prvm_prog_t *prog, prvm_edict_t *ed)
{
if (ed->priv.server->skeleton.relativetransforms)
Mem_Free(ed->priv.server->skeleton.relativetransforms);
//============================================================================
//BUILT-IN FUNCTIONS
-void VM_VarString(int first, char *out, int outlength)
+void VM_VarString(prvm_prog_t *prog, int first, char *out, int outlength)
{
int i;
const char *s;
*/
// kind of helper function
-static qboolean checkextension(const char *name)
+static qbool checkextension(prvm_prog_t *prog, const char *name)
{
- int len;
- const char *e, *start;
- len = (int)strlen(name);
+ const char **e;
for (e = prog->extensionstring;*e;e++)
{
- while (*e == ' ')
- e++;
- if (!*e)
- break;
- start = e;
- while (*e && *e != ' ')
- e++;
- if ((e - start) == len && !strncasecmp(start, name, len))
+ if(!strcasecmp(*e, name))
{
+#ifdef USEODE
// special sheck for ODE
if (!strncasecmp("DP_PHYSICS_ODE", name, 14))
{
-#ifdef USEODE
+#ifndef LINK_TO_LIBODE
return ode_dll ? true : false;
+#else
+#ifdef LINK_TO_LIBODE
+ return true;
#else
return false;
+#endif
#endif
}
+#endif
// special sheck for d0_blind_id
if (!strcasecmp("DP_CRYPTO", name))
return false;
}
-void VM_checkextension (void)
+void VM_checkextension(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_checkextension);
- PRVM_G_FLOAT(OFS_RETURN) = checkextension(PRVM_G_STRING(OFS_PARM0));
+ PRVM_G_FLOAT(OFS_RETURN) = checkextension(prog, PRVM_G_STRING(OFS_PARM0));
}
/*
error(value)
=================
*/
-void VM_error (void)
+void VM_error(prvm_prog_t *prog)
{
prvm_edict_t *ed;
char string[VM_STRINGTEMP_LENGTH];
- VM_VarString(0, string, sizeof(string));
- Con_Printf("======%s ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+ VM_VarString(prog, 0, string, sizeof(string));
+ Con_Printf(CON_ERROR "======%s ERROR in %s:\n%s\n", prog->name, PRVM_GetString(prog, prog->xfunction->s_name), string);
ed = PRVM_PROG_TO_EDICT(PRVM_allglobaledict(self));
- PRVM_ED_Print(ed, NULL);
+ PRVM_ED_Print(prog, ed, NULL);
- PRVM_ERROR ("%s: Program error in function %s:\n%s\nTip: read above for entity information\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+ prog->error_cmd("%s: Program error in function %s:\n%s\nTip: read above for entity information\n", prog->name, PRVM_GetString(prog, prog->xfunction->s_name), string);
}
/*
objerror(value)
=================
*/
-void VM_objerror (void)
+void VM_objerror(prvm_prog_t *prog)
{
prvm_edict_t *ed;
char string[VM_STRINGTEMP_LENGTH];
- VM_VarString(0, string, sizeof(string));
- Con_Printf("======OBJECT ERROR======\n"); // , PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); // or include them? FIXME
+ VM_VarString(prog, 0, string, sizeof(string));
+ Con_Printf(CON_ERROR "======OBJECT ERROR======\n"); // , prog->name, PRVM_GetString(prog->xfunction->s_name), string); // or include them? FIXME
ed = PRVM_PROG_TO_EDICT(PRVM_allglobaledict(self));
- PRVM_ED_Print(ed, NULL);
- PRVM_ED_Free (ed);
- Con_Printf("%s OBJECT ERROR in %s:\n%s\nTip: read above for entity information\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+ PRVM_ED_Print(prog, ed, NULL);
+ PRVM_ED_Free (prog, ed);
+ Con_Printf(CON_ERROR "%s OBJECT ERROR in %s:\n%s\nTip: read above for entity information\n", prog->name, PRVM_GetString(prog, prog->xfunction->s_name), string);
}
/*
print(...[string])
=================
*/
-void VM_print (void)
+void VM_print(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
- VM_VarString(0, string, sizeof(string));
+ VM_VarString(prog, 0, string, sizeof(string));
Con_Print(string);
}
bprint(...[string])
=================
*/
-void VM_bprint (void)
+void VM_bprint(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
if(!sv.active)
{
- VM_Warning("VM_bprint: game is not server(%s) !\n", PRVM_NAME);
+ VM_Warning(prog, "VM_bprint: game is not server(%s) !\n", prog->name);
return;
}
- VM_VarString(0, string, sizeof(string));
+ VM_VarString(prog, 0, string, sizeof(string));
SV_BroadcastPrint(string);
}
sprint(float clientnum,...[string])
=================
*/
-void VM_sprint (void)
+void VM_sprint(prvm_prog_t *prog)
{
client_t *client;
int clientnum;
clientnum = (int)PRVM_G_FLOAT(OFS_PARM0);
if (!sv.active || clientnum < 0 || clientnum >= svs.maxclients || !svs.clients[clientnum].active)
{
- VM_Warning("VM_sprint: %s: invalid client or server is not active !\n", PRVM_NAME);
+ VM_Warning(prog, "VM_sprint: %s: invalid client or server is not active !\n", prog->name);
return;
}
if (!client->netconnection)
return;
- VM_VarString(1, string, sizeof(string));
+ VM_VarString(prog, 1, string, sizeof(string));
MSG_WriteChar(&client->netconnection->message,svc_print);
MSG_WriteString(&client->netconnection->message, string);
}
centerprint(value)
=================
*/
-void VM_centerprint (void)
+void VM_centerprint(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1, 8, VM_centerprint);
- VM_VarString(0, string, sizeof(string));
+ VM_VarString(prog, 0, string, sizeof(string));
SCR_CenterPrint(string);
}
vector normalize(vector)
=================
*/
-void VM_normalize (void)
+void VM_normalize(prvm_prog_t *prog)
{
- float *value1;
+ prvm_vec_t *value1;
vec3_t newvalue;
double f;
scalar vlen(vector)
=================
*/
-void VM_vlen (void)
+void VM_vlen(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_vlen);
PRVM_G_FLOAT(OFS_RETURN) = VectorLength(PRVM_G_VECTOR(OFS_PARM0));
float vectoyaw(vector)
=================
*/
-void VM_vectoyaw (void)
+void VM_vectoyaw(prvm_prog_t *prog)
{
- float *value1;
- float yaw;
+ prvm_vec_t *value1;
+ prvm_vec_t yaw;
VM_SAFEPARMCOUNT(1,VM_vectoyaw);
vector vectoangles(vector[, vector])
=================
*/
-void VM_vectoangles (void)
+void VM_vectoangles(prvm_prog_t *prog)
{
+ vec3_t result, forward, up;
VM_SAFEPARMCOUNTRANGE(1, 2,VM_vectoangles);
- AnglesFromVectors(PRVM_G_VECTOR(OFS_RETURN), PRVM_G_VECTOR(OFS_PARM0), prog->argc >= 2 ? PRVM_G_VECTOR(OFS_PARM1) : NULL, true);
+ VectorCopy(PRVM_G_VECTOR(OFS_PARM0), forward);
+ if (prog->argc >= 2)
+ {
+ VectorCopy(PRVM_G_VECTOR(OFS_PARM1), up);
+ AnglesFromVectors(result, forward, up, true);
+ }
+ else
+ AnglesFromVectors(result, forward, NULL, true);
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
}
/*
float random()
=================
*/
-void VM_random (void)
+void VM_random(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_random);
localsound(string sample)
=========
*/
-void VM_localsound(void)
+void VM_localsound(prvm_prog_t *prog)
{
const char *s;
if(!S_LocalSound (s))
{
PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning("VM_localsound: Failed to play %s for %s !\n", s, PRVM_NAME);
+ VM_Warning(prog, "VM_localsound: Failed to play %s for %s !\n", s, prog->name);
return;
}
break()
=================
*/
-void VM_break (void)
+void VM_break(prvm_prog_t *prog)
{
- PRVM_ERROR ("%s: break statement", PRVM_NAME);
+ prog->error_cmd("%s: break statement", prog->name);
}
//============================================================================
/*
=================
-VM_localcmd
+VM_localcmd_local
Sends text over to the client's execution buffer
cmd (string, ...)
=================
*/
-void VM_localcmd (void)
+void VM_localcmd_local(prvm_prog_t *prog)
+{
+ char string[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_local);
+ VM_VarString(prog, 0, string, sizeof(string));
+ Cbuf_AddText(cmd_local, string);
+}
+
+/*
+=================
+VM_localcmd_server
+
+Sends text over to the server's execution buffer
+
+[localcmd (string, ...) or]
+cmd (string, ...)
+=================
+*/
+void VM_localcmd_server(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
- VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd);
- VM_VarString(0, string, sizeof(string));
- Cbuf_AddText(string);
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_server);
+ VM_VarString(prog, 0, string, sizeof(string));
+ Cbuf_AddText(cmd_local, string);
}
-static qboolean PRVM_Cvar_ReadOk(const char *string)
+static qbool PRVM_Cvar_ReadOk(prvm_prog_t *prog, const char *string)
{
cvar_t *cvar;
- cvar = Cvar_FindVar(string);
- return ((cvar) && ((cvar->flags & CVAR_PRIVATE) == 0));
+ cvar = Cvar_FindVar(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask);
+ return ((cvar) && ((cvar->flags & CF_PRIVATE) == 0));
}
/*
float cvar (string)
=================
*/
-void VM_cvar (void)
+void VM_cvar(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
- VM_VarString(0, string, sizeof(string));
- VM_CheckEmptyString(string);
- PRVM_G_FLOAT(OFS_RETURN) = PRVM_Cvar_ReadOk(string) ? Cvar_VariableValue(string) : 0;
+ VM_VarString(prog, 0, string, sizeof(string));
+ VM_CheckEmptyString(prog, string);
+ PRVM_G_FLOAT(OFS_RETURN) = PRVM_Cvar_ReadOk(prog, string) ? Cvar_VariableValue(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask) : 0;
}
/*
float CVAR_TYPEFLAG_READONLY = 32;
=================
*/
-void VM_cvar_type (void)
+void VM_cvar_type(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
cvar_t *cvar;
int ret;
- VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
- VM_VarString(0, string, sizeof(string));
- VM_CheckEmptyString(string);
- cvar = Cvar_FindVar(string);
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_cvar_type);
+ VM_VarString(prog, 0, string, sizeof(string));
+ VM_CheckEmptyString(prog, string);
+ cvar = Cvar_FindVar(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask);
if(!cvar)
}
ret = 1; // CVAR_EXISTS
- if(cvar->flags & CVAR_SAVE)
+ if(cvar->flags & CF_ARCHIVE)
ret |= 2; // CVAR_TYPE_SAVED
- if(cvar->flags & CVAR_PRIVATE)
+ if(cvar->flags & CF_PRIVATE)
ret |= 4; // CVAR_TYPE_PRIVATE
- if(!(cvar->flags & CVAR_ALLOCATED))
+ if(!(cvar->flags & CF_ALLOCATED))
ret |= 8; // CVAR_TYPE_ENGINE
if(cvar->description != cvar_dummy_description)
ret |= 16; // CVAR_TYPE_HASDESCRIPTION
- if(cvar->flags & CVAR_READONLY)
+ if(cvar->flags & CF_READONLY)
ret |= 32; // CVAR_TYPE_READONLY
PRVM_G_FLOAT(OFS_RETURN) = ret;
const string VM_cvar_string (string, ...)
=================
*/
-void VM_cvar_string(void)
+void VM_cvar_string(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_string);
- VM_VarString(0, string, sizeof(string));
- VM_CheckEmptyString(string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(PRVM_Cvar_ReadOk(string) ? Cvar_VariableString(string) : "");
+ VM_VarString(prog, 0, string, sizeof(string));
+ VM_CheckEmptyString(prog, string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, PRVM_Cvar_ReadOk(prog, string) ? Cvar_VariableString(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask) : "");
}
const string VM_cvar_defstring (string, ...)
========================
*/
-void VM_cvar_defstring (void)
+void VM_cvar_defstring(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_defstring);
- VM_VarString(0, string, sizeof(string));
- VM_CheckEmptyString(string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableDefString(string));
+ VM_VarString(prog, 0, string, sizeof(string));
+ VM_CheckEmptyString(prog, string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDefString(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask));
}
/*
const string VM_cvar_description (string, ...)
========================
*/
-void VM_cvar_description (void)
+void VM_cvar_description(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_description);
- VM_VarString(0, string, sizeof(string));
- VM_CheckEmptyString(string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableDescription(string));
+ VM_VarString(prog, 0, string, sizeof(string));
+ VM_CheckEmptyString(prog, string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDescription(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask));
}
/*
=================
void cvar_set (string,string, ...)
=================
*/
-void VM_cvar_set (void)
+void VM_cvar_set(prvm_prog_t *prog)
{
const char *name;
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(2,8,VM_cvar_set);
- VM_VarString(1, string, sizeof(string));
+ VM_VarString(prog, 1, string, sizeof(string));
name = PRVM_G_STRING(OFS_PARM0);
- VM_CheckEmptyString(name);
- Cvar_Set(name, string);
+ VM_CheckEmptyString(prog, name);
+ Cvar_Set(prog->console_cmd->cvars, name, string);
}
/*
dprint(...[string])
=========
*/
-void VM_dprint (void)
+void VM_dprint(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1, 8, VM_dprint);
- VM_VarString(0, string, sizeof(string));
+ VM_VarString(prog, 0, string, sizeof(string));
#if 1
Con_DPrintf("%s", string);
#else
- Con_DPrintf("%s: %s", PRVM_NAME, string);
+ Con_DPrintf("%s: %s", prog->name, string);
#endif
}
=========
*/
-void VM_ftos (void)
+void VM_ftos(prvm_prog_t *prog)
{
- float v;
+ prvm_vec_t v;
char s[128];
VM_SAFEPARMCOUNT(1, VM_ftos);
v = PRVM_G_FLOAT(OFS_PARM0);
- if ((float)((int)v) == v)
- dpsnprintf(s, sizeof(s), "%i", (int)v);
+ if ((prvm_vec_t)((prvm_int_t)v) == v)
+ dpsnprintf(s, sizeof(s), "%.0f", v);
else
dpsnprintf(s, sizeof(s), "%f", v);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
}
/*
=========
*/
-void VM_fabs (void)
+void VM_fabs(prvm_prog_t *prog)
{
- float v;
+ prvm_vec_t v;
VM_SAFEPARMCOUNT(1,VM_fabs);
=========
*/
-void VM_vtos (void)
+void VM_vtos(prvm_prog_t *prog)
{
char s[512];
VM_SAFEPARMCOUNT(1,VM_vtos);
dpsnprintf (s, sizeof(s), "'%5.1f %5.1f %5.1f'", PRVM_G_VECTOR(OFS_PARM0)[0], PRVM_G_VECTOR(OFS_PARM0)[1], PRVM_G_VECTOR(OFS_PARM0)[2]);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
}
/*
=========
*/
-void VM_etos (void)
+void VM_etos(prvm_prog_t *prog)
{
char s[128];
VM_SAFEPARMCOUNT(1, VM_etos);
dpsnprintf (s, sizeof(s), "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
}
/*
float stof(...[string])
=========
*/
-void VM_stof(void)
+void VM_stof(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1, 8, VM_stof);
- VM_VarString(0, string, sizeof(string));
+ VM_VarString(prog, 0, string, sizeof(string));
PRVM_G_FLOAT(OFS_RETURN) = atof(string);
}
========================
VM_itof
-float itof(intt ent)
+float itof(int ent)
========================
*/
-void VM_itof(void)
+void VM_itof(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_itof);
PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
entity ftoe(float num)
========================
*/
-void VM_ftoe(void)
+void VM_ftoe(prvm_prog_t *prog)
{
- int ent;
+ prvm_int_t ent;
VM_SAFEPARMCOUNT(1, VM_ftoe);
- ent = (int)PRVM_G_FLOAT(OFS_PARM0);
+ ent = (prvm_int_t)PRVM_G_FLOAT(OFS_PARM0);
if (ent < 0 || ent >= prog->max_edicts || PRVM_PROG_TO_EDICT(ent)->priv.required->free)
ent = 0; // return world instead of a free or invalid entity
float etof(entity ent)
========================
*/
-void VM_etof(void)
+void VM_etof(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_etof);
PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_EDICTNUM(OFS_PARM0);
string strftime(float uselocaltime, string[, string ...])
=========
*/
-void VM_strftime(void)
+void VM_strftime(prvm_prog_t *prog)
{
time_t t;
#if _MSC_VER >= 1400
char fmt[VM_STRINGTEMP_LENGTH];
char result[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(2, 8, VM_strftime);
- VM_VarString(1, fmt, sizeof(fmt));
+ VM_VarString(prog, 1, fmt, sizeof(fmt));
t = time(NULL);
#if _MSC_VER >= 1400
if (PRVM_G_FLOAT(OFS_PARM0))
#else
strftime(result, sizeof(result), fmt, tm);
#endif
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(result);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, result);
}
/*
=========
*/
-void VM_spawn (void)
+void VM_spawn(prvm_prog_t *prog)
{
prvm_edict_t *ed;
VM_SAFEPARMCOUNT(0, VM_spawn);
prog->xfunction->builtinsprofile += 20;
- ed = PRVM_ED_Alloc();
+ ed = PRVM_ED_Alloc(prog);
VM_RETURN_EDICT(ed);
}
=========
*/
-void VM_remove (void)
+void VM_remove(prvm_prog_t *prog)
{
prvm_edict_t *ed;
prog->xfunction->builtinsprofile += 20;
if( PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts )
{
if (developer.integer > 0)
- VM_Warning( "VM_remove: tried to remove the null entity or a reserved entity!\n" );
+ VM_Warning(prog, "VM_remove: tried to remove the null entity or a reserved entity!\n" );
}
else if( ed->priv.required->free )
{
if (developer.integer > 0)
- VM_Warning( "VM_remove: tried to remove an already freed entity!\n" );
+ VM_Warning(prog, "VM_remove: tried to remove an already freed entity!\n" );
}
else
- PRVM_ED_Free (ed);
+ PRVM_ED_Free (prog, ed);
}
/*
=========
*/
-void VM_find (void)
+void VM_find(prvm_prog_t *prog)
{
int e;
int f;
f = PRVM_G_INT(OFS_PARM1);
s = PRVM_G_STRING(OFS_PARM2);
- // LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
+ // LadyHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
// expects it to find all the monsters, so we must be careful to support
// searching for ""
entity findentity(entity start, .entity field, entity match)
=========
*/
-// LordHavoc: added this for searching float, int, and entity reference fields
-void VM_findfloat (void)
+// LadyHavoc: added this for searching float, int, and entity reference fields
+void VM_findfloat(prvm_prog_t *prog)
{
int e;
int f;
- float s;
+ prvm_vec_t s;
prvm_edict_t *ed;
VM_SAFEPARMCOUNT(3,VM_findfloat);
*/
// chained search for strings in entity fields
// entity(.string field, string match) findchain = #402;
-void VM_findchain (void)
+void VM_findchain(prvm_prog_t *prog)
{
int i;
int f;
else
chainfield = prog->fieldoffsets.chain;
if (chainfield < 0)
- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
+ prog->error_cmd("VM_findchain: %s doesnt have the specified chain field !", prog->name);
chain = prog->edicts;
f = PRVM_G_INT(OFS_PARM0);
s = PRVM_G_STRING(OFS_PARM1);
- // LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
+ // LadyHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
// expects it to find all the monsters, so we must be careful to support
// searching for ""
entity findchainentity(.string field, entity match)
=========
*/
-// LordHavoc: chained search for float, int, and entity reference fields
+// LadyHavoc: chained search for float, int, and entity reference fields
// entity(.string field, float match) findchainfloat = #403;
-void VM_findchainfloat (void)
+void VM_findchainfloat(prvm_prog_t *prog)
{
int i;
int f;
- float s;
+ prvm_vec_t s;
prvm_edict_t *ent, *chain;
int chainfield;
else
chainfield = prog->fieldoffsets.chain;
if (chainfield < 0)
- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
+ prog->error_cmd("VM_findchain: %s doesnt have the specified chain field !", prog->name);
chain = (prvm_edict_t *)prog->edicts;
entity findflags(entity start, .float field, float match)
========================
*/
-// LordHavoc: search for flags in float fields
-void VM_findflags (void)
+// LadyHavoc: search for flags in float fields
+void VM_findflags(prvm_prog_t *prog)
{
- int e;
- int f;
- int s;
+ prvm_int_t e;
+ prvm_int_t f;
+ prvm_int_t s;
prvm_edict_t *ed;
VM_SAFEPARMCOUNT(3, VM_findflags);
e = PRVM_G_EDICTNUM(OFS_PARM0);
f = PRVM_G_INT(OFS_PARM1);
- s = (int)PRVM_G_FLOAT(OFS_PARM2);
+ s = (prvm_int_t)PRVM_G_FLOAT(OFS_PARM2);
for (e++ ; e < prog->num_edicts ; e++)
{
continue;
if (!PRVM_E_FLOAT(ed,f))
continue;
- if ((int)PRVM_E_FLOAT(ed,f) & s)
+ if ((prvm_int_t)PRVM_E_FLOAT(ed,f) & s)
{
VM_RETURN_EDICT(ed);
return;
entity findchainflags(.float field, float match)
========================
*/
-// LordHavoc: chained search for flags in float fields
-void VM_findchainflags (void)
+// LadyHavoc: chained search for flags in float fields
+void VM_findchainflags(prvm_prog_t *prog)
{
- int i;
- int f;
- int s;
+ prvm_int_t i;
+ prvm_int_t f;
+ prvm_int_t s;
prvm_edict_t *ent, *chain;
int chainfield;
else
chainfield = prog->fieldoffsets.chain;
if (chainfield < 0)
- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
+ prog->error_cmd("VM_findchain: %s doesnt have the specified chain field !", prog->name);
chain = (prvm_edict_t *)prog->edicts;
f = PRVM_G_INT(OFS_PARM0);
- s = (int)PRVM_G_FLOAT(OFS_PARM1);
+ s = (prvm_int_t)PRVM_G_FLOAT(OFS_PARM1);
ent = PRVM_NEXT_EDICT(prog->edicts);
for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
continue;
if (!PRVM_E_FLOAT(ent,f))
continue;
- if (!((int)PRVM_E_FLOAT(ent,f) & s))
+ if (!((prvm_int_t)PRVM_E_FLOAT(ent,f) & s))
continue;
PRVM_EDICTFIELDEDICT(ent,chainfield) = PRVM_EDICT_TO_PROG(chain);
string precache_sound (string sample)
=========
*/
-void VM_precache_sound (void)
+void VM_precache_sound(prvm_prog_t *prog)
{
const char *s;
s = PRVM_G_STRING(OFS_PARM0);
PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
- //VM_CheckEmptyString(s);
+ //VM_CheckEmptyString(prog, s);
if(snd_initialized.integer && !S_PrecacheSound(s, true, true))
{
- VM_Warning("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+ VM_Warning(prog, "VM_precache_sound: Failed to load %s for %s\n", s, prog->name);
return;
}
}
does nothing, only used by qcc to build .pak archives
=================
*/
-void VM_precache_file (void)
+void VM_precache_file(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_precache_file);
// precache_file is only used to copy files with qcc, it does nothing
coredump()
=========
*/
-void VM_coredump (void)
+void VM_coredump(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_coredump);
- Cbuf_AddText("prvm_edicts ");
- Cbuf_AddText(PRVM_NAME);
- Cbuf_AddText("\n");
+ Cbuf_AddText(cmd_local, "prvm_edicts ");
+ Cbuf_AddText(cmd_local, prog->name);
+ Cbuf_AddText(cmd_local, "\n");
}
/*
stackdump()
=========
*/
-void PRVM_StackTrace(void);
-void VM_stackdump (void)
+void VM_stackdump(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_stackdump);
- PRVM_StackTrace();
+ PRVM_StackTrace(prog);
}
/*
=========
*/
-void VM_crash(void)
+void VM_crash(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_crash);
- PRVM_ERROR("Crash called by %s",PRVM_NAME);
+ prog->error_cmd("Crash called by %s",prog->name);
}
/*
traceon()
=========
*/
-void VM_traceon (void)
+void VM_traceon(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_traceon);
traceoff()
=========
*/
-void VM_traceoff (void)
+void VM_traceoff(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_traceoff);
eprint(entity e)
=========
*/
-void VM_eprint (void)
+void VM_eprint(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_eprint);
- PRVM_ED_PrintNum (PRVM_G_EDICTNUM(OFS_PARM0), NULL);
+ PRVM_ED_PrintNum (prog, PRVM_G_EDICTNUM(OFS_PARM0), NULL);
}
/*
float rint(float)
=========
*/
-void VM_rint (void)
+void VM_rint(prvm_prog_t *prog)
{
- float f;
+ prvm_vec_t f;
VM_SAFEPARMCOUNT(1,VM_rint);
f = PRVM_G_FLOAT(OFS_PARM0);
float floor(float)
=========
*/
-void VM_floor (void)
+void VM_floor(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_floor);
float ceil(float)
=========
*/
-void VM_ceil (void)
+void VM_ceil(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_ceil);
entity nextent(entity)
=============
*/
-void VM_nextent (void)
+void VM_nextent(prvm_prog_t *prog)
{
int i;
prvm_edict_t *ent;
changelevel(string map)
==============
*/
-void VM_changelevel (void)
+void VM_changelevel(prvm_prog_t *prog)
{
+ char vabuf[1024];
VM_SAFEPARMCOUNT(1, VM_changelevel);
if(!sv.active)
{
- VM_Warning("VM_changelevel: game is not server (%s)\n", PRVM_NAME);
+ VM_Warning(prog, "VM_changelevel: game is not server (%s)\n", prog->name);
return;
}
return;
svs.changelevel_issued = true;
- Cbuf_AddText (va("changelevel %s\n",PRVM_G_STRING(OFS_PARM0)));
+ Cbuf_AddText(cmd_local, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0)));
}
/*
float sin(float)
=========
*/
-void VM_sin (void)
+void VM_sin(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_sin);
PRVM_G_FLOAT(OFS_RETURN) = sin(PRVM_G_FLOAT(OFS_PARM0));
float cos(float)
=========
*/
-void VM_cos (void)
+void VM_cos(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_cos);
PRVM_G_FLOAT(OFS_RETURN) = cos(PRVM_G_FLOAT(OFS_PARM0));
float sqrt(float)
=========
*/
-void VM_sqrt (void)
+void VM_sqrt(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_sqrt);
PRVM_G_FLOAT(OFS_RETURN) = sqrt(PRVM_G_FLOAT(OFS_PARM0));
float asin(float)
=========
*/
-void VM_asin (void)
+void VM_asin(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_asin);
PRVM_G_FLOAT(OFS_RETURN) = asin(PRVM_G_FLOAT(OFS_PARM0));
float acos(float)
=========
*/
-void VM_acos (void)
+void VM_acos(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_acos);
PRVM_G_FLOAT(OFS_RETURN) = acos(PRVM_G_FLOAT(OFS_PARM0));
float atan(float)
=========
*/
-void VM_atan (void)
+void VM_atan(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_atan);
PRVM_G_FLOAT(OFS_RETURN) = atan(PRVM_G_FLOAT(OFS_PARM0));
float atan2(float,float)
=========
*/
-void VM_atan2 (void)
+void VM_atan2(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(2,VM_atan2);
PRVM_G_FLOAT(OFS_RETURN) = atan2(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
float tan(float)
=========
*/
-void VM_tan (void)
+void VM_tan(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_tan);
PRVM_G_FLOAT(OFS_RETURN) = tan(PRVM_G_FLOAT(OFS_PARM0));
vector randomvec()
=================
*/
-void VM_randomvec (void)
+void VM_randomvec(prvm_prog_t *prog)
{
- vec3_t temp;
- //float length;
-
+ vec3_t temp;
VM_SAFEPARMCOUNT(0, VM_randomvec);
-
- //// WTF ??
- do
- {
- temp[0] = (rand()&32767) * (2.0 / 32767.0) - 1.0;
- temp[1] = (rand()&32767) * (2.0 / 32767.0) - 1.0;
- temp[2] = (rand()&32767) * (2.0 / 32767.0) - 1.0;
- }
- while (DotProduct(temp, temp) >= 1);
- VectorCopy (temp, PRVM_G_VECTOR(OFS_RETURN));
-
- /*
- temp[0] = (rand()&32767) * (2.0 / 32767.0) - 1.0;
- temp[1] = (rand()&32767) * (2.0 / 32767.0) - 1.0;
- temp[2] = (rand()&32767) * (2.0 / 32767.0) - 1.0;
- // length returned always > 0
- length = (rand()&32766 + 1) * (1.0 / 32767.0) / VectorLength(temp);
- VectorScale(temp,length, temp);*/
- //VectorCopy(temp, PRVM_G_VECTOR(OFS_RETURN));
+ VectorRandom(temp);
+ VectorCopy(temp, PRVM_G_VECTOR(OFS_RETURN));
}
//=============================================================================
float registercvar (string name, string value[, float flags])
=========
*/
-void VM_registercvar (void)
+void VM_registercvar(prvm_prog_t *prog)
{
const char *name, *value;
int flags;
flags = prog->argc >= 3 ? (int)PRVM_G_FLOAT(OFS_PARM2) : 0;
PRVM_G_FLOAT(OFS_RETURN) = 0;
- if(flags > CVAR_MAXFLAGSVAL)
+ if(flags > CF_MAXFLAGSVAL)
return;
// first check to see if it has already been defined
- if (Cvar_FindVar (name))
+ if (Cvar_FindVar (prog->console_cmd->cvars, name, prog->console_cmd->cvars_flagsmask))
return;
// check for overlap with a command
- if (Cmd_Exists (name))
+ if (Cmd_Exists(cmd_local, name))
{
- VM_Warning("VM_registercvar: %s is a command\n", name);
+ VM_Warning(prog, "VM_registercvar: %s is a command\n", name);
return;
}
- Cvar_Get(name, value, flags, NULL);
+ Cvar_Get(prog->console_cmd->cvars, name, value, prog->console_cmd->cvars_flagsmask | flags, NULL);
PRVM_G_FLOAT(OFS_RETURN) = 1; // success
}
float min(float a, float b, ...[float])
=================
*/
-void VM_min (void)
+void VM_min(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNTRANGE(2, 8, VM_min);
- // LordHavoc: 3+ argument enhancement suggested by FrikaC
+ // LadyHavoc: 3+ argument enhancement suggested by FrikaC
if (prog->argc >= 3)
{
int i;
float max(float a, float b, ...[float])
=================
*/
-void VM_max (void)
+void VM_max(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNTRANGE(2, 8, VM_max);
- // LordHavoc: 3+ argument enhancement suggested by FrikaC
+ // LadyHavoc: 3+ argument enhancement suggested by FrikaC
if (prog->argc >= 3)
{
int i;
float bound(float min, float value, float max)
=================
*/
-void VM_bound (void)
+void VM_bound(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(3,VM_bound);
PRVM_G_FLOAT(OFS_RETURN) = bound(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1), PRVM_G_FLOAT(OFS_PARM2));
float pow(float a, float b)
=================
*/
-void VM_pow (void)
+void VM_pow(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(2,VM_pow);
PRVM_G_FLOAT(OFS_RETURN) = pow(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
}
-void VM_log (void)
+void VM_log(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_log);
PRVM_G_FLOAT(OFS_RETURN) = log(PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_Files_Init(void)
+void VM_Files_Init(prvm_prog_t *prog)
{
int i;
for (i = 0;i < PRVM_MAX_OPENFILES;i++)
prog->openfiles[i] = NULL;
}
-void VM_Files_CloseAll(void)
+void VM_Files_CloseAll(prvm_prog_t *prog)
{
int i;
for (i = 0;i < PRVM_MAX_OPENFILES;i++)
}
}
-static qfile_t *VM_GetFileHandle( int index )
+static qfile_t *VM_GetFileHandle(prvm_prog_t *prog, int index)
{
if (index < 0 || index >= PRVM_MAX_OPENFILES)
{
- Con_Printf("VM_GetFileHandle: invalid file handle %i used in %s\n", index, PRVM_NAME);
+ Con_Printf("VM_GetFileHandle: invalid file handle %i used in %s\n", index, prog->name);
return NULL;
}
if (prog->openfiles[index] == NULL)
{
- Con_Printf("VM_GetFileHandle: no such file handle %i (or file has been closed) in %s\n", index, PRVM_NAME);
+ Con_Printf("VM_GetFileHandle: no such file handle %i (or file has been closed) in %s\n", index, prog->name);
return NULL;
}
return prog->openfiles[index];
// 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 VM_fopen(void)
+void VM_fopen(prvm_prog_t *prog)
{
int filenum, mode;
const char *modestring, *filename;
+ char vabuf[1024];
VM_SAFEPARMCOUNT(2,VM_fopen);
if (filenum >= PRVM_MAX_OPENFILES)
{
PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_fopen: %s ran out of file handles (%i)\n", PRVM_NAME, PRVM_MAX_OPENFILES);
+ VM_Warning(prog, "VM_fopen: %s ran out of file handles (%i)\n", prog->name, PRVM_MAX_OPENFILES);
return;
}
filename = PRVM_G_STRING(OFS_PARM0);
{
case 0: // FILE_READ
modestring = "rb";
- prog->openfiles[filenum] = FS_OpenVirtualFile(va("data/%s", filename), false);
+ prog->openfiles[filenum] = FS_OpenVirtualFile(va(vabuf, sizeof(vabuf), "data/%s", filename), false);
if (prog->openfiles[filenum] == NULL)
- prog->openfiles[filenum] = FS_OpenVirtualFile(va("%s", filename), false);
+ prog->openfiles[filenum] = FS_OpenVirtualFile(va(vabuf, sizeof(vabuf), "%s", filename), false);
break;
case 1: // FILE_APPEND
modestring = "a";
- prog->openfiles[filenum] = FS_OpenRealFile(va("data/%s", filename), modestring, false);
+ prog->openfiles[filenum] = FS_OpenRealFile(va(vabuf, sizeof(vabuf), "data/%s", filename), modestring, false);
break;
case 2: // FILE_WRITE
modestring = "w";
- prog->openfiles[filenum] = FS_OpenRealFile(va("data/%s", filename), modestring, false);
+ prog->openfiles[filenum] = FS_OpenRealFile(va(vabuf, sizeof(vabuf), "data/%s", filename), modestring, false);
break;
default:
PRVM_G_FLOAT(OFS_RETURN) = -3;
- VM_Warning("VM_fopen: %s: no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode);
+ VM_Warning(prog, "VM_fopen: %s: no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", prog->name, mode);
return;
}
{
PRVM_G_FLOAT(OFS_RETURN) = -1;
if (developer_extra.integer)
- VM_Warning("VM_fopen: %s: %s mode %s failed\n", PRVM_NAME, filename, modestring);
+ VM_Warning(prog, "VM_fopen: %s: %s mode %s failed\n", prog->name, filename, modestring);
}
else
{
PRVM_G_FLOAT(OFS_RETURN) = filenum;
if (developer_extra.integer)
- Con_DPrintf("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum);
- prog->openfiles_origin[filenum] = PRVM_AllocationOrigin();
+ Con_DPrintf("VM_fopen: %s: %s mode %s opened as #%i\n", prog->name, filename, modestring, filenum);
+ prog->openfiles_origin[filenum] = PRVM_AllocationOrigin(prog);
}
}
=========
*/
//void(float fhandle) fclose = #111; // closes a file
-void VM_fclose(void)
+void VM_fclose(prvm_prog_t *prog)
{
int filenum;
filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
{
- VM_Warning("VM_fclose: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+ VM_Warning(prog, "VM_fclose: invalid file handle %i used in %s\n", filenum, prog->name);
return;
}
if (prog->openfiles[filenum] == NULL)
{
- VM_Warning("VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+ VM_Warning(prog, "VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, prog->name);
return;
}
FS_Close(prog->openfiles[filenum]);
if(prog->openfiles_origin[filenum])
PRVM_Free((char *)prog->openfiles_origin[filenum]);
if (developer_extra.integer)
- Con_DPrintf("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum);
+ Con_DPrintf("VM_fclose: %s: #%i closed\n", prog->name, filenum);
}
/*
=========
*/
//string(float fhandle) fgets = #112; // reads a line of text from the file and returns as a tempstring
-void VM_fgets(void)
+void VM_fgets(prvm_prog_t *prog)
{
int c, end;
char string[VM_STRINGTEMP_LENGTH];
filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
{
- VM_Warning("VM_fgets: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+ VM_Warning(prog, "VM_fgets: invalid file handle %i used in %s\n", filenum, prog->name);
return;
}
if (prog->openfiles[filenum] == NULL)
{
- VM_Warning("VM_fgets: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+ VM_Warning(prog, "VM_fgets: no such file handle %i (or file has been closed) in %s\n", filenum, prog->name);
return;
}
end = 0;
FS_UnGetc(prog->openfiles[filenum], (unsigned char)c);
}
if (developer_extra.integer)
- Con_DPrintf("fgets: %s: %s\n", PRVM_NAME, string);
+ Con_DPrintf("fgets: %s: %s\n", prog->name, string);
if (c >= 0 || end)
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
}
/*
=========
*/
//void(float fhandle, string s) fputs = #113; // writes a line of text to the end of the file
-void VM_fputs(void)
+void VM_fputs(prvm_prog_t *prog)
{
int stringlength;
char string[VM_STRINGTEMP_LENGTH];
filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
{
- VM_Warning("VM_fputs: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+ VM_Warning(prog, "VM_fputs: invalid file handle %i used in %s\n", filenum, prog->name);
return;
}
if (prog->openfiles[filenum] == NULL)
{
- VM_Warning("VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+ VM_Warning(prog, "VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, prog->name);
return;
}
- VM_VarString(1, string, sizeof(string));
+ VM_VarString(prog, 1, string, sizeof(string));
if ((stringlength = (int)strlen(string)))
FS_Write(prog->openfiles[filenum], string, stringlength);
if (developer_extra.integer)
- Con_DPrintf("fputs: %s: %s\n", PRVM_NAME, string);
+ Con_DPrintf("fputs: %s: %s\n", prog->name, string);
}
/*
writetofile(float fhandle, entity ent)
=========
*/
-void VM_writetofile(void)
+void VM_writetofile(prvm_prog_t *prog)
{
prvm_edict_t * ent;
qfile_t *file;
VM_SAFEPARMCOUNT(2, VM_writetofile);
- file = VM_GetFileHandle( (int)PRVM_G_FLOAT(OFS_PARM0) );
+ file = VM_GetFileHandle(prog, (int)PRVM_G_FLOAT(OFS_PARM0));
if( !file )
{
- VM_Warning("VM_writetofile: invalid or closed file handle\n");
+ VM_Warning(prog, "VM_writetofile: invalid or closed file handle\n");
return;
}
ent = PRVM_G_EDICT(OFS_PARM1);
if(ent->priv.required->free)
{
- VM_Warning("VM_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+ VM_Warning(prog, "VM_writetofile: %s: entity %i is free !\n", prog->name, PRVM_NUM_FOR_EDICT(ent));
return;
}
- PRVM_ED_Write (file, ent);
+ PRVM_ED_Write (prog, file, ent);
}
// KrimZon - DP_QC_ENTITYDATA
Return the number of entity fields - NOT offsets
=========
*/
-void VM_numentityfields(void)
+void VM_numentityfields(prvm_prog_t *prog)
{
PRVM_G_FLOAT(OFS_RETURN) = prog->numfielddefs;
}
Return name of the specified field as a string, or empty if the field is invalid (warning)
=========
*/
-void VM_entityfieldname(void)
+void VM_entityfieldname(prvm_prog_t *prog)
{
- ddef_t *d;
+ mdef_t *d;
int i = (int)PRVM_G_FLOAT(OFS_PARM0);
-
+
if (i < 0 || i >= prog->numfielddefs)
{
- VM_Warning("VM_entityfieldname: %s: field index out of bounds\n", PRVM_NAME);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+ VM_Warning(prog, "VM_entityfieldname: %s: field index out of bounds\n", prog->name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
return;
}
-
+
d = &prog->fielddefs[i];
PRVM_G_INT(OFS_RETURN) = d->s_name; // presuming that s_name points to a string already
}
float(float fieldnum) entityfieldtype
=========
*/
-void VM_entityfieldtype(void)
+void VM_entityfieldtype(prvm_prog_t *prog)
{
- ddef_t *d;
+ mdef_t *d;
int i = (int)PRVM_G_FLOAT(OFS_PARM0);
if (i < 0 || i >= prog->numfielddefs)
{
- VM_Warning("VM_entityfieldtype: %s: field index out of bounds\n", PRVM_NAME);
+ VM_Warning(prog, "VM_entityfieldtype: %s: field index out of bounds\n", prog->name);
PRVM_G_FLOAT(OFS_RETURN) = -1.0;
return;
}
d = &prog->fielddefs[i];
- PRVM_G_FLOAT(OFS_RETURN) = (float)d->type;
+ PRVM_G_FLOAT(OFS_RETURN) = (prvm_vec_t)d->type;
}
// KrimZon - DP_QC_ENTITYDATA
string(float fieldnum, entity ent) getentityfieldstring
=========
*/
-void VM_getentityfieldstring(void)
+void VM_getentityfieldstring(prvm_prog_t *prog)
{
// put the data into a string
- ddef_t *d;
+ mdef_t *d;
int type, j;
- int *v;
+ prvm_eval_t *val;
prvm_edict_t * ent;
int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+ char valuebuf[MAX_INPUTLINE];
if (i < 0 || i >= prog->numfielddefs)
{
- VM_Warning("VM_entityfielddata: %s: field index out of bounds\n", PRVM_NAME);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+ VM_Warning(prog, "VM_entityfielddata: %s: field index out of bounds\n", prog->name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
return;
}
ent = PRVM_G_EDICT(OFS_PARM1);
if(ent->priv.required->free)
{
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
- VM_Warning("VM_entityfielddata: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
+ VM_Warning(prog, "VM_entityfielddata: %s: entity %i is free !\n", prog->name, PRVM_NUM_FOR_EDICT(ent));
return;
}
- v = (int *)((char *)ent->fields.vp + d->ofs*4);
+ val = (prvm_eval_t *)(ent->fields.fp + d->ofs);
// if it's 0 or blank, return an empty string
type = d->type & ~DEF_SAVEGLOBAL;
for (j=0 ; j<prvm_type_size[type] ; j++)
- if (v[j])
+ if (val->ivector[j])
break;
if (j == prvm_type_size[type])
{
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
return;
}
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(PRVM_UglyValueString((etype_t)d->type, (prvm_eval_t *)v));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, PRVM_UglyValueString(prog, (etype_t)d->type, val, valuebuf, sizeof(valuebuf)));
}
// KrimZon - DP_QC_ENTITYDATA
float(float fieldnum, entity ent, string s) putentityfieldstring
=========
*/
-void VM_putentityfieldstring(void)
+void VM_putentityfieldstring(prvm_prog_t *prog)
{
- ddef_t *d;
+ mdef_t *d;
prvm_edict_t * ent;
int i = (int)PRVM_G_FLOAT(OFS_PARM0);
if (i < 0 || i >= prog->numfielddefs)
{
- VM_Warning("VM_entityfielddata: %s: field index out of bounds\n", PRVM_NAME);
+ VM_Warning(prog, "VM_entityfielddata: %s: field index out of bounds\n", prog->name);
PRVM_G_FLOAT(OFS_RETURN) = 0.0f;
return;
}
ent = PRVM_G_EDICT(OFS_PARM1);
if(ent->priv.required->free)
{
- VM_Warning("VM_entityfielddata: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+ VM_Warning(prog, "VM_entityfielddata: %s: entity %i is free !\n", prog->name, PRVM_NUM_FOR_EDICT(ent));
PRVM_G_FLOAT(OFS_RETURN) = 0.0f;
return;
}
// parse the string into the value
- PRVM_G_FLOAT(OFS_RETURN) = ( PRVM_ED_ParseEpair(ent, d, PRVM_G_STRING(OFS_PARM2), false) ) ? 1.0f : 0.0f;
+ PRVM_G_FLOAT(OFS_RETURN) = ( PRVM_ED_ParseEpair(prog, ent, d, PRVM_G_STRING(OFS_PARM2), false) ) ? 1.0f : 0.0f;
}
/*
=========
*/
//float(string s) strlen = #114; // returns how many characters are in a string
-void VM_strlen(void)
+void VM_strlen(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_strlen);
=========
*/
// string (string s) strdecolorize = #472; // returns the passed in string with color codes stripped
-void VM_strdecolorize(void)
+void VM_strdecolorize(prvm_prog_t *prog)
{
char szNewString[VM_STRINGTEMP_LENGTH];
const char *szString;
// Prepare Strings
VM_SAFEPARMCOUNT(1,VM_strdecolorize);
szString = PRVM_G_STRING(OFS_PARM0);
- COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), TRUE);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+ COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), true);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
}
// DRESK - String Length (not counting color codes)
*/
// float(string s) strlennocol = #471; // returns how many characters are in a string not including color codes
// For example, ^2Dresk returns a length of 5
-void VM_strlennocol(void)
+void VM_strlennocol(prvm_prog_t *prog)
{
const char *szString;
int nCnt;
szString = PRVM_G_STRING(OFS_PARM0);
- //nCnt = COM_StringLengthNoColors(szString, 0, NULL);
- nCnt = u8_COM_StringLengthNoColors(szString, 0, NULL);
+ //nCnt = (int)COM_StringLengthNoColors(szString, 0, NULL);
+ nCnt = (int)u8_COM_StringLengthNoColors(szString, 0, NULL);
PRVM_G_FLOAT(OFS_RETURN) = nCnt;
}
=========
*/
// string (string s) strtolower = #480; // returns passed in string in lowercase form
-void VM_strtolower(void)
+void VM_strtolower(prvm_prog_t *prog)
{
char szNewString[VM_STRINGTEMP_LENGTH];
const char *szString;
COM_ToLowerString(szString, szNewString, sizeof(szNewString) );
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
}
/*
=========
*/
// string (string s) strtoupper = #481; // returns passed in string in uppercase form
-void VM_strtoupper(void)
+void VM_strtoupper(prvm_prog_t *prog)
{
char szNewString[VM_STRINGTEMP_LENGTH];
const char *szString;
COM_ToUpperString(szString, szNewString, sizeof(szNewString) );
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
}
/*
//string(string s1, string s2) strcat = #115;
// concatenates two strings (for example "abc", "def" would return "abcdef")
// and returns as a tempstring
-void VM_strcat(void)
+void VM_strcat(prvm_prog_t *prog)
{
char s[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1, 8, VM_strcat);
- VM_VarString(0, s, sizeof(s));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
+ VM_VarString(prog, 0, s, sizeof(s));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
}
/*
*/
// string(string s, float start, float length) substring = #116;
// returns a section of a string as a tempstring
-void VM_substring(void)
+void VM_substring(prvm_prog_t *prog)
{
int start, length;
int u_slength = 0, u_start;
memcpy(string, s + start, length);
string[length] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
*/
s = PRVM_G_STRING(OFS_PARM0);
if (start < 0) // FTE_STRINGS feature
{
- u_slength = u8_strlen(s);
+ u_slength = (int)u8_strlen(s);
start += u_slength;
start = bound(0, start, u_slength);
}
if (length < 0) // FTE_STRINGS feature
{
if (!u_slength) // it's not calculated when it's not needed above
- u_slength = u8_strlen(s);
+ u_slength = (int)u8_strlen(s);
length += u_slength - start + 1;
}
u_start = u8_byteofs(s, start, NULL);
if (u_start < 0)
{
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
return;
}
u_length = u8_bytelen(s + u_start, length);
memcpy(string, s + u_start, u_length);
string[u_length] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
}
/*
=========
*/
// replaces all occurrences of search with replace in the string subject, and returns the result
-void VM_strreplace(void)
+void VM_strreplace(prvm_prog_t *prog)
{
int i, j, si;
const char *search, *replace, *subject;
string[si++] = subject[i];
string[si] = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
}
/*
=========
*/
// case-insensitive version of strreplace
-void VM_strireplace(void)
+void VM_strireplace(prvm_prog_t *prog)
{
int i, j, si;
const char *search, *replace, *subject;
char string[VM_STRINGTEMP_LENGTH];
int search_len, replace_len, subject_len;
- VM_SAFEPARMCOUNT(3,VM_strreplace);
+ VM_SAFEPARMCOUNT(3, VM_strireplace);
search = PRVM_G_STRING(OFS_PARM0);
replace = PRVM_G_STRING(OFS_PARM1);
string[si++] = subject[i];
string[si] = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
}
/*
=========
*/
//vector(string s) stov = #117; // returns vector value from a string
-void VM_stov(void)
+void VM_stov(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNT(1,VM_stov);
- VM_VarString(0, string, sizeof(string));
+ VM_VarString(prog, 0, string, sizeof(string));
Math_atov(string, PRVM_G_VECTOR(OFS_RETURN));
}
=========
*/
//string(string s, ...) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often)
-void VM_strzone(void)
+void VM_strzone(prvm_prog_t *prog)
{
char *out;
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNT(1,VM_strzone);
- VM_VarString(0, string, sizeof(string));
+ VM_VarString(prog, 0, string, sizeof(string));
alloclen = strlen(string) + 1;
- PRVM_G_INT(OFS_RETURN) = PRVM_AllocString(alloclen, &out);
+ PRVM_G_INT(OFS_RETURN) = PRVM_AllocString(prog, alloclen, &out);
memcpy(out, string, alloclen);
}
=========
*/
//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 VM_strunzone(void)
+void VM_strunzone(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_strunzone);
- PRVM_FreeString(PRVM_G_INT(OFS_PARM0));
-}
-
-/*
-=========
-VM_command (used by client and menu)
-
-clientcommand(float client, string s) (for client and menu)
-=========
-*/
-//void(entity e, string s) clientcommand = #440; // executes a command string as if it came from the specified client
-//this function originally written by KrimZon, made shorter by LordHavoc
-void VM_clcommand (void)
-{
- client_t *temp_client;
- int i;
-
- VM_SAFEPARMCOUNT(2,VM_clcommand);
-
- i = (int)PRVM_G_FLOAT(OFS_PARM0);
- if (!sv.active || i < 0 || i >= svs.maxclients || !svs.clients[i].active)
- {
- VM_Warning("VM_clientcommand: %s: invalid client/server is not active !\n", PRVM_NAME);
- return;
- }
-
- temp_client = host_client;
- host_client = svs.clients + i;
- Cmd_ExecuteString (PRVM_G_STRING(OFS_PARM1), src_client, true);
- host_client = temp_client;
+ PRVM_FreeString(prog, PRVM_G_INT(OFS_PARM0));
}
-
/*
=========
VM_tokenize
=========
*/
//float(string s) tokenize = #441; // takes apart a string into individal words (access them with argv), returns how many
-//this function originally written by KrimZon, made shorter by LordHavoc
-//20040203: rewritten by LordHavoc (no longer uses allocations)
+//this function originally written by KrimZon, made shorter by LadyHavoc
+//20040203: rewritten by LadyHavoc (no longer uses allocations)
static int num_tokens = 0;
static int tokens[VM_STRINGTEMP_LENGTH / 2];
static int tokens_startpos[VM_STRINGTEMP_LENGTH / 2];
static int tokens_endpos[VM_STRINGTEMP_LENGTH / 2];
static char tokenize_string[VM_STRINGTEMP_LENGTH];
-void VM_tokenize (void)
+void VM_tokenize (prvm_prog_t *prog)
{
const char *p;
if(!COM_ParseToken_VM_Tokenize(&p, false))
break;
tokens_endpos[num_tokens] = p - tokenize_string;
- tokens[num_tokens] = PRVM_SetTempString(com_token);
+ tokens[num_tokens] = PRVM_SetTempString(prog, com_token);
++num_tokens;
}
}
//float(string s) tokenize = #514; // takes apart a string into individal words (access them with argv), returns how many
-void VM_tokenize_console (void)
+void VM_tokenize_console (prvm_prog_t *prog)
{
const char *p;
- VM_SAFEPARMCOUNT(1,VM_tokenize);
+ VM_SAFEPARMCOUNT(1, VM_tokenize_console);
strlcpy(tokenize_string, PRVM_G_STRING(OFS_PARM0), sizeof(tokenize_string));
p = tokenize_string;
if(!COM_ParseToken_Console(&p))
break;
tokens_endpos[num_tokens] = p - tokenize_string;
- tokens[num_tokens] = PRVM_SetTempString(com_token);
+ tokens[num_tokens] = PRVM_SetTempString(prog, com_token);
++num_tokens;
}
//example:
//numnumbers = tokenizebyseparator("10.1.2.3", ".");
//returns 4 and the tokens "10" "1" "2" "3".
-void VM_tokenizebyseparator (void)
+void VM_tokenizebyseparator (prvm_prog_t *prog)
{
int j, k;
int numseparators;
if (!s[0])
continue;
separators[numseparators] = s;
- separatorlen[numseparators] = strlen(s);
+ separatorlen[numseparators] = (int)strlen(s);
numseparators++;
}
if (j >= (int)sizeof(tokentext))
break;
tokentext[j++] = 0;
- tokens[num_tokens++] = PRVM_SetTempString(token);
+ tokens[num_tokens++] = PRVM_SetTempString(prog, token);
if (!*p)
break;
}
}
//string(float n) argv = #442; // returns a word from the tokenized string (returns nothing for an invalid index)
-//this function originally written by KrimZon, made shorter by LordHavoc
-void VM_argv (void)
+//this function originally written by KrimZon, made shorter by LadyHavoc
+void VM_argv (prvm_prog_t *prog)
{
int token_num;
}
//float(float n) argv_start_index = #515; // returns the start index of a token
-void VM_argv_start_index (void)
+void VM_argv_start_index (prvm_prog_t *prog)
{
int token_num;
}
//float(float n) argv_end_index = #516; // returns the end index of a token
-void VM_argv_end_index (void)
+void VM_argv_end_index (prvm_prog_t *prog)
{
int token_num;
float isserver()
=========
*/
-void VM_isserver(void)
+void VM_isserver(prvm_prog_t *prog)
{
- VM_SAFEPARMCOUNT(0,VM_serverstate);
+ VM_SAFEPARMCOUNT(0, VM_isserver);
- PRVM_G_FLOAT(OFS_RETURN) = sv.active && (svs.maxclients > 1 || cls.state == ca_dedicated);
+ PRVM_G_FLOAT(OFS_RETURN) = sv.active;
}
/*
float clientcount()
=========
*/
-void VM_clientcount(void)
+void VM_clientcount(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_clientcount);
float clientstate()
=========
*/
-void VM_clientstate(void)
+void VM_clientstate(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_clientstate);
=========
VM_getostype
-float getostype(void)
+float getostype(prvm_prog_t *prog)
=========
*/ // not used at the moment -> not included in the common list
-void VM_getostype(void)
+void VM_getostype(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_getostype);
=========
VM_gettime
-float gettime(void)
+float gettime(prvm_prog_t *prog)
=========
*/
-extern double host_starttime;
float CDAudio_GetPosition(void);
-void VM_gettime(void)
+void VM_gettime(prvm_prog_t *prog)
{
int timer_index;
if(prog->argc == 0)
{
- PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+ PRVM_G_FLOAT(OFS_RETURN) = (prvm_vec_t) host.realtime;
}
else
{
timer_index = (int) PRVM_G_FLOAT(OFS_PARM0);
- switch(timer_index)
- {
- case 0: // GETTIME_FRAMESTART
- PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
- break;
- case 1: // GETTIME_REALTIME
- PRVM_G_FLOAT(OFS_RETURN) = (float) Sys_DoubleTime();
- break;
- case 2: // GETTIME_HIRES
- PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - realtime);
- break;
- case 3: // GETTIME_UPTIME
- PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - host_starttime);
- break;
- case 4: // GETTIME_CDTRACK
- PRVM_G_FLOAT(OFS_RETURN) = (float) CDAudio_GetPosition();
- break;
+ switch(timer_index)
+ {
+ case 0: // GETTIME_FRAMESTART
+ PRVM_G_FLOAT(OFS_RETURN) = host.realtime;
+ break;
+ case 1: // GETTIME_REALTIME
+ PRVM_G_FLOAT(OFS_RETURN) = Sys_DirtyTime();
+ break;
+ case 2: // GETTIME_HIRES
+ PRVM_G_FLOAT(OFS_RETURN) = (Sys_DirtyTime() - host.dirtytime);
+ break;
+ case 3: // GETTIME_UPTIME
+ PRVM_G_FLOAT(OFS_RETURN) = host.realtime;
+ break;
+ case 4: // GETTIME_CDTRACK
+ PRVM_G_FLOAT(OFS_RETURN) = CDAudio_GetPosition();
+ break;
default:
- VM_Warning("VM_gettime: %s: unsupported timer specified, returning realtime\n", PRVM_NAME);
- PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+ VM_Warning(prog, "VM_gettime: %s: unsupported timer specified, returning realtime\n", prog->name);
+ PRVM_G_FLOAT(OFS_RETURN) = host.realtime;
break;
}
}
=========
VM_getsoundtime
-float getsoundtime(void)
+float getsoundtime(prvm_prog_t *prog)
=========
*/
-void VM_getsoundtime (void)
+void VM_getsoundtime (prvm_prog_t *prog)
{
- int entnum, entchannel, pnum;
+ int entnum, entchannel;
VM_SAFEPARMCOUNT(2,VM_getsoundtime);
- pnum = PRVM_GetProgNr();
- if (pnum == PRVM_MENUPROG)
+ if (prog == SVVM_prog)
+ entnum = PRVM_NUM_FOR_EDICT(PRVM_G_EDICT(OFS_PARM0));
+ else if (prog == CLVM_prog)
+ entnum = MAX_EDICTS + PRVM_NUM_FOR_EDICT(PRVM_G_EDICT(OFS_PARM0));
+ else
{
- VM_Warning("VM_getsoundtime: %s: not supported on this progs\n", PRVM_NAME);
+ VM_Warning(prog, "VM_getsoundtime: %s: not supported on this progs\n", prog->name);
PRVM_G_FLOAT(OFS_RETURN) = -1;
return;
}
- entnum = ((pnum == PRVM_CLIENTPROG) ? MAX_EDICTS : 0) + PRVM_NUM_FOR_EDICT(PRVM_G_EDICT(OFS_PARM0));
entchannel = (int)PRVM_G_FLOAT(OFS_PARM1);
entchannel = CHAN_USER2ENGINE(entchannel);
if (!IS_CHAN(entchannel))
- VM_Warning("VM_getsoundtime: %s: bad channel %i\n", PRVM_NAME, entchannel);
- PRVM_G_FLOAT(OFS_RETURN) = (float)S_GetEntChannelPosition(entnum, entchannel);
+ VM_Warning(prog, "VM_getsoundtime: %s: bad channel %i\n", prog->name, entchannel);
+ PRVM_G_FLOAT(OFS_RETURN) = (prvm_vec_t)S_GetEntChannelPosition(entnum, entchannel);
}
/*
string soundlength (string sample)
=========
*/
-void VM_soundlength (void)
+void VM_soundlength (prvm_prog_t *prog)
{
const char *s;
loadfromdata(string data)
=========
*/
-void VM_loadfromdata(void)
+void VM_loadfromdata(prvm_prog_t *prog)
{
- VM_SAFEPARMCOUNT(1,VM_loadentsfromfile);
+ VM_SAFEPARMCOUNT(1, VM_loadfromdata);
- PRVM_ED_LoadFromFile(PRVM_G_STRING(OFS_PARM0));
+ PRVM_ED_LoadFromFile(prog, PRVM_G_STRING(OFS_PARM0));
}
/*
parseentitydata(entity ent, string data)
========================
*/
-void VM_parseentitydata(void)
+void VM_parseentitydata(prvm_prog_t *prog)
{
prvm_edict_t *ent;
const char *data;
// get edict and test it
ent = PRVM_G_EDICT(OFS_PARM0);
if (ent->priv.required->free)
- PRVM_ERROR ("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+ prog->error_cmd("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!", prog->name, PRVM_NUM_FOR_EDICT(ent));
data = PRVM_G_STRING(OFS_PARM1);
// parse the opening brace
- if (!COM_ParseToken_Simple(&data, false, false) || com_token[0] != '{' )
- PRVM_ERROR ("VM_parseentitydata: %s: Couldn't parse entity data:\n%s", PRVM_NAME, data );
+ if (!COM_ParseToken_Simple(&data, false, false, true) || com_token[0] != '{' )
+ prog->error_cmd("VM_parseentitydata: %s: Couldn't parse entity data:\n%s", prog->name, data );
- PRVM_ED_ParseEdict (data, ent);
+ PRVM_ED_ParseEdict (prog, data, ent);
}
/*
loadfromfile(string file)
=========
*/
-void VM_loadfromfile(void)
+void VM_loadfromfile(prvm_prog_t *prog)
{
const char *filename;
char *data;
if (FS_CheckNastyPath(filename, false))
{
PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning("VM_loadfromfile: %s dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", PRVM_NAME, filename);
+ VM_Warning(prog, "VM_loadfromfile: %s dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", prog->name, filename);
return;
}
if (data == NULL)
PRVM_G_FLOAT(OFS_RETURN) = -1;
- PRVM_ED_LoadFromFile(data);
+ PRVM_ED_LoadFromFile(prog, data);
if(data)
Mem_Free(data);
float mod(float val, float m)
=========
*/
-void VM_modulo(void)
+void VM_modulo(prvm_prog_t *prog)
{
- int val, m;
- VM_SAFEPARMCOUNT(2,VM_module);
+ prvm_int_t val, m;
+ VM_SAFEPARMCOUNT(2, VM_modulo);
- val = (int) PRVM_G_FLOAT(OFS_PARM0);
- m = (int) PRVM_G_FLOAT(OFS_PARM1);
+ val = (prvm_int_t) PRVM_G_FLOAT(OFS_PARM0);
+ m = (prvm_int_t) PRVM_G_FLOAT(OFS_PARM1);
- PRVM_G_FLOAT(OFS_RETURN) = (float) (val % m);
+ PRVM_G_FLOAT(OFS_RETURN) = (prvm_vec_t) (val % m);
}
-void VM_Search_Init(void)
+static void VM_Search_Init(prvm_prog_t *prog)
{
int i;
for (i = 0;i < PRVM_MAX_OPENSEARCHES;i++)
prog->opensearches[i] = NULL;
}
-void VM_Search_Reset(void)
+static void VM_Search_Reset(prvm_prog_t *prog)
{
int i;
// reset the fssearch list
=========
VM_search_begin
-float search_begin(string pattern, float caseinsensitive, float quiet)
+float search_begin(string pattern, float caseinsensitive, float quiet[, string packfile])
=========
*/
-void VM_search_begin(void)
+void VM_search_begin(prvm_prog_t *prog)
{
int handle;
- const char *pattern;
+ const char *packfile = NULL, *pattern;
int caseinsens, quiet;
- VM_SAFEPARMCOUNT(3, VM_search_begin);
+ VM_SAFEPARMCOUNTRANGE(3, 4, VM_search_begin);
pattern = PRVM_G_STRING(OFS_PARM0);
- VM_CheckEmptyString(pattern);
+ VM_CheckEmptyString(prog, pattern);
caseinsens = (int)PRVM_G_FLOAT(OFS_PARM1);
quiet = (int)PRVM_G_FLOAT(OFS_PARM2);
+ // optional packfile parameter (DP_QC_FS_SEARCH_PACKFILE)
+ if(prog->argc >= 4)
+ packfile = PRVM_G_STRING(OFS_PARM3);
+
for(handle = 0; handle < PRVM_MAX_OPENSEARCHES; handle++)
if(!prog->opensearches[handle])
break;
if(handle >= PRVM_MAX_OPENSEARCHES)
{
PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_search_begin: %s ran out of search handles (%i)\n", PRVM_NAME, PRVM_MAX_OPENSEARCHES);
+ VM_Warning(prog, "VM_search_begin: %s ran out of search handles (%i)\n", prog->name, PRVM_MAX_OPENSEARCHES);
return;
}
- if(!(prog->opensearches[handle] = FS_Search(pattern,caseinsens, quiet)))
+ if(!(prog->opensearches[handle] = FS_Search(pattern,caseinsens, quiet, packfile)))
PRVM_G_FLOAT(OFS_RETURN) = -1;
else
{
- prog->opensearches_origin[handle] = PRVM_AllocationOrigin();
+ prog->opensearches_origin[handle] = PRVM_AllocationOrigin(prog);
PRVM_G_FLOAT(OFS_RETURN) = handle;
}
}
void search_end(float handle)
=========
*/
-void VM_search_end(void)
+void VM_search_end(prvm_prog_t *prog)
{
int handle;
VM_SAFEPARMCOUNT(1, VM_search_end);
if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
{
- VM_Warning("VM_search_end: invalid handle %i used in %s\n", handle, PRVM_NAME);
+ VM_Warning(prog, "VM_search_end: invalid handle %i used in %s\n", handle, prog->name);
return;
}
if(prog->opensearches[handle] == NULL)
{
- VM_Warning("VM_search_end: no such handle %i in %s\n", handle, PRVM_NAME);
+ VM_Warning(prog, "VM_search_end: no such handle %i in %s\n", handle, prog->name);
return;
}
float search_getsize(float handle)
=========
*/
-void VM_search_getsize(void)
+void VM_search_getsize(prvm_prog_t *prog)
{
int handle;
- VM_SAFEPARMCOUNT(1, VM_M_search_getsize);
+ VM_SAFEPARMCOUNT(1, VM_search_getsize);
handle = (int)PRVM_G_FLOAT(OFS_PARM0);
if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
{
- VM_Warning("VM_search_getsize: invalid handle %i used in %s\n", handle, PRVM_NAME);
+ VM_Warning(prog, "VM_search_getsize: invalid handle %i used in %s\n", handle, prog->name);
return;
}
if(prog->opensearches[handle] == NULL)
{
- VM_Warning("VM_search_getsize: no such handle %i in %s\n", handle, PRVM_NAME);
+ VM_Warning(prog, "VM_search_getsize: no such handle %i in %s\n", handle, prog->name);
return;
}
string search_getfilename(float handle, float num)
=========
*/
-void VM_search_getfilename(void)
+void VM_search_getfilename(prvm_prog_t *prog)
{
int handle, filenum;
VM_SAFEPARMCOUNT(2, VM_search_getfilename);
if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
{
- VM_Warning("VM_search_getfilename: invalid handle %i used in %s\n", handle, PRVM_NAME);
+ VM_Warning(prog, "VM_search_getfilename: invalid handle %i used in %s\n", handle, prog->name);
return;
}
if(prog->opensearches[handle] == NULL)
{
- VM_Warning("VM_search_getfilename: no such handle %i in %s\n", handle, PRVM_NAME);
+ VM_Warning(prog, "VM_search_getfilename: no such handle %i in %s\n", handle, prog->name);
return;
}
if(filenum < 0 || filenum >= prog->opensearches[handle]->numfilenames)
{
- VM_Warning("VM_search_getfilename: invalid filenum %i in %s\n", filenum, PRVM_NAME);
+ VM_Warning(prog, "VM_search_getfilename: invalid filenum %i in %s\n", filenum, prog->name);
return;
}
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog->opensearches[handle]->filenames[filenum]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, prog->opensearches[handle]->filenames[filenum]);
}
/*
string chr(float ascii)
=========
*/
-void VM_chr(void)
+void VM_chr(prvm_prog_t *prog)
{
/*
char tmp[2];
tmp[0] = (unsigned char) PRVM_G_FLOAT(OFS_PARM0);
tmp[1] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(tmp);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, tmp);
*/
char tmp[8];
len = u8_fromchar((Uchar)PRVM_G_FLOAT(OFS_PARM0), tmp, sizeof(tmp));
tmp[len] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(tmp);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, tmp);
}
-//=============================================================================
-// Draw builtins (client & menu)
-
/*
=========
-VM_iscachedpic
+VM_keynumtostring
-float iscachedpic(string pic)
+string keynumtostring(float keynum)
=========
*/
-void VM_iscachedpic(void)
+void VM_keynumtostring (prvm_prog_t *prog)
{
- VM_SAFEPARMCOUNT(1,VM_iscachedpic);
+ char tinystr[2];
+ VM_SAFEPARMCOUNT(1, VM_keynumtostring);
- // drawq hasnt such a function, thus always return true
- PRVM_G_FLOAT(OFS_RETURN) = false;
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Key_KeynumToString((int)PRVM_G_FLOAT(OFS_PARM0), tinystr, sizeof(tinystr)));
}
/*
=========
-VM_precache_pic
+VM_findkeysforcommand
+
+string findkeysforcommand(string command, float bindmap)
-string precache_pic(string pic)
+the returned string is an altstring
=========
*/
-void VM_precache_pic(void)
+#define FKFC_NUMKEYS 5
+void M_FindKeysForCommand(const char *command, int *keys);
+void VM_findkeysforcommand(prvm_prog_t *prog)
{
- const char *s;
+ const char *cmd;
+ char ret[VM_STRINGTEMP_LENGTH];
+ int keys[FKFC_NUMKEYS];
+ int i;
+ int bindmap;
+ char vabuf[1024];
- VM_SAFEPARMCOUNT(1, VM_precache_pic);
+ VM_SAFEPARMCOUNTRANGE(1, 2, VM_findkeysforcommand);
- s = PRVM_G_STRING(OFS_PARM0);
- PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
- VM_CheckEmptyString (s);
+ cmd = PRVM_G_STRING(OFS_PARM0);
+ if(prog->argc == 2)
+ bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
+ else
+ bindmap = 0; // consistent to "bind"
- // AK Draw_CachePic is supposed to always return a valid pointer
- if( Draw_CachePic_Flags(s, 0)->tex == r_texture_notexture )
- PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+ VM_CheckEmptyString(prog, cmd);
+
+ Key_FindKeysForCommand(cmd, keys, FKFC_NUMKEYS, bindmap);
+
+ ret[0] = 0;
+ for(i = 0; i < FKFC_NUMKEYS; i++)
+ strlcat(ret, va(vabuf, sizeof(vabuf), " \'%i\'", keys[i]), sizeof(ret));
+
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, ret);
}
/*
=========
-VM_freepic
+VM_stringtokeynum
-freepic(string s)
+float stringtokeynum(string key)
=========
*/
-void VM_freepic(void)
-{
- const char *s;
-
- VM_SAFEPARMCOUNT(1,VM_freepic);
-
- s = PRVM_G_STRING(OFS_PARM0);
- VM_CheckEmptyString (s);
-
- Draw_FreePic(s);
-}
-
-void getdrawfontscale(float *sx, float *sy)
+void VM_stringtokeynum (prvm_prog_t *prog)
{
- vec3_t v;
- *sx = *sy = 1;
- VectorCopy(PRVM_drawglobalvector(drawfontscale), v);
- if(VectorLength2(v) > 0)
- {
- *sx = v[0];
- *sy = v[1];
- }
-}
+ VM_SAFEPARMCOUNT( 1, VM_stringtokeynum );
-dp_font_t *getdrawfont(void)
-{
- int f = (int) PRVM_drawglobalfloat(drawfont);
- if(f < 0 || f >= dp_fonts.maxsize)
- return FONT_DEFAULT;
- return &dp_fonts.f[f];
+ PRVM_G_FLOAT(OFS_RETURN) = Key_StringToKeynum(PRVM_G_STRING(OFS_PARM0));
}
/*
=========
-VM_drawcharacter
+VM_getkeybind
-float drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag)
+string getkeybind(float key, float bindmap)
=========
*/
-void VM_drawcharacter(void)
+void VM_getkeybind (prvm_prog_t *prog)
{
- float *pos,*scale,*rgb;
- char character;
- int flag;
- float sx, sy;
- VM_SAFEPARMCOUNT(6,VM_drawcharacter);
-
- character = (char) PRVM_G_FLOAT(OFS_PARM1);
- if(character == 0)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -1;
- VM_Warning("VM_drawcharacter: %s passed null character !\n",PRVM_NAME);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- flag = (int)PRVM_G_FLOAT(OFS_PARM5);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_drawcharacter: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
- return;
- }
-
- if(pos[2] || scale[2])
- Con_Printf("VM_drawcharacter: z value%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
-
- if(!scale[0] || !scale[1])
- {
- PRVM_G_FLOAT(OFS_RETURN) = -3;
- VM_Warning("VM_drawcharacter: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
- return;
- }
+ int bindmap;
+ VM_SAFEPARMCOUNTRANGE(1, 2, VM_getkeybind);
+ if(prog->argc == 2)
+ bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
+ else
+ bindmap = 0; // consistent to "bind"
- getdrawfontscale(&sx, &sy);
- DrawQ_String_Scale(pos[0], pos[1], &character, 1, scale[0], scale[1], sx, sy, rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag, NULL, true, getdrawfont());
- PRVM_G_FLOAT(OFS_RETURN) = 1;
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Key_GetBind((int)PRVM_G_FLOAT(OFS_PARM0), bindmap));
}
/*
=========
-VM_drawstring
+VM_setkeybind
-float drawstring(vector position, string text, vector scale, vector rgb, float alpha[, float flag])
+float setkeybind(float key, string cmd, float bindmap)
=========
*/
-void VM_drawstring(void)
+void VM_setkeybind (prvm_prog_t *prog)
{
- float *pos,*scale,*rgb;
- const char *string;
- int flag = 0;
- float sx, sy;
- VM_SAFEPARMCOUNTRANGE(5,6,VM_drawstring);
-
- string = PRVM_G_STRING(OFS_PARM1);
- pos = PRVM_G_VECTOR(OFS_PARM0);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- if (prog->argc >= 6)
- flag = (int)PRVM_G_FLOAT(OFS_PARM5);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
- return;
- }
-
- if(!scale[0] || !scale[1])
- {
- PRVM_G_FLOAT(OFS_RETURN) = -3;
- VM_Warning("VM_drawstring: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
- return;
- }
-
- if(pos[2] || scale[2])
- Con_Printf("VM_drawstring: z value%s from %s discarded\n",(pos[2] && scale[2]) ? "s" : " ",((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
+ int bindmap;
+ VM_SAFEPARMCOUNTRANGE(2, 3, VM_setkeybind);
+ if(prog->argc == 3)
+ bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM2), MAX_BINDMAPS-1);
+ else
+ bindmap = 0; // consistent to "bind"
- getdrawfontscale(&sx, &sy);
- DrawQ_String_Scale(pos[0], pos[1], string, 0, scale[0], scale[1], sx, sy, rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag, NULL, true, getdrawfont());
- //Font_DrawString(pos[0], pos[1], string, 0, scale[0], scale[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag, NULL, true);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ if(Key_SetBinding((int)PRVM_G_FLOAT(OFS_PARM0), bindmap, PRVM_G_STRING(OFS_PARM1)))
+ PRVM_G_FLOAT(OFS_RETURN) = 1;
}
/*
=========
-VM_drawcolorcodedstring
+VM_getbindmap
-float drawcolorcodedstring(vector position, string text, vector scale, float alpha, float flag)
-/
-float drawcolorcodedstring(vector position, string text, vector scale, vector rgb, float alpha, float flag)
+vector getbindmaps()
=========
*/
-void VM_drawcolorcodedstring(void)
+void VM_getbindmaps (prvm_prog_t *prog)
{
- float *pos, *scale;
- const char *string;
- int flag;
- vec3_t rgb;
- float sx, sy, alpha;
-
- VM_SAFEPARMCOUNTRANGE(5,6,VM_drawcolorcodedstring);
-
- if (prog->argc == 6) // full 6 parms, like normal drawstring
- {
- pos = PRVM_G_VECTOR(OFS_PARM0);
- string = PRVM_G_STRING(OFS_PARM1);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- VectorCopy(PRVM_G_VECTOR(OFS_PARM3), rgb);
- alpha = PRVM_G_FLOAT(OFS_PARM4);
- flag = (int)PRVM_G_FLOAT(OFS_PARM5);
- }
- else
- {
- pos = PRVM_G_VECTOR(OFS_PARM0);
- string = PRVM_G_STRING(OFS_PARM1);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- rgb[0] = 1.0;
- rgb[1] = 1.0;
- rgb[2] = 1.0;
- alpha = PRVM_G_FLOAT(OFS_PARM3);
- flag = (int)PRVM_G_FLOAT(OFS_PARM4);
- }
-
- if(flag < DRAWFLAG_NORMAL || flag >= DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_drawcolorcodedstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
- return;
- }
-
- if(!scale[0] || !scale[1])
- {
- PRVM_G_FLOAT(OFS_RETURN) = -3;
- VM_Warning("VM_drawcolorcodedstring: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
- return;
- }
-
- if(pos[2] || scale[2])
- Con_Printf("VM_drawcolorcodedstring: z value%s from %s discarded\n",(pos[2] && scale[2]) ? "s" : " ",((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
-
- getdrawfontscale(&sx, &sy);
- DrawQ_String_Scale(pos[0], pos[1], string, 0, scale[0], scale[1], sx, sy, rgb[0], rgb[1], rgb[2], alpha, flag, NULL, false, getdrawfont());
- if (prog->argc == 6) // also return vector of last color
- VectorCopy(DrawQ_Color, PRVM_G_VECTOR(OFS_RETURN));
- else
- PRVM_G_FLOAT(OFS_RETURN) = 1;
+ int fg, bg;
+ VM_SAFEPARMCOUNT(0, VM_getbindmaps);
+ Key_GetBindMap(&fg, &bg);
+ PRVM_G_VECTOR(OFS_RETURN)[0] = fg;
+ PRVM_G_VECTOR(OFS_RETURN)[1] = bg;
+ PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
}
+
/*
=========
-VM_stringwidth
+VM_setbindmap
-float stringwidth(string text, float allowColorCodes, float size)
+float setbindmaps(vector bindmap)
=========
*/
-void VM_stringwidth(void)
+void VM_setbindmaps (prvm_prog_t *prog)
{
- const char *string;
- float *szv;
- float mult; // sz is intended font size so we can later add freetype support, mult is font size multiplier in pixels per character cell
- int colors;
- float sx, sy;
- size_t maxlen = 0;
- VM_SAFEPARMCOUNTRANGE(2,3,VM_drawstring);
-
- getdrawfontscale(&sx, &sy);
- if(prog->argc == 3)
- {
- szv = PRVM_G_VECTOR(OFS_PARM2);
- mult = 1;
- }
- else
- {
- // we want the width for 8x8 font size, divided by 8
- static float defsize[] = {8, 8};
- szv = defsize;
- mult = 0.125;
- // to make sure snapping is turned off, ALWAYS use a nontrivial scale in this case
- if(sx >= 0.9 && sx <= 1.1)
- {
- mult *= 2;
- sx /= 2;
- sy /= 2;
- }
- }
-
- string = PRVM_G_STRING(OFS_PARM0);
- colors = (int)PRVM_G_FLOAT(OFS_PARM1);
+ VM_SAFEPARMCOUNT(1, VM_setbindmaps);
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ if(PRVM_G_VECTOR(OFS_PARM0)[2] == 0)
+ if(Key_SetBindMap((int)PRVM_G_VECTOR(OFS_PARM0)[0], (int)PRVM_G_VECTOR(OFS_PARM0)[1]))
+ PRVM_G_FLOAT(OFS_RETURN) = 1;
+}
- PRVM_G_FLOAT(OFS_RETURN) = DrawQ_TextWidth_UntilWidth_TrackColors_Scale(string, &maxlen, szv[0], szv[1], sx, sy, NULL, !colors, getdrawfont(), 1000000000) * mult;
/*
- if(prog->argc == 3)
- {
- mult = sz = PRVM_G_FLOAT(OFS_PARM2);
- }
- else
- {
- sz = 8;
- mult = 1;
- }
-
- string = PRVM_G_STRING(OFS_PARM0);
- colors = (int)PRVM_G_FLOAT(OFS_PARM1);
+========================
+VM_gecko_create
- PRVM_G_FLOAT(OFS_RETURN) = DrawQ_TextWidth(string, 0, !colors, getdrawfont()) * mult; // 1x1 characters, don't actually draw
+float[bool] gecko_create( string name )
+========================
*/
+void VM_gecko_create(prvm_prog_t *prog) {
+ // REMOVED
+ PRVM_G_FLOAT( OFS_RETURN ) = 0;
}
/*
-=========
-VM_findfont
+========================
+VM_gecko_destroy
-float findfont(string s)
-=========
+void gecko_destroy( string name )
+========================
*/
-
-float getdrawfontnum(const char *fontname)
-{
- int i;
-
- for(i = 0; i < dp_fonts.maxsize; ++i)
- if(!strcmp(dp_fonts.f[i].title, fontname))
- return i;
- return -1;
-}
-
-void VM_findfont(void)
-{
- VM_SAFEPARMCOUNT(1,VM_findfont);
- PRVM_G_FLOAT(OFS_RETURN) = getdrawfontnum(PRVM_G_STRING(OFS_PARM0));
+void VM_gecko_destroy(prvm_prog_t *prog) {
+ // REMOVED
}
/*
-=========
-VM_loadfont
+========================
+VM_gecko_navigate
-float loadfont(string fontname, string fontmaps, string sizes, float slot)
-=========
+void gecko_navigate( string name, string URI )
+========================
*/
+void VM_gecko_navigate(prvm_prog_t *prog) {
+ // REMOVED
+}
-dp_font_t *FindFont(const char *title, qboolean allocate_new);
-void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale, float voffset);
-void VM_loadfont(void)
-{
- const char *fontname, *filelist, *sizes, *c, *cm;
- char mainfont[MAX_QPATH];
- int i, numsizes;
- float sz, scale, voffset;
- dp_font_t *f;
-
- VM_SAFEPARMCOUNTRANGE(3,6,VM_loadfont);
-
- fontname = PRVM_G_STRING(OFS_PARM0);
- if (!fontname[0])
- fontname = "default";
-
- filelist = PRVM_G_STRING(OFS_PARM1);
- if (!filelist[0])
- filelist = "gfx/conchars";
-
- sizes = PRVM_G_STRING(OFS_PARM2);
- if (!sizes[0])
- sizes = "10";
-
- // find a font
- f = NULL;
- if (prog->argc >= 4)
- {
- i = PRVM_G_FLOAT(OFS_PARM3);
- if (i >= 0 && i < dp_fonts.maxsize)
- {
- f = &dp_fonts.f[i];
- strlcpy(f->title, fontname, sizeof(f->title)); // replace name
- }
- }
- if (!f)
- f = FindFont(fontname, true);
- if (!f)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -1;
- return; // something go wrong
- }
-
- memset(f->fallbacks, 0, sizeof(f->fallbacks));
- memset(f->fallback_faces, 0, sizeof(f->fallback_faces));
-
- // first font is handled "normally"
- c = strchr(filelist, ':');
- cm = strchr(filelist, ',');
- if(c && (!cm || c < cm))
- f->req_face = atoi(c+1);
- else
- {
- f->req_face = 0;
- c = cm;
- }
- if(!c || (c - filelist) > MAX_QPATH)
- strlcpy(mainfont, filelist, sizeof(mainfont));
- else
- {
- memcpy(mainfont, filelist, c - filelist);
- mainfont[c - filelist] = 0;
- }
-
- // handle fallbacks
- for(i = 0; i < MAX_FONT_FALLBACKS; ++i)
- {
- c = strchr(filelist, ',');
- if(!c)
- break;
- filelist = c + 1;
- if(!*filelist)
- break;
- c = strchr(filelist, ':');
- cm = strchr(filelist, ',');
- if(c && (!cm || c < cm))
- f->fallback_faces[i] = atoi(c+1);
- else
- {
- f->fallback_faces[i] = 0; // f->req_face; could make it stick to the default-font's face index
- c = cm;
- }
- if(!c || (c-filelist) > MAX_QPATH)
- {
- strlcpy(f->fallbacks[i], filelist, sizeof(mainfont));
- }
- else
- {
- memcpy(f->fallbacks[i], filelist, c - filelist);
- f->fallbacks[i][c - filelist] = 0;
- }
- }
-
- // handle sizes
- for(i = 0; i < MAX_FONT_SIZES; ++i)
- f->req_sizes[i] = -1;
- for (numsizes = 0,c = sizes;;)
- {
- if (!COM_ParseToken_VM_Tokenize(&c, 0))
- break;
- sz = atof(com_token);
- // detect crap size
- if (sz < 0.001f || sz > 1000.0f)
- {
- VM_Warning("VM_loadfont: crap size %s", com_token);
- continue;
- }
- // check overflow
- if (numsizes == MAX_FONT_SIZES)
- {
- VM_Warning("VM_loadfont: MAX_FONT_SIZES = %i exceeded", MAX_FONT_SIZES);
- break;
- }
- f->req_sizes[numsizes] = sz;
- numsizes++;
- }
-
- // additional scale/hoffset parms
- scale = 1;
- voffset = 0;
- if (prog->argc >= 5)
- {
- scale = PRVM_G_FLOAT(OFS_PARM4);
- if (scale <= 0)
- scale = 1;
- }
- if (prog->argc >= 6)
- voffset = PRVM_G_FLOAT(OFS_PARM5);
-
- // load
- LoadFont(true, mainfont, f, scale, voffset);
-
- // return index of loaded font
- PRVM_G_FLOAT(OFS_RETURN) = (f - dp_fonts.f);
-}
-
-/*
-=========
-VM_drawpic
-
-float drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawpic(void)
-{
- const char *picname;
- float *size, *pos, *rgb;
- int flag = 0;
-
- VM_SAFEPARMCOUNTRANGE(5,6,VM_drawpic);
-
- picname = PRVM_G_STRING(OFS_PARM1);
- VM_CheckEmptyString (picname);
-
- // is pic cached ? no function yet for that
- if(!1)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning("VM_drawpic: %s: %s not cached !\n", PRVM_NAME, picname);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- if (prog->argc >= 6)
- flag = (int) PRVM_G_FLOAT(OFS_PARM5);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_drawpic: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
- return;
- }
-
- if(pos[2] || size[2])
- Con_Printf("VM_drawpic: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
-
- DrawQ_Pic(pos[0], pos[1], Draw_CachePic_Flags (picname, CACHEPICFLAG_NOTPERSISTENT), size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-/*
-=========
-VM_drawrotpic
-
-float drawrotpic(vector position, string pic, vector size, vector org, float angle, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawrotpic(void)
-{
- const char *picname;
- float *size, *pos, *org, *rgb;
- int flag;
-
- VM_SAFEPARMCOUNT(8,VM_drawrotpic);
-
- picname = PRVM_G_STRING(OFS_PARM1);
- VM_CheckEmptyString (picname);
-
- // is pic cached ? no function yet for that
- if(!1)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning("VM_drawrotpic: %s: %s not cached !\n", PRVM_NAME, picname);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM2);
- org = PRVM_G_VECTOR(OFS_PARM3);
- rgb = PRVM_G_VECTOR(OFS_PARM5);
- flag = (int) PRVM_G_FLOAT(OFS_PARM7);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_drawrotpic: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
- return;
- }
-
- if(pos[2] || size[2] || org[2])
- Con_Printf("VM_drawrotpic: z value from pos/size/org discarded\n");
-
- DrawQ_RotPic(pos[0], pos[1], Draw_CachePic_Flags(picname, CACHEPICFLAG_NOTPERSISTENT), size[0], size[1], org[0], org[1], PRVM_G_FLOAT(OFS_PARM4), rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM6), flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-/*
-=========
-VM_drawsubpic
-
-float drawsubpic(vector position, vector size, string pic, vector srcPos, vector srcSize, vector rgb, float alpha, float flag)
-
-=========
-*/
-void VM_drawsubpic(void)
-{
- const char *picname;
- float *size, *pos, *rgb, *srcPos, *srcSize, alpha;
- int flag;
-
- VM_SAFEPARMCOUNT(8,VM_drawsubpic);
-
- picname = PRVM_G_STRING(OFS_PARM2);
- VM_CheckEmptyString (picname);
-
- // is pic cached ? no function yet for that
- if(!1)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning("VM_drawsubpic: %s: %s not cached !\n", PRVM_NAME, picname);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM1);
- srcPos = PRVM_G_VECTOR(OFS_PARM3);
- srcSize = PRVM_G_VECTOR(OFS_PARM4);
- rgb = PRVM_G_VECTOR(OFS_PARM5);
- alpha = PRVM_G_FLOAT(OFS_PARM6);
- flag = (int) PRVM_G_FLOAT(OFS_PARM7);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_drawsubpic: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
- return;
- }
-
- if(pos[2] || size[2])
- Con_Printf("VM_drawsubpic: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
-
- DrawQ_SuperPic(pos[0], pos[1], Draw_CachePic_Flags (picname, CACHEPICFLAG_NOTPERSISTENT),
- size[0], size[1],
- srcPos[0], srcPos[1], rgb[0], rgb[1], rgb[2], alpha,
- srcPos[0] + srcSize[0], srcPos[1], rgb[0], rgb[1], rgb[2], alpha,
- srcPos[0], srcPos[1] + srcSize[1], rgb[0], rgb[1], rgb[2], alpha,
- srcPos[0] + srcSize[0], srcPos[1] + srcSize[1], rgb[0], rgb[1], rgb[2], alpha,
- flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-/*
-=========
-VM_drawfill
-
-float drawfill(vector position, vector size, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawfill(void)
-{
- float *size, *pos, *rgb;
- int flag;
-
- VM_SAFEPARMCOUNT(5,VM_drawfill);
-
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM1);
- rgb = PRVM_G_VECTOR(OFS_PARM2);
- flag = (int) PRVM_G_FLOAT(OFS_PARM4);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning("VM_drawfill: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
- return;
- }
-
- if(pos[2] || size[2])
- Con_Printf("VM_drawfill: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
-
- DrawQ_Fill(pos[0], pos[1], size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-/*
-=========
-VM_drawsetcliparea
-
-drawsetcliparea(float x, float y, float width, float height)
-=========
-*/
-void VM_drawsetcliparea(void)
-{
- float x,y,w,h;
- VM_SAFEPARMCOUNT(4,VM_drawsetcliparea);
-
- x = bound(0, PRVM_G_FLOAT(OFS_PARM0), vid_conwidth.integer);
- y = bound(0, PRVM_G_FLOAT(OFS_PARM1), vid_conheight.integer);
- w = bound(0, PRVM_G_FLOAT(OFS_PARM2) + PRVM_G_FLOAT(OFS_PARM0) - x, (vid_conwidth.integer - x));
- h = bound(0, PRVM_G_FLOAT(OFS_PARM3) + PRVM_G_FLOAT(OFS_PARM1) - y, (vid_conheight.integer - y));
-
- DrawQ_SetClipArea(x, y, w, h);
-}
-
-/*
-=========
-VM_drawresetcliparea
-
-drawresetcliparea()
-=========
-*/
-void VM_drawresetcliparea(void)
-{
- VM_SAFEPARMCOUNT(0,VM_drawresetcliparea);
-
- DrawQ_ResetClipArea();
-}
-
-/*
-=========
-VM_getimagesize
-
-vector getimagesize(string pic)
-=========
-*/
-void VM_getimagesize(void)
-{
- const char *p;
- cachepic_t *pic;
-
- VM_SAFEPARMCOUNT(1,VM_getimagesize);
-
- p = PRVM_G_STRING(OFS_PARM0);
- VM_CheckEmptyString (p);
-
- pic = Draw_CachePic_Flags (p, CACHEPICFLAG_NOTPERSISTENT);
-
- PRVM_G_VECTOR(OFS_RETURN)[0] = pic->width;
- PRVM_G_VECTOR(OFS_RETURN)[1] = pic->height;
- PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
-}
-
-/*
-=========
-VM_keynumtostring
-
-string keynumtostring(float keynum)
-=========
-*/
-void VM_keynumtostring (void)
-{
- VM_SAFEPARMCOUNT(1, VM_keynumtostring);
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Key_KeynumToString((int)PRVM_G_FLOAT(OFS_PARM0)));
-}
-
-/*
-=========
-VM_findkeysforcommand
-
-string findkeysforcommand(string command, float bindmap)
-
-the returned string is an altstring
-=========
-*/
-#define FKFC_NUMKEYS 5
-void M_FindKeysForCommand(const char *command, int *keys);
-void VM_findkeysforcommand(void)
-{
- const char *cmd;
- char ret[VM_STRINGTEMP_LENGTH];
- int keys[FKFC_NUMKEYS];
- int i;
- int bindmap;
-
- VM_SAFEPARMCOUNTRANGE(1, 2, VM_findkeysforcommand);
-
- cmd = PRVM_G_STRING(OFS_PARM0);
- if(prog->argc == 2)
- bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
- else
- bindmap = 0; // consistent to "bind"
-
- VM_CheckEmptyString(cmd);
-
- Key_FindKeysForCommand(cmd, keys, FKFC_NUMKEYS, bindmap);
-
- ret[0] = 0;
- for(i = 0; i < FKFC_NUMKEYS; i++)
- strlcat(ret, va(" \'%i\'", keys[i]), sizeof(ret));
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(ret);
-}
-
-/*
-=========
-VM_stringtokeynum
-
-float stringtokeynum(string key)
-=========
-*/
-void VM_stringtokeynum (void)
-{
- VM_SAFEPARMCOUNT( 1, VM_keynumtostring );
-
- PRVM_G_FLOAT(OFS_RETURN) = Key_StringToKeynum(PRVM_G_STRING(OFS_PARM0));
-}
-
-/*
-=========
-VM_getkeybind
-
-string getkeybind(float key, float bindmap)
-=========
-*/
-void VM_getkeybind (void)
-{
- int bindmap;
- VM_SAFEPARMCOUNTRANGE(1, 2, VM_CL_getkeybind);
- if(prog->argc == 2)
- bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
- else
- bindmap = 0; // consistent to "bind"
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Key_GetBind((int)PRVM_G_FLOAT(OFS_PARM0), bindmap));
-}
-
-/*
-=========
-VM_setkeybind
-
-float setkeybind(float key, string cmd, float bindmap)
-=========
-*/
-void VM_setkeybind (void)
-{
- int bindmap;
- VM_SAFEPARMCOUNTRANGE(2, 3, VM_CL_setkeybind);
- if(prog->argc == 3)
- bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM2), MAX_BINDMAPS-1);
- else
- bindmap = 0; // consistent to "bind"
-
- PRVM_G_FLOAT(OFS_RETURN) = 0;
- if(Key_SetBinding((int)PRVM_G_FLOAT(OFS_PARM0), bindmap, PRVM_G_STRING(OFS_PARM1)))
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-/*
-=========
-VM_getbindmap
-
-vector getbindmaps()
-=========
-*/
-void VM_getbindmaps (void)
-{
- int fg, bg;
- VM_SAFEPARMCOUNT(0, VM_CL_getbindmap);
- Key_GetBindMap(&fg, &bg);
- PRVM_G_VECTOR(OFS_RETURN)[0] = fg;
- PRVM_G_VECTOR(OFS_RETURN)[1] = bg;
- PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
-}
-
-/*
-=========
-VM_setbindmap
-
-float setbindmaps(vector bindmap)
-=========
-*/
-void VM_setbindmaps (void)
-{
- VM_SAFEPARMCOUNT(1, VM_CL_setbindmap);
- PRVM_G_FLOAT(OFS_RETURN) = 0;
- if(PRVM_G_VECTOR(OFS_PARM0)[2] == 0)
- if(Key_SetBindMap((int)PRVM_G_VECTOR(OFS_PARM0)[0], (int)PRVM_G_VECTOR(OFS_PARM0)[1]))
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-// CL_Video interface functions
-
-/*
-========================
-VM_cin_open
-
-float cin_open(string file, string name)
-========================
-*/
-void VM_cin_open( void )
-{
- const char *file;
- const char *name;
-
- VM_SAFEPARMCOUNT( 2, VM_cin_open );
-
- file = PRVM_G_STRING( OFS_PARM0 );
- name = PRVM_G_STRING( OFS_PARM1 );
-
- VM_CheckEmptyString( file );
- VM_CheckEmptyString( name );
-
- if( CL_OpenVideo( file, name, MENUOWNER, "" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = 1;
- else
- PRVM_G_FLOAT( OFS_RETURN ) = 0;
-}
-
-/*
-========================
-VM_cin_close
-
-void cin_close(string name)
-========================
-*/
-void VM_cin_close( void )
-{
- const char *name;
-
- VM_SAFEPARMCOUNT( 1, VM_cin_close );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString( name );
-
- CL_CloseVideo( CL_GetVideoByName( name ) );
-}
-
-/*
-========================
-VM_cin_setstate
-void cin_setstate(string name, float type)
-========================
-*/
-void VM_cin_setstate( void )
-{
- const char *name;
- clvideostate_t state;
- clvideo_t *video;
-
- VM_SAFEPARMCOUNT( 2, VM_cin_netstate );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString( name );
-
- state = (clvideostate_t)((int)PRVM_G_FLOAT( OFS_PARM1 ));
-
- video = CL_GetVideoByName( name );
- if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT )
- CL_SetVideoState( video, state );
-}
-
-/*
-========================
-VM_cin_getstate
-
-float cin_getstate(string name)
-========================
-*/
-void VM_cin_getstate( void )
-{
- const char *name;
- clvideo_t *video;
-
- VM_SAFEPARMCOUNT( 1, VM_cin_getstate );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString( name );
-
- video = CL_GetVideoByName( name );
- if( video )
- PRVM_G_FLOAT( OFS_RETURN ) = (int)video->state;
- else
- PRVM_G_FLOAT( OFS_RETURN ) = 0;
-}
-
-/*
-========================
-VM_cin_restart
-
-void cin_restart(string name)
-========================
-*/
-void VM_cin_restart( void )
-{
- const char *name;
- clvideo_t *video;
-
- VM_SAFEPARMCOUNT( 1, VM_cin_restart );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString( name );
-
- video = CL_GetVideoByName( name );
- if( video )
- CL_RestartVideo( video );
-}
-
-/*
-========================
-VM_Gecko_Init
-========================
-*/
-void VM_Gecko_Init( void ) {
- // REMOVED
-}
-
-/*
-========================
-VM_Gecko_Destroy
-========================
-*/
-void VM_Gecko_Destroy( void ) {
- // REMOVED
-}
-
-/*
-========================
-VM_gecko_create
-
-float[bool] gecko_create( string name )
-========================
-*/
-void VM_gecko_create( void ) {
- // REMOVED
- PRVM_G_FLOAT( OFS_RETURN ) = 0;
-}
-
-/*
-========================
-VM_gecko_destroy
-
-void gecko_destroy( string name )
-========================
-*/
-void VM_gecko_destroy( void ) {
- // REMOVED
-}
-
-/*
-========================
-VM_gecko_navigate
-
-void gecko_navigate( string name, string URI )
-========================
-*/
-void VM_gecko_navigate( void ) {
- // REMOVED
-}
-
-/*
-========================
-VM_gecko_keyevent
+/*
+========================
+VM_gecko_keyevent
float[bool] gecko_keyevent( string name, float key, float eventtype )
========================
*/
-void VM_gecko_keyevent( void ) {
+void VM_gecko_keyevent(prvm_prog_t *prog) {
// REMOVED
PRVM_G_FLOAT( OFS_RETURN ) = 0;
}
void gecko_mousemove( string name, float x, float y )
========================
*/
-void VM_gecko_movemouse( void ) {
+void VM_gecko_movemouse(prvm_prog_t *prog) {
// REMOVED
}
void gecko_resize( string name, float w, float h )
========================
*/
-void VM_gecko_resize( void ) {
+void VM_gecko_resize(prvm_prog_t *prog) {
// REMOVED
}
vector gecko_get_texture_extent( string name )
========================
*/
-void VM_gecko_get_texture_extent( void ) {
+void VM_gecko_get_texture_extent(prvm_prog_t *prog) {
// REMOVED
PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
void makevectors(vector angle)
==============
*/
-void VM_makevectors (void)
+void VM_makevectors (prvm_prog_t *prog)
{
+ vec3_t angles, forward, right, up;
VM_SAFEPARMCOUNT(1, VM_makevectors);
- AngleVectors(PRVM_G_VECTOR(OFS_PARM0), PRVM_gameglobalvector(v_forward), PRVM_gameglobalvector(v_right), PRVM_gameglobalvector(v_up));
+ VectorCopy(PRVM_G_VECTOR(OFS_PARM0), angles);
+ AngleVectors(angles, forward, right, up);
+ VectorCopy(forward, PRVM_gameglobalvector(v_forward));
+ VectorCopy(right, PRVM_gameglobalvector(v_right));
+ VectorCopy(up, PRVM_gameglobalvector(v_up));
}
/*
vectorvectors(vector)
==============
*/
-void VM_vectorvectors (void)
+void VM_vectorvectors (prvm_prog_t *prog)
{
+ vec3_t forward, right, up;
VM_SAFEPARMCOUNT(1, VM_vectorvectors);
- VectorNormalize2(PRVM_G_VECTOR(OFS_PARM0), PRVM_gameglobalvector(v_forward));
- VectorVectors(PRVM_gameglobalvector(v_forward), PRVM_gameglobalvector(v_right), PRVM_gameglobalvector(v_up));
-}
-
-/*
-========================
-VM_drawline
-
-void drawline(float width, vector pos1, vector pos2, vector rgb, float alpha, float flags)
-========================
-*/
-void VM_drawline (void)
-{
- float *c1, *c2, *rgb;
- float alpha, width;
- unsigned char flags;
-
- VM_SAFEPARMCOUNT(6, VM_drawline);
- width = PRVM_G_FLOAT(OFS_PARM0);
- c1 = PRVM_G_VECTOR(OFS_PARM1);
- c2 = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- alpha = PRVM_G_FLOAT(OFS_PARM4);
- flags = (int)PRVM_G_FLOAT(OFS_PARM5);
- DrawQ_Line(width, c1[0], c1[1], c2[0], c2[1], rgb[0], rgb[1], rgb[2], alpha, flags);
+ VectorNormalize2(PRVM_G_VECTOR(OFS_PARM0), forward);
+ VectorVectors(forward, right, up);
+ VectorCopy(forward, PRVM_gameglobalvector(v_forward));
+ VectorCopy(right, PRVM_gameglobalvector(v_right));
+ VectorCopy(up, PRVM_gameglobalvector(v_up));
}
// float(float number, float quantity) bitshift (EXT_BITSHIFT)
-void VM_bitshift (void)
+void VM_bitshift (prvm_prog_t *prog)
{
- int n1, n2;
+ prvm_int_t n1, n2;
VM_SAFEPARMCOUNT(2, VM_bitshift);
- n1 = (int)fabs((float)((int)PRVM_G_FLOAT(OFS_PARM0)));
- n2 = (int)PRVM_G_FLOAT(OFS_PARM1);
+ n1 = (prvm_int_t)fabs((prvm_vec_t)((prvm_int_t)PRVM_G_FLOAT(OFS_PARM0)));
+ n2 = (prvm_int_t)PRVM_G_FLOAT(OFS_PARM1);
if(!n1)
PRVM_G_FLOAT(OFS_RETURN) = n1;
else
float altstr_count(string)
========================
*/
-void VM_altstr_count( void )
+void VM_altstr_count(prvm_prog_t *prog)
{
const char *altstr, *pos;
int count;
VM_SAFEPARMCOUNT( 1, VM_altstr_count );
altstr = PRVM_G_STRING( OFS_PARM0 );
- //VM_CheckEmptyString( altstr );
+ //VM_CheckEmptyString(prog, altstr );
for( count = 0, pos = altstr ; *pos ; pos++ ) {
if( *pos == '\\' ) {
}
}
- PRVM_G_FLOAT( OFS_RETURN ) = (float) (count / 2);
+ PRVM_G_FLOAT( OFS_RETURN ) = (prvm_vec_t) (count / 2);
}
/*
string altstr_prepare(string)
========================
*/
-void VM_altstr_prepare( void )
+void VM_altstr_prepare(prvm_prog_t *prog)
{
- char *out;
const char *instr, *in;
- int size;
char outstr[VM_STRINGTEMP_LENGTH];
+ size_t outpos;
VM_SAFEPARMCOUNT( 1, VM_altstr_prepare );
instr = PRVM_G_STRING( OFS_PARM0 );
- for( out = outstr, in = instr, size = sizeof(outstr) - 1 ; size && *in ; size--, in++, out++ )
- if( *in == '\'' ) {
- *out++ = '\\';
- *out = '\'';
- size--;
- } else
- *out = *in;
- *out = 0;
+ for (in = instr, outpos = 0; *in && outpos < sizeof(outstr) - 1; ++in)
+ {
+ if (*in == '\'' && outpos < sizeof(outstr) - 2)
+ {
+ outstr[outpos++] = '\\';
+ outstr[outpos++] = '\'';
+ }
+ else
+ outstr[outpos++] = *in;
+ }
+ outstr[outpos] = 0;
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
}
/*
string altstr_get(string, float)
========================
*/
-void VM_altstr_get( void )
+void VM_altstr_get(prvm_prog_t *prog)
{
const char *altstr, *pos;
char *out;
*out = *pos;
*out = 0;
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
}
/*
string altstr_set(string altstr, float num, string set)
========================
*/
-void VM_altstr_set( void )
+void VM_altstr_set(prvm_prog_t *prog)
{
int num;
const char *altstr, *str;
break;
strlcpy(out, in, outstr + sizeof(outstr) - out);
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
}
/*
string altstr_ins(string altstr, float num, string set)
========================
*/
-void VM_altstr_ins(void)
+void VM_altstr_ins(prvm_prog_t *prog)
{
int num;
const char *set;
*out++ = '\'';
strlcpy(out, in, outstr + sizeof(outstr) - out);
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
}
static size_t stringbuffers_sortlength;
-static void BufStr_Expand(prvm_stringbuffer_t *stringbuffer, int strindex)
+static void BufStr_Expand(prvm_prog_t *prog, prvm_stringbuffer_t *stringbuffer, int strindex)
{
if (stringbuffer->max_strings <= strindex)
{
}
}
-static void BufStr_Shrink(prvm_stringbuffer_t *stringbuffer)
+static void BufStr_Shrink(prvm_prog_t *prog, prvm_stringbuffer_t *stringbuffer)
{
// reduce num_strings if there are empty string slots at the end
while (stringbuffer->num_strings > 0 && stringbuffer->strings[stringbuffer->num_strings - 1] == NULL)
stringbuffer->num_strings--;
- // if empty, free the string pointer array
- if (stringbuffer->num_strings == 0)
+ // if empty, free the string pointer array
+ if (stringbuffer->num_strings == 0)
+ {
+ stringbuffer->max_strings = 0;
+ if (stringbuffer->strings)
+ Mem_Free(stringbuffer->strings);
+ stringbuffer->strings = NULL;
+ }
+}
+
+static int BufStr_SortStringsUP (const void *in1, const void *in2)
+{
+ const char *a, *b;
+ a = *((const char **) in1);
+ b = *((const char **) in2);
+ if(!a || !a[0]) return 1;
+ if(!b || !b[0]) return -1;
+ return strncmp(a, b, stringbuffers_sortlength);
+}
+
+static int BufStr_SortStringsDOWN (const void *in1, const void *in2)
+{
+ const char *a, *b;
+ a = *((const char **) in1);
+ b = *((const char **) in2);
+ if(!a || !a[0]) return 1;
+ if(!b || !b[0]) return -1;
+ return strncmp(b, a, stringbuffers_sortlength);
+}
+
+prvm_stringbuffer_t *BufStr_FindCreateReplace (prvm_prog_t *prog, int bufindex, int flags, const char *format)
+{
+ prvm_stringbuffer_t *stringbuffer;
+ int i;
+
+ if (bufindex < 0)
+ return NULL;
+
+ // find buffer with wanted index
+ if (bufindex < (int)Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray))
+ {
+ if ( (stringbuffer = (prvm_stringbuffer_t*) Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, bufindex)) )
+ {
+ if (stringbuffer->flags & STRINGBUFFER_TEMP)
+ stringbuffer->flags = flags; // created but has not been used yet
+ return stringbuffer;
+ }
+ return NULL;
+ }
+
+ // allocate new buffer with wanted index
+ while(1)
+ {
+ stringbuffer = (prvm_stringbuffer_t *) Mem_ExpandableArray_AllocRecord(&prog->stringbuffersarray);
+ stringbuffer->flags = STRINGBUFFER_TEMP;
+ for (i = 0;stringbuffer != Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);i++);
+ if (i == bufindex)
+ {
+ stringbuffer->flags = flags; // mark as used
+ break;
+ }
+ }
+ return stringbuffer;
+}
+
+void BufStr_Set(prvm_prog_t *prog, prvm_stringbuffer_t *stringbuffer, int strindex, const char *str)
+{
+ size_t alloclen;
+
+ if (!stringbuffer || strindex < 0)
+ return;
+
+ BufStr_Expand(prog, stringbuffer, strindex);
+ stringbuffer->num_strings = max(stringbuffer->num_strings, strindex + 1);
+ if (stringbuffer->strings[strindex])
+ Mem_Free(stringbuffer->strings[strindex]);
+ stringbuffer->strings[strindex] = NULL;
+
+ if (str)
{
- stringbuffer->max_strings = 0;
- if (stringbuffer->strings)
- Mem_Free(stringbuffer->strings);
- stringbuffer->strings = NULL;
+ // not the NULL string!
+ alloclen = strlen(str) + 1;
+ stringbuffer->strings[strindex] = (char *)Mem_Alloc(prog->progs_mempool, alloclen);
+ memcpy(stringbuffer->strings[strindex], str, alloclen);
}
+
+ BufStr_Shrink(prog, stringbuffer);
}
-static int BufStr_SortStringsUP (const void *in1, const void *in2)
+void BufStr_Del(prvm_prog_t *prog, prvm_stringbuffer_t *stringbuffer)
{
- const char *a, *b;
- a = *((const char **) in1);
- b = *((const char **) in2);
- if(!a || !a[0]) return 1;
- if(!b || !b[0]) return -1;
- return strncmp(a, b, stringbuffers_sortlength);
+ int i;
+
+ if (!stringbuffer)
+ return;
+
+ for (i = 0;i < stringbuffer->num_strings;i++)
+ if (stringbuffer->strings[i])
+ Mem_Free(stringbuffer->strings[i]);
+ if (stringbuffer->strings)
+ Mem_Free(stringbuffer->strings);
+ if(stringbuffer->origin)
+ PRVM_Free((char *)stringbuffer->origin);
+ Mem_ExpandableArray_FreeRecord(&prog->stringbuffersarray, stringbuffer);
}
-static int BufStr_SortStringsDOWN (const void *in1, const void *in2)
+void BufStr_Flush(prvm_prog_t *prog)
{
- const char *a, *b;
- a = *((const char **) in1);
- b = *((const char **) in2);
- if(!a || !a[0]) return 1;
- if(!b || !b[0]) return -1;
- return strncmp(b, a, stringbuffers_sortlength);
+ prvm_stringbuffer_t *stringbuffer;
+ int i, numbuffers;
+
+ numbuffers = (int)Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray);
+ for (i = 0; i < numbuffers; i++)
+ if ( (stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i)) )
+ BufStr_Del(prog, stringbuffer);
+ Mem_ExpandableArray_NewArray(&prog->stringbuffersarray, prog->progs_mempool, sizeof(prvm_stringbuffer_t), 64);
}
/*
========================
VM_buf_create
creates new buffer, and returns it's index, returns -1 if failed
-float buf_create(void) = #460;
+float buf_create(prvm_prog_t *prog) = #460;
float newbuf(string format, float flags) = #460;
========================
*/
-void VM_buf_create (void)
+void VM_buf_create (prvm_prog_t *prog)
{
prvm_stringbuffer_t *stringbuffer;
int i;
-
+
VM_SAFEPARMCOUNTRANGE(0, 2, VM_buf_create);
// VorteX: optional parm1 (buffer format) is unfinished, to keep intact with future databuffers extension must be set to "string"
}
stringbuffer = (prvm_stringbuffer_t *) Mem_ExpandableArray_AllocRecord(&prog->stringbuffersarray);
for (i = 0;stringbuffer != Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);i++);
- stringbuffer->origin = PRVM_AllocationOrigin();
+ stringbuffer->origin = PRVM_AllocationOrigin(prog);
// optional flags parm
if (prog->argc >= 2)
- stringbuffer->flags = (int)PRVM_G_FLOAT(OFS_PARM1) & 0xFF;
+ stringbuffer->flags = (int)PRVM_G_FLOAT(OFS_PARM1) & STRINGBUFFER_QCFLAGS;
PRVM_G_FLOAT(OFS_RETURN) = i;
}
void buf_del(float bufhandle) = #461;
========================
*/
-void VM_buf_del (void)
+void VM_buf_del (prvm_prog_t *prog)
{
prvm_stringbuffer_t *stringbuffer;
VM_SAFEPARMCOUNT(1, VM_buf_del);
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if (stringbuffer)
- {
- int i;
- for (i = 0;i < stringbuffer->num_strings;i++)
- if (stringbuffer->strings[i])
- Mem_Free(stringbuffer->strings[i]);
- if (stringbuffer->strings)
- Mem_Free(stringbuffer->strings);
- if(stringbuffer->origin)
- PRVM_Free((char *)stringbuffer->origin);
- Mem_ExpandableArray_FreeRecord(&prog->stringbuffersarray, stringbuffer);
- }
+ BufStr_Del(prog, stringbuffer);
else
{
- VM_Warning("VM_buf_del: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_buf_del: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
}
float buf_getsize(float bufhandle) = #462;
========================
*/
-void VM_buf_getsize (void)
+void VM_buf_getsize (prvm_prog_t *prog)
{
prvm_stringbuffer_t *stringbuffer;
VM_SAFEPARMCOUNT(1, VM_buf_getsize);
if(!stringbuffer)
{
PRVM_G_FLOAT(OFS_RETURN) = -1;
- VM_Warning("VM_buf_getsize: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_buf_getsize: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
else
void buf_copy(float bufhandle_from, float bufhandle_to) = #463;
========================
*/
-void VM_buf_copy (void)
+void VM_buf_copy (prvm_prog_t *prog)
{
prvm_stringbuffer_t *srcstringbuffer, *dststringbuffer;
int i;
srcstringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!srcstringbuffer)
{
- VM_Warning("VM_buf_copy: invalid source buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_buf_copy: invalid source buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
i = (int)PRVM_G_FLOAT(OFS_PARM1);
if(i == (int)PRVM_G_FLOAT(OFS_PARM0))
{
- VM_Warning("VM_buf_copy: source == destination (%i) in %s\n", i, PRVM_NAME);
+ VM_Warning(prog, "VM_buf_copy: source == destination (%i) in %s\n", i, prog->name);
return;
}
dststringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!dststringbuffer)
{
- VM_Warning("VM_buf_copy: invalid destination buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME);
+ VM_Warning(prog, "VM_buf_copy: invalid destination buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), prog->name);
return;
}
========================
VM_buf_sort
sort buffer by beginnings of strings (cmplength defaults it's length)
-"backward == TRUE" means that sorting goes upside-down
+"backward == true" means that sorting goes upside-down
void buf_sort(float bufhandle, float cmplength, float backward) = #464;
========================
*/
-void VM_buf_sort (void)
+void VM_buf_sort (prvm_prog_t *prog)
{
prvm_stringbuffer_t *stringbuffer;
VM_SAFEPARMCOUNT(3, VM_buf_sort);
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!stringbuffer)
{
- VM_Warning("VM_buf_sort: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_buf_sort: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
if(stringbuffer->num_strings <= 0)
{
- VM_Warning("VM_buf_sort: tried to sort empty buffer %i in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_buf_sort: tried to sort empty buffer %i in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
stringbuffers_sortlength = (int)PRVM_G_FLOAT(OFS_PARM1);
else
qsort(stringbuffer->strings, stringbuffer->num_strings, sizeof(char*), BufStr_SortStringsDOWN);
- BufStr_Shrink(stringbuffer);
+ BufStr_Shrink(prog, stringbuffer);
}
/*
string buf_implode(float bufhandle, string glue) = #465;
========================
*/
-void VM_buf_implode (void)
+void VM_buf_implode (prvm_prog_t *prog)
{
prvm_stringbuffer_t *stringbuffer;
char k[VM_STRINGTEMP_LENGTH];
PRVM_G_INT(OFS_RETURN) = OFS_NULL;
if(!stringbuffer)
{
- VM_Warning("VM_buf_implode: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_buf_implode: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
if(!stringbuffer->num_strings)
strlcat(k, stringbuffer->strings[i], sizeof(k));
}
}
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(k);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, k);
}
/*
string bufstr_get(float bufhandle, float string_index) = #465;
========================
*/
-void VM_bufstr_get (void)
+void VM_bufstr_get (prvm_prog_t *prog)
{
prvm_stringbuffer_t *stringbuffer;
int strindex;
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!stringbuffer)
{
- VM_Warning("VM_bufstr_get: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_get: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
strindex = (int)PRVM_G_FLOAT(OFS_PARM1);
if (strindex < 0)
{
- // VM_Warning("VM_bufstr_get: invalid string index %i used in %s\n", strindex, PRVM_NAME);
+ // VM_Warning(prog, "VM_bufstr_get: invalid string index %i used in %s\n", strindex, prog->name);
return;
}
if (strindex < stringbuffer->num_strings && stringbuffer->strings[strindex])
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(stringbuffer->strings[strindex]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, stringbuffer->strings[strindex]);
}
/*
void bufstr_set(float bufhandle, float string_index, string str) = #466;
========================
*/
-void VM_bufstr_set (void)
+void VM_bufstr_set (prvm_prog_t *prog)
{
- size_t alloclen;
int strindex;
prvm_stringbuffer_t *stringbuffer;
const char *news;
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!stringbuffer)
{
- VM_Warning("VM_bufstr_set: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_set: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
strindex = (int)PRVM_G_FLOAT(OFS_PARM1);
if(strindex < 0 || strindex >= 1000000) // huge number of strings
{
- VM_Warning("VM_bufstr_set: invalid string index %i used in %s\n", strindex, PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_set: invalid string index %i used in %s\n", strindex, prog->name);
return;
}
- BufStr_Expand(stringbuffer, strindex);
- stringbuffer->num_strings = max(stringbuffer->num_strings, strindex + 1);
-
- if(stringbuffer->strings[strindex])
- Mem_Free(stringbuffer->strings[strindex]);
- stringbuffer->strings[strindex] = NULL;
-
- if(PRVM_G_INT(OFS_PARM2))
- {
- // not the NULL string!
- news = PRVM_G_STRING(OFS_PARM2);
- alloclen = strlen(news) + 1;
- stringbuffer->strings[strindex] = (char *)Mem_Alloc(prog->progs_mempool, alloclen);
- memcpy(stringbuffer->strings[strindex], news, alloclen);
- }
-
- BufStr_Shrink(stringbuffer);
+ news = PRVM_G_STRING(OFS_PARM2);
+ BufStr_Set(prog, stringbuffer, strindex, news);
}
/*
========================
VM_bufstr_add
adds string to buffer in first free slot and returns its index
-"order == TRUE" means that string will be added after last "full" slot
+"order == true" means that string will be added after last "full" slot
float bufstr_add(float bufhandle, string str, float order) = #467;
========================
*/
-void VM_bufstr_add (void)
+void VM_bufstr_add (prvm_prog_t *prog)
{
int order, strindex;
prvm_stringbuffer_t *stringbuffer;
PRVM_G_FLOAT(OFS_RETURN) = -1;
if(!stringbuffer)
{
- VM_Warning("VM_bufstr_add: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_add: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
if(!PRVM_G_INT(OFS_PARM1)) // NULL string
{
- VM_Warning("VM_bufstr_add: can not add an empty string to buffer %i in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_add: can not add an empty string to buffer %i in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
string = PRVM_G_STRING(OFS_PARM1);
if (stringbuffer->strings[strindex] == NULL)
break;
- BufStr_Expand(stringbuffer, strindex);
+ BufStr_Expand(prog, stringbuffer, strindex);
stringbuffer->num_strings = max(stringbuffer->num_strings, strindex + 1);
alloclen = strlen(string) + 1;
void bufstr_free(float bufhandle, float string_index) = #468;
========================
*/
-void VM_bufstr_free (void)
+void VM_bufstr_free (prvm_prog_t *prog)
{
int i;
prvm_stringbuffer_t *stringbuffer;
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!stringbuffer)
{
- VM_Warning("VM_bufstr_free: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_free: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
i = (int)PRVM_G_FLOAT(OFS_PARM1);
if(i < 0)
{
- VM_Warning("VM_bufstr_free: invalid string index %i used in %s\n", i, PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_free: invalid string index %i used in %s\n", i, prog->name);
return;
}
stringbuffer->strings[i] = NULL;
}
- BufStr_Shrink(stringbuffer);
+ BufStr_Shrink(prog, stringbuffer);
+}
+
+/*
+========================
+VM_buf_loadfile
+load a file into string buffer, return 0 or 1
+float buf_loadfile(string filename, float bufhandle) = #535;
+========================
+*/
+void VM_buf_loadfile(prvm_prog_t *prog)
+{
+ size_t alloclen;
+ prvm_stringbuffer_t *stringbuffer;
+ char string[VM_STRINGTEMP_LENGTH];
+ int strindex, c, end;
+ const char *filename;
+ char vabuf[1024];
+ qfile_t *file;
+
+ VM_SAFEPARMCOUNT(2, VM_buf_loadfile);
+
+ // get file
+ filename = PRVM_G_STRING(OFS_PARM0);
+ file = FS_OpenVirtualFile(va(vabuf, sizeof(vabuf), "data/%s", filename), false);
+ if (file == NULL)
+ file = FS_OpenVirtualFile(va(vabuf, sizeof(vabuf), "%s", filename), false);
+ if (file == NULL)
+ {
+ if (developer_extra.integer)
+ VM_Warning(prog, "VM_buf_loadfile: failed to open file %s in %s\n", filename, prog->name);
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ return;
+ }
+
+ // get string buffer
+ stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM1));
+ if(!stringbuffer)
+ {
+ VM_Warning(prog, "VM_buf_loadfile: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), prog->name);
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ return;
+ }
+
+ // read file (append to the end of buffer)
+ strindex = stringbuffer->num_strings;
+ while(1)
+ {
+ // read line
+ end = 0;
+ for (;;)
+ {
+ c = FS_Getc(file);
+ if (c == '\r' || c == '\n' || c < 0)
+ break;
+ if (end < VM_STRINGTEMP_LENGTH - 1)
+ string[end++] = c;
+ }
+ string[end] = 0;
+ // remove \n following \r
+ if (c == '\r')
+ {
+ c = FS_Getc(file);
+ if (c != '\n')
+ FS_UnGetc(file, (unsigned char)c);
+ }
+ // add and continue
+ if (c >= 0 || end)
+ {
+ BufStr_Expand(prog, stringbuffer, strindex);
+ stringbuffer->num_strings = max(stringbuffer->num_strings, strindex + 1);
+ alloclen = strlen(string) + 1;
+ stringbuffer->strings[strindex] = (char *)Mem_Alloc(prog->progs_mempool, alloclen);
+ memcpy(stringbuffer->strings[strindex], string, alloclen);
+ strindex = stringbuffer->num_strings;
+ }
+ else
+ break;
+ }
+
+ // close file
+ FS_Close(file);
+ PRVM_G_FLOAT(OFS_RETURN) = 1;
+}
+
+/*
+========================
+VM_buf_writefile
+writes stringbuffer to a file, returns 0 or 1
+float buf_writefile(float filehandle, float bufhandle, [, float startpos, float numstrings]) = #468;
+========================
+*/
+
+void VM_buf_writefile(prvm_prog_t *prog)
+{
+ int filenum, strindex, strnum, strlength;
+ prvm_stringbuffer_t *stringbuffer;
+
+ VM_SAFEPARMCOUNTRANGE(2, 4, VM_buf_writefile);
+
+ // get file
+ filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
+ if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
+ {
+ VM_Warning(prog, "VM_buf_writefile: invalid file handle %i used in %s\n", filenum, prog->name);
+ return;
+ }
+ if (prog->openfiles[filenum] == NULL)
+ {
+ VM_Warning(prog, "VM_buf_writefile: no such file handle %i (or file has been closed) in %s\n", filenum, prog->name);
+ return;
+ }
+
+ // get string buffer
+ stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM1));
+ if(!stringbuffer)
+ {
+ VM_Warning(prog, "VM_buf_writefile: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), prog->name);
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ return;
+ }
+
+ // get start and end parms
+ if (prog->argc > 3)
+ {
+ strindex = (int)PRVM_G_FLOAT(OFS_PARM2);
+ strnum = (int)PRVM_G_FLOAT(OFS_PARM3);
+ }
+ else if (prog->argc > 2)
+ {
+ strindex = (int)PRVM_G_FLOAT(OFS_PARM2);
+ strnum = stringbuffer->num_strings - strindex;
+ }
+ else
+ {
+ strindex = 0;
+ strnum = stringbuffer->num_strings;
+ }
+ if (strindex < 0 || strindex >= stringbuffer->num_strings)
+ {
+ VM_Warning(prog, "VM_buf_writefile: wrong start string index %i used in %s\n", strindex, prog->name);
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ return;
+ }
+ if (strnum < 0)
+ {
+ VM_Warning(prog, "VM_buf_writefile: wrong strings count %i used in %s\n", strnum, prog->name);
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ return;
+ }
+
+ // write
+ while(strindex < stringbuffer->num_strings && strnum)
+ {
+ if (stringbuffer->strings[strindex])
+ {
+ if ((strlength = (int)strlen(stringbuffer->strings[strindex])))
+ FS_Write(prog->openfiles[filenum], stringbuffer->strings[strindex], strlength);
+ FS_Write(prog->openfiles[filenum], "\n", 1);
+ }
+ strindex++;
+ strnum--;
+ }
+
+ PRVM_G_FLOAT(OFS_RETURN) = 1;
+}
+
+#define MATCH_AUTO 0
+#define MATCH_WHOLE 1
+#define MATCH_LEFT 2
+#define MATCH_RIGHT 3
+#define MATCH_MIDDLE 4
+#define MATCH_PATTERN 5
+
+static const char *detect_match_rule(char *pattern, int *matchrule)
+{
+ char *ppos, *qpos;
+ int patternlength;
+
+ patternlength = (int)strlen(pattern);
+ ppos = strchr(pattern, '*');
+ qpos = strchr(pattern, '?');
+ // has ? - pattern
+ if (qpos)
+ {
+ *matchrule = MATCH_PATTERN;
+ return pattern;
+ }
+ // has * - left, mid, right or pattern
+ if (ppos)
+ {
+ // starts with * - may be right/mid or pattern
+ if ((ppos - pattern) == 0)
+ {
+ ppos = strchr(pattern+1, '*');
+ // *something
+ if (!ppos)
+ {
+ *matchrule = MATCH_RIGHT;
+ return pattern+1;
+ }
+ // *something*
+ if ((ppos - pattern) == patternlength)
+ {
+ *matchrule = MATCH_MIDDLE;
+ *ppos = 0;
+ return pattern+1;
+ }
+ // *som*thing
+ *matchrule = MATCH_PATTERN;
+ return pattern;
+ }
+ // end with * - left
+ if ((ppos - pattern) == patternlength)
+ {
+ *matchrule = MATCH_LEFT;
+ *ppos = 0;
+ return pattern;
+ }
+ // som*thing
+ *matchrule = MATCH_PATTERN;
+ return pattern;
+ }
+ // have no wildcards - whole string
+ *matchrule = MATCH_WHOLE;
+ return pattern;
+}
+
+// todo: support UTF8
+static qbool match_rule(const char *string, int max_string, const char *pattern, int patternlength, int rule)
+{
+ const char *mid;
+
+ if (rule == 1)
+ return !strncmp(string, pattern, max_string) ? true : false;
+ if (rule == 2)
+ return !strncmp(string, pattern, patternlength) ? true : false;
+ if (rule == 3)
+ {
+ mid = strstr(string, pattern);
+ return mid && !*(mid+patternlength);
+ }
+ if (rule == 4)
+ return strstr(string, pattern) ? true : false;
+ // pattern
+ return matchpattern_with_separator(string, pattern, false, "", false) ? true : false;
+}
+
+/*
+========================
+VM_bufstr_find
+find an index of bufstring matching rule
+float bufstr_find(float bufhandle, string match, float matchrule, float startpos, float step) = #468;
+========================
+*/
+
+void VM_bufstr_find(prvm_prog_t *prog)
+{
+ prvm_stringbuffer_t *stringbuffer;
+ char string[VM_STRINGTEMP_LENGTH];
+ int matchrule, matchlen, i, step;
+ const char *match;
+
+ VM_SAFEPARMCOUNTRANGE(3, 5, VM_bufstr_find);
+
+ PRVM_G_FLOAT(OFS_RETURN) = -1;
+
+ // get string buffer
+ stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+ if(!stringbuffer)
+ {
+ VM_Warning(prog, "VM_bufstr_find: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
+ return;
+ }
+
+ // get pattern/rule
+ matchrule = (int)PRVM_G_FLOAT(OFS_PARM2);
+ if (matchrule < 0 || matchrule > 5)
+ {
+ VM_Warning(prog, "VM_bufstr_find: invalid match rule %i in %s\n", matchrule, prog->name);
+ return;
+ }
+ if (matchrule)
+ match = PRVM_G_STRING(OFS_PARM1);
+ else
+ {
+ strlcpy(string, PRVM_G_STRING(OFS_PARM1), sizeof(string));
+ match = detect_match_rule(string, &matchrule);
+ }
+ matchlen = (int)strlen(match);
+
+ // find
+ i = (prog->argc > 3) ? (int)PRVM_G_FLOAT(OFS_PARM3) : 0;
+ step = (prog->argc > 4) ? (int)PRVM_G_FLOAT(OFS_PARM4) : 1;
+ while(i < stringbuffer->num_strings)
+ {
+ if (stringbuffer->strings[i] && match_rule(stringbuffer->strings[i], VM_STRINGTEMP_LENGTH, match, matchlen, matchrule))
+ {
+ PRVM_G_FLOAT(OFS_RETURN) = i;
+ break;
+ }
+ i += step;
+ }
}
+/*
+========================
+VM_matchpattern
+float matchpattern(string s, string pattern, float matchrule, float startpos) = #468;
+========================
+*/
+void VM_matchpattern(prvm_prog_t *prog)
+{
+ const char *s, *match;
+ char string[VM_STRINGTEMP_LENGTH];
+ int matchrule, l;
+
+ VM_SAFEPARMCOUNTRANGE(2, 4, VM_matchpattern);
+ s = PRVM_G_STRING(OFS_PARM0);
+ // get pattern/rule
+ matchrule = (int)PRVM_G_FLOAT(OFS_PARM2);
+ if (matchrule < 0 || matchrule > 5)
+ {
+ VM_Warning(prog, "VM_matchpattern: invalid match rule %i in %s\n", matchrule, prog->name);
+ return;
+ }
+ if (matchrule)
+ match = PRVM_G_STRING(OFS_PARM1);
+ else
+ {
+ strlcpy(string, PRVM_G_STRING(OFS_PARM1), sizeof(string));
+ match = detect_match_rule(string, &matchrule);
+ }
+ // offset
+ l = (int)strlen(match);
+ if (prog->argc > 3)
+ s += max(0, min((unsigned int)PRVM_G_FLOAT(OFS_PARM3), strlen(s)-1));
+ // match
+ PRVM_G_FLOAT(OFS_RETURN) = match_rule(s, VM_STRINGTEMP_LENGTH, match, l, matchrule);
+}
+/*
+========================
+VM_buf_cvarlist
+========================
+*/
-void VM_buf_cvarlist(void)
+void VM_buf_cvarlist(prvm_prog_t *prog)
{
cvar_t *cvar;
const char *partial, *antipartial;
size_t len, antilen;
size_t alloclen;
- qboolean ispattern, antiispattern;
+ qbool ispattern, antiispattern;
int n;
prvm_stringbuffer_t *stringbuffer;
VM_SAFEPARMCOUNTRANGE(2, 3, VM_buf_cvarlist);
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!stringbuffer)
{
- VM_Warning("VM_bufstr_free: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "VM_bufstr_free: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
antiispattern = antipartial && (strchr(antipartial, '*') || strchr(antipartial, '?'));
n = 0;
- for(cvar = cvar_vars; cvar; cvar = cvar->next)
+ for(cvar = prog->console_cmd->cvars->vars; cvar; cvar = cvar->next)
{
if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
continue;
stringbuffer->strings = (char **)Mem_Alloc(prog->progs_mempool, sizeof(stringbuffer->strings[0]) * stringbuffer->max_strings);
n = 0;
- for(cvar = cvar_vars; cvar; cvar = cvar->next)
+ for(cvar = prog->console_cmd->cvars->vars; cvar; cvar = cvar->next)
{
if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
continue;
This was a major timewaster in progs, so it was converted to C
==============
*/
-void VM_changeyaw (void)
+void VM_changeyaw (prvm_prog_t *prog)
{
prvm_edict_t *ent;
float ideal, current, move, speed;
- // this is called (VERY HACKISHLY) by SV_MoveToGoal, so it can not use any
- // parameters because they are the parameters to SV_MoveToGoal, not this
+ // this is called (VERY HACKISHLY) by VM_SV_MoveToGoal, so it can not use any
+ // parameters because they are the parameters to VM_SV_MoveToGoal, not this
//VM_SAFEPARMCOUNT(0, VM_changeyaw);
ent = PRVM_PROG_TO_EDICT(PRVM_gameglobaledict(self));
if (ent == prog->edicts)
{
- VM_Warning("changeyaw: can not modify world entity\n");
+ VM_Warning(prog, "changeyaw: can not modify world entity\n");
return;
}
if (ent->priv.server->free)
{
- VM_Warning("changeyaw: can not modify free entity\n");
+ VM_Warning(prog, "changeyaw: can not modify free entity\n");
return;
}
current = PRVM_gameedictvector(ent, angles)[1];
VM_changepitch
==============
*/
-void VM_changepitch (void)
+void VM_changepitch (prvm_prog_t *prog)
{
prvm_edict_t *ent;
float ideal, current, move, speed;
ent = PRVM_G_EDICT(OFS_PARM0);
if (ent == prog->edicts)
{
- VM_Warning("changepitch: can not modify world entity\n");
+ VM_Warning(prog, "changepitch: can not modify world entity\n");
return;
}
if (ent->priv.server->free)
{
- VM_Warning("changepitch: can not modify free entity\n");
+ VM_Warning(prog, "changepitch: can not modify free entity\n");
return;
}
current = PRVM_gameedictvector(ent, angles)[0];
}
-void VM_uncolorstring (void)
+void VM_uncolorstring (prvm_prog_t *prog)
{
char szNewString[VM_STRINGTEMP_LENGTH];
const char *szString;
// Prepare Strings
VM_SAFEPARMCOUNT(1, VM_uncolorstring);
szString = PRVM_G_STRING(OFS_PARM0);
- COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), TRUE);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+ COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), true);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
}
// #221 float(string str, string sub[, float startpos]) strstrofs (FTE_STRINGS)
//strstr, without generating a new string. Use in conjunction with FRIK_FILE's substring for more similar strstr.
-void VM_strstrofs (void)
+void VM_strstrofs (prvm_prog_t *prog)
{
const char *instr, *match;
int firstofs;
instr = PRVM_G_STRING(OFS_PARM0);
match = PRVM_G_STRING(OFS_PARM1);
firstofs = (prog->argc > 2)?(int)PRVM_G_FLOAT(OFS_PARM2):0;
- firstofs = u8_bytelen(instr, firstofs);
+ firstofs = (int)u8_bytelen(instr, firstofs);
if (firstofs && (firstofs < 0 || firstofs > (int)strlen(instr)))
{
}
//#222 string(string s, float index) str2chr (FTE_STRINGS)
-void VM_str2chr (void)
+void VM_str2chr (prvm_prog_t *prog)
{
const char *s;
Uchar ch;
int index;
VM_SAFEPARMCOUNT(2, VM_str2chr);
s = PRVM_G_STRING(OFS_PARM0);
- index = u8_bytelen(s, (int)PRVM_G_FLOAT(OFS_PARM1));
+ index = (int)u8_bytelen(s, (int)PRVM_G_FLOAT(OFS_PARM1));
if((unsigned)index < strlen(s))
{
}
//#223 string(float c, ...) chr2str (FTE_STRINGS)
-void VM_chr2str (void)
+void VM_chr2str (prvm_prog_t *prog)
{
/*
char t[9];
for(i = 0;i < prog->argc && i < (int)sizeof(t) - 1;i++)
t[i] = (unsigned char)PRVM_G_FLOAT(OFS_PARM0+i*3);
t[i] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(t);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t);
*/
char t[9 * 4 + 1];
int i;
for(i = 0; i < prog->argc && len < sizeof(t)-1; ++i)
len += u8_fromchar((Uchar)PRVM_G_FLOAT(OFS_PARM0+i*3), t + len, sizeof(t)-1);
t[len] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(t);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t);
}
static int chrconv_number(int i, int base, int conv)
}
// #224 string(float ccase, float calpha, float cnum, string s, ...) strconv (FTE_STRINGS)
//bulk convert a string. change case or colouring.
-void VM_strconv (void)
+void VM_strconv (prvm_prog_t *prog)
{
int ccase, redalpha, rednum, len, i;
unsigned char resbuf[VM_STRINGTEMP_LENGTH];
ccase = (int) PRVM_G_FLOAT(OFS_PARM0); //0 same, 1 lower, 2 upper
redalpha = (int) PRVM_G_FLOAT(OFS_PARM1); //0 same, 1 white, 2 red, 5 alternate, 6 alternate-alternate
rednum = (int) PRVM_G_FLOAT(OFS_PARM2); //0 same, 1 white, 2 red, 3 redspecial, 4 whitespecial, 5 alternate, 6 alternate-alternate
- VM_VarString(3, (char *) resbuf, sizeof(resbuf));
- len = strlen((char *) resbuf);
+ VM_VarString(prog, 3, (char *) resbuf, sizeof(resbuf));
+ len = (int)strlen((char *) resbuf);
for (i = 0; i < len; i++, result++) //should this be done backwards?
{
}
*result = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString((char *) resbuf);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, (char *) resbuf);
}
// #225 string(float chars, string s, ...) strpad (FTE_STRINGS)
-void VM_strpad (void)
+void VM_strpad (prvm_prog_t *prog)
{
char src[VM_STRINGTEMP_LENGTH];
char destbuf[VM_STRINGTEMP_LENGTH];
int pad;
VM_SAFEPARMCOUNTRANGE(1, 8, VM_strpad);
pad = (int) PRVM_G_FLOAT(OFS_PARM0);
- VM_VarString(1, src, sizeof(src));
+ VM_VarString(prog, 1, src, sizeof(src));
// note: < 0 = left padding, > 0 = right padding,
// this is reverse logic of printf!
dpsnprintf(destbuf, sizeof(destbuf), "%*s", -pad, src);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(destbuf);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, destbuf);
}
// #226 string(string info, string key, string value, ...) infoadd (FTE_STRINGS)
//uses qw style \key\value strings
-void VM_infoadd (void)
+void VM_infoadd (prvm_prog_t *prog)
{
const char *info, *key;
char value[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(2, 8, VM_infoadd);
info = PRVM_G_STRING(OFS_PARM0);
key = PRVM_G_STRING(OFS_PARM1);
- VM_VarString(2, value, sizeof(value));
+ VM_VarString(prog, 2, value, sizeof(value));
strlcpy(temp, info, VM_STRINGTEMP_LENGTH);
InfoString_SetValue(temp, VM_STRINGTEMP_LENGTH, key, value);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(temp);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, temp);
}
// #227 string(string info, string key) infoget (FTE_STRINGS)
//uses qw style \key\value strings
-void VM_infoget (void)
+void VM_infoget (prvm_prog_t *prog)
{
const char *info;
const char *key;
InfoString_GetValue(info, key, value, VM_STRINGTEMP_LENGTH);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(value);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, value);
}
//#228 float(string s1, string s2, float len) strncmp (FTE_STRINGS)
// also float(string s1, string s2) strcmp (FRIK_FILE)
-void VM_strncmp (void)
+void VM_strncmp (prvm_prog_t *prog)
{
const char *s1, *s2;
VM_SAFEPARMCOUNTRANGE(2, 3, VM_strncmp);
// #229 float(string s1, string s2) strcasecmp (FTE_STRINGS)
// #230 float(string s1, string s2, float len) strncasecmp (FTE_STRINGS)
-void VM_strncasecmp (void)
+void VM_strncasecmp (prvm_prog_t *prog)
{
const char *s1, *s2;
VM_SAFEPARMCOUNTRANGE(2, 3, VM_strncasecmp);
}
// #494 float(float caseinsensitive, string s, ...) crc16
-void VM_crc16(void)
+void VM_crc16(prvm_prog_t *prog)
{
float insensitive;
- static char s[VM_STRINGTEMP_LENGTH];
+ char s[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(2, 8, VM_crc16);
insensitive = PRVM_G_FLOAT(OFS_PARM0);
- VM_VarString(1, s, sizeof(s));
+ VM_VarString(prog, 1, s, sizeof(s));
PRVM_G_FLOAT(OFS_RETURN) = (unsigned short) ((insensitive ? CRC_Block_CaseInsensitive : CRC_Block) ((unsigned char *) s, strlen(s)));
}
// #639 float(string digest, string data, ...) digest_hex
-void VM_digest_hex(void)
+void VM_digest_hex(prvm_prog_t *prog)
{
const char *digest;
- static char out[32];
- static char outhex[65];
+ char out[32];
+ char outhex[65];
int outlen;
- static char s[VM_STRINGTEMP_LENGTH];
+ char s[VM_STRINGTEMP_LENGTH];
int len;
VM_SAFEPARMCOUNTRANGE(2, 8, VM_digest_hex);
digest = PRVM_G_STRING(OFS_PARM0);
if(!digest)
digest = "";
- VM_VarString(1, s, sizeof(s));
- len = strlen(s);
+ VM_VarString(prog, 1, s, sizeof(s));
+ len = (int)strlen(s);
outlen = 0;
outhex[2*i+1] = hexmap[(out[i] >> 0) & 15];
}
outhex[2*i] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(outhex);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outhex);
}
else
PRVM_G_INT(OFS_RETURN) = 0;
}
-void VM_wasfreed (void)
+void VM_wasfreed (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_wasfreed);
PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_EDICT(OFS_PARM0)->priv.required->free;
}
-void VM_SetTraceGlobals(const trace_t *trace)
+void VM_SetTraceGlobals(prvm_prog_t *prog, const trace_t *trace)
{
PRVM_gameglobalfloat(trace_allsolid) = trace->allsolid;
PRVM_gameglobalfloat(trace_startsolid) = trace->startsolid;
PRVM_gameglobalfloat(trace_dpstartcontents) = trace->startsupercontents;
PRVM_gameglobalfloat(trace_dphitcontents) = trace->hitsupercontents;
PRVM_gameglobalfloat(trace_dphitq3surfaceflags) = trace->hitq3surfaceflags;
- PRVM_gameglobalstring(trace_dphittexturename) = trace->hittexture ? PRVM_SetTempString(trace->hittexture->name) : 0;
+ PRVM_gameglobalstring(trace_dphittexturename) = trace->hittexture ? PRVM_SetTempString(prog, trace->hittexture->name) : 0;
}
-void VM_ClearTraceGlobals(void)
+void VM_ClearTraceGlobals(prvm_prog_t *prog)
{
// clean up all trace globals when leaving the VM (anti-triggerbot safeguard)
PRVM_gameglobalfloat(trace_allsolid) = 0;
//=============
-void VM_Cmd_Init(void)
+void VM_Cmd_Init(prvm_prog_t *prog)
{
// only init the stuff for the current prog
- VM_Files_Init();
- VM_Search_Init();
-// VM_BufStr_Init();
+ VM_Files_Init(prog);
+ VM_Search_Init(prog);
}
-void VM_Cmd_Reset(void)
+static void animatemodel_reset(prvm_prog_t *prog);
+
+void VM_Cmd_Reset(prvm_prog_t *prog)
{
CL_PurgeOwner( MENUOWNER );
- VM_Search_Reset();
- VM_Files_CloseAll();
-// VM_BufStr_ShutDown();
+ VM_Search_Reset(prog);
+ VM_Files_CloseAll(prog);
+ animatemodel_reset(prog);
}
// #510 string(string input, ...) uri_escape (DP_QC_URI_ESCAPE)
// does URI escaping on a string (replace evil stuff by %AB escapes)
-void VM_uri_escape (void)
+void VM_uri_escape (prvm_prog_t *prog)
{
char src[VM_STRINGTEMP_LENGTH];
char dest[VM_STRINGTEMP_LENGTH];
static const char *hex = "0123456789ABCDEF";
VM_SAFEPARMCOUNTRANGE(1, 8, VM_uri_escape);
- VM_VarString(0, src, sizeof(src));
+ VM_VarString(prog, 0, src, sizeof(src));
for(p = src, q = dest; *p && q < dest + sizeof(dest) - 3; ++p)
{
}
*q++ = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(dest);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, dest);
}
// #510 string(string input, ...) uri_unescape (DP_QC_URI_ESCAPE)
// does URI unescaping on a string (get back the evil stuff)
-void VM_uri_unescape (void)
+void VM_uri_unescape (prvm_prog_t *prog)
{
char src[VM_STRINGTEMP_LENGTH];
char dest[VM_STRINGTEMP_LENGTH];
int hi, lo;
VM_SAFEPARMCOUNTRANGE(1, 8, VM_uri_unescape);
- VM_VarString(0, src, sizeof(src));
+ VM_VarString(prog, 0, src, sizeof(src));
for(p = src, q = dest; *p; ) // no need to check size, because unescape can't expand
{
}
*q++ = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(dest);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, dest);
}
// #502 string(string filename) whichpack (DP_QC_WHICHPACK)
// returns the name of the pack containing a file, or "" if it is not in any pack (but local or non-existant)
-void VM_whichpack (void)
+void VM_whichpack (prvm_prog_t *prog)
{
const char *fn, *pack;
fn = PRVM_G_STRING(OFS_PARM0);
pack = FS_WhichPack(fn);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(pack ? pack : "");
+ PRVM_G_INT(OFS_RETURN) = pack ? PRVM_SetTempString(prog, pack) : 0;
}
typedef struct
{
- int prognr;
+ prvm_prog_t *prog;
double starttime;
float id;
char buffer[MAX_INPUTLINE];
+ char posttype[128];
unsigned char *postdata; // free when uri_to_prog_t is freed
size_t postlen;
char *sigdata; // free when uri_to_prog_t is freed
static void uri_to_string_callback(int status, size_t length_received, unsigned char *buffer, void *cbdata)
{
+ prvm_prog_t *prog;
uri_to_prog_t *handle = (uri_to_prog_t *) cbdata;
- if(!PRVM_ProgLoaded(handle->prognr))
+ prog = handle->prog;
+ if(!prog->loaded)
{
// curl reply came too late... so just drop it
if(handle->postdata)
Z_Free(handle);
return;
}
-
- PRVM_SetProg(handle->prognr);
- PRVM_Begin;
- if((prog->starttime == handle->starttime) && (PRVM_allfunction(URI_Get_Callback)))
- {
- if(length_received >= sizeof(handle->buffer))
- length_received = sizeof(handle->buffer) - 1;
- handle->buffer[length_received] = 0;
-
- PRVM_G_FLOAT(OFS_PARM0) = handle->id;
- PRVM_G_FLOAT(OFS_PARM1) = status;
- PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(handle->buffer);
- PRVM_ExecuteProgram(PRVM_allfunction(URI_Get_Callback), "QC function URI_Get_Callback is missing");
- }
- PRVM_End;
-
+
+ if((prog->starttime == handle->starttime) && (PRVM_allfunction(URI_Get_Callback)))
+ {
+ if(length_received >= sizeof(handle->buffer))
+ length_received = sizeof(handle->buffer) - 1;
+ handle->buffer[length_received] = 0;
+
+ PRVM_G_FLOAT(OFS_PARM0) = handle->id;
+ PRVM_G_FLOAT(OFS_PARM1) = status;
+ PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(prog, handle->buffer);
+ prog->ExecuteProgram(prog, PRVM_allfunction(URI_Get_Callback), "QC function URI_Get_Callback is missing");
+ }
+
if(handle->postdata)
Z_Free(handle->postdata);
if(handle->sigdata)
// uri_get() gets content from an URL and calls a callback "uri_get_callback" with it set as string; an unique ID of the transfer is returned
// returns 1 on success, and then calls the callback with the ID, 0 or the HTTP status code, and the received data in a string
-void VM_uri_get (void)
+void VM_uri_get (prvm_prog_t *prog)
{
const char *url;
float id;
- qboolean ret;
+ qbool ret;
uri_to_prog_t *handle;
const char *posttype = NULL;
const char *postseparator = NULL;
size_t lq;
if(!PRVM_allfunction(URI_Get_Callback))
- PRVM_ERROR("uri_get called by %s without URI_Get_Callback defined", PRVM_NAME);
+ prog->error_cmd("uri_get called by %s without URI_Get_Callback defined", prog->name);
VM_SAFEPARMCOUNTRANGE(2, 6, VM_uri_get);
++query_string;
lq = query_string ? strlen(query_string) : 0;
- handle->prognr = PRVM_GetProgNr();
+ handle->prog = prog;
handle->starttime = prog->starttime;
handle->id = id;
if(postseparator && posttype && *posttype)
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, poststringbuffer);
if(!stringbuffer)
{
- VM_Warning("uri_get: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ VM_Warning(prog, "uri_get: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), prog->name);
return;
}
ltotal = 0;
}
}
if(ltotal != handle->postlen)
- PRVM_ERROR ("%s: string buffer content size mismatch, possible overrun", PRVM_NAME);
+ prog->error_cmd("%s: string buffer content size mismatch, possible overrun", prog->name);
}
else
{
handle->sigdata[handle->siglen] = 0;
}
out1:
- ret = Curl_Begin_ToMemory_POST(url, handle->sigdata, 0, posttype, handle->postdata, handle->postlen, (unsigned char *) handle->buffer, sizeof(handle->buffer), uri_to_string_callback, handle);
+ strlcpy(handle->posttype, posttype, sizeof(handle->posttype));
+ ret = Curl_Begin_ToMemory_POST(url, handle->sigdata, 0, handle->posttype, handle->postdata, handle->postlen, (unsigned char *) handle->buffer, sizeof(handle->buffer), uri_to_string_callback, handle);
}
else
{
out2:
handle->postdata = NULL;
handle->postlen = 0;
- ret = Curl_Begin_ToMemory(url, 0, (unsigned char *) handle->buffer, sizeof(handle->buffer), uri_to_string_callback, handle);
+ ret = Curl_Begin_ToMemory_POST(url, handle->sigdata, 0, NULL, NULL, 0, (unsigned char *) handle->buffer, sizeof(handle->buffer), uri_to_string_callback, handle);
}
if(ret)
{
}
}
-void VM_netaddress_resolve (void)
+void VM_netaddress_resolve (prvm_prog_t *prog)
{
const char *ip;
char normalized[128];
port = (int) PRVM_G_FLOAT(OFS_PARM1);
if(LHNETADDRESS_FromString(&addr, ip, port) && LHNETADDRESS_ToString(&addr, normalized, sizeof(normalized), prog->argc > 1))
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(normalized);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, normalized);
else
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
}
-//string(void) getextresponse = #624; // returns the next extResponse packet that was sent to this client
-void VM_CL_getextresponse (void)
+//string(prvm_prog_t *prog) getextresponse = #624; // returns the next extResponse packet that was sent to this client
+void VM_CL_getextresponse (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_argv);
int first;
--cl_net_extresponse_count;
first = (cl_net_extresponse_last + NET_EXTRESPONSE_MAX - cl_net_extresponse_count) % NET_EXTRESPONSE_MAX;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(cl_net_extresponse[first]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cl_net_extresponse[first]);
}
}
-void VM_SV_getextresponse (void)
+void VM_SV_getextresponse (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_argv);
int first;
--sv_net_extresponse_count;
first = (sv_net_extresponse_last + NET_EXTRESPONSE_MAX - sv_net_extresponse_count) % NET_EXTRESPONSE_MAX;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(sv_net_extresponse[first]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, sv_net_extresponse[first]);
}
}
*/
//#349 float() isdemo
-void VM_CL_isdemo (void)
+void VM_CL_isdemo (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_isdemo);
PRVM_G_FLOAT(OFS_RETURN) = cls.demoplayback;
}
//#355 float() videoplaying
-void VM_CL_videoplaying (void)
+void VM_CL_videoplaying (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_CL_videoplaying);
PRVM_G_FLOAT(OFS_RETURN) = cl_videoplaying;
Extension: pass
=========
*/
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_callfunction(void)
+void VM_callfunction(prvm_prog_t *prog)
{
mfunction_t *func;
const char *s;
s = PRVM_G_STRING(OFS_PARM0+(prog->argc - 1)*3);
- VM_CheckEmptyString(s);
+ VM_CheckEmptyString(prog, s);
- func = PRVM_ED_FindFunction(s);
+ func = PRVM_ED_FindFunction(prog, s);
if(!func)
- PRVM_ERROR("VM_callfunciton: function %s not found !", s);
+ prog->error_cmd("VM_callfunction: function %s not found !", s);
else if (func->first_statement < 0)
{
// negative statements are built in functions
int builtinnumber = -func->first_statement;
prog->xfunction->builtinsprofile++;
if (builtinnumber < prog->numbuiltins && prog->builtins[builtinnumber])
- prog->builtins[builtinnumber]();
+ prog->builtins[builtinnumber](prog);
else
- PRVM_ERROR("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, PRVM_NAME);
+ prog->error_cmd("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, prog->name);
}
else if(func - prog->functions > 0)
{
prog->argc--;
- PRVM_ExecuteProgram(func - prog->functions,"");
+ prog->ExecuteProgram(prog, func - prog->functions,"");
prog->argc++;
}
}
float isfunction(string function_name)
=========
*/
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_isfunction(void)
+void VM_isfunction(prvm_prog_t *prog)
{
mfunction_t *func;
const char *s;
s = PRVM_G_STRING(OFS_PARM0);
- VM_CheckEmptyString(s);
+ VM_CheckEmptyString(prog, s);
- func = PRVM_ED_FindFunction(s);
+ func = PRVM_ED_FindFunction(prog, s);
if(!func)
PRVM_G_FLOAT(OFS_RETURN) = false;
=========
*/
-void VM_sprintf(void)
+void VM_sprintf(prvm_prog_t *prog)
{
const char *s, *s0;
char outbuf[MAX_INPUTLINE];
char *o = outbuf, *end = outbuf + sizeof(outbuf), *err;
+ const char *p;
int argpos = 1;
int width, precision, thisarg, flags;
char formatbuf[16];
char *f;
int isfloat;
- static int dummyivec[3] = {0, 0, 0};
- static float dummyvec[3] = {0, 0, 0};
+ static prvm_int_t dummyivec[3] = {0, 0, 0};
+ static prvm_vec_t dummyvec[3] = {0, 0, 0};
+ char vabuf[1024];
#define PRINTF_ALTERNATE 1
#define PRINTF_ZEROPAD 2
#define GETARG_FLOAT(a) (((a)>=1 && (a)<prog->argc) ? (PRVM_G_FLOAT(OFS_PARM0 + 3 * (a))) : 0)
#define GETARG_VECTOR(a) (((a)>=1 && (a)<prog->argc) ? (PRVM_G_VECTOR(OFS_PARM0 + 3 * (a))) : dummyvec)
#define GETARG_INT(a) (((a)>=1 && (a)<prog->argc) ? (PRVM_G_INT(OFS_PARM0 + 3 * (a))) : 0)
-#define GETARG_INTVECTOR(a) (((a)>=1 && (a)<prog->argc) ? ((int*) PRVM_G_VECTOR(OFS_PARM0 + 3 * (a))) : dummyivec)
+#define GETARG_INTVECTOR(a) (((a)>=1 && (a)<prog->argc) ? ((prvm_int_t*) PRVM_G_VECTOR(OFS_PARM0 + 3 * (a))) : dummyivec)
#define GETARG_STRING(a) (((a)>=1 && (a)<prog->argc) ? (PRVM_G_STRING(OFS_PARM0 + 3 * (a))) : "")
for(;;)
width = strtol(s, &err, 10);
if(!err)
{
- VM_Warning("VM_sprintf: invalid directive in %s: %s\n", PRVM_NAME, s0);
+ VM_Warning(prog, "VM_sprintf: invalid directive in %s: %s\n", prog->name, s0);
goto finished;
}
if(*err == '$')
width = strtol(s, &err, 10);
if(!err || *err != '$')
{
- VM_Warning("VM_sprintf: invalid directive in %s: %s\n", PRVM_NAME, s0);
+ VM_Warning(prog, "VM_sprintf: invalid directive in %s: %s\n", prog->name, s0);
goto finished;
}
s = err + 1;
width = strtol(s, &err, 10);
if(!err)
{
- VM_Warning("VM_sprintf: invalid directive in %s: %s\n", PRVM_NAME, s0);
+ VM_Warning(prog, "VM_sprintf: invalid directive in %s: %s\n", prog->name, s0);
goto finished;
}
s = err;
precision = strtol(s, &err, 10);
if(!err || *err != '$')
{
- VM_Warning("VM_sprintf: invalid directive in %s: %s\n", PRVM_NAME, s0);
+ VM_Warning(prog, "VM_sprintf: invalid directive in %s: %s\n", prog->name, s0);
goto finished;
}
s = err + 1;
precision = strtol(s, &err, 10);
if(!err)
{
- VM_Warning("VM_sprintf: invalid directive in %s: %s\n", PRVM_NAME, s0);
+ VM_Warning(prog, "VM_sprintf: invalid directive in %s: %s\n", prog->name, s0);
goto finished;
}
s = err;
}
else
{
- VM_Warning("VM_sprintf: invalid directive in %s: %s\n", PRVM_NAME, s0);
+ VM_Warning(prog, "VM_sprintf: invalid directive in %s: %s\n", prog->name, s0);
goto finished;
}
}
*f++ = '.';
*f++ = '*';
}
+ if(*s == 'd' || *s == 'i' || *s == 'o' || *s == 'u' || *s == 'x' || *s == 'X')
+ {
+ // make it use a good integer type
+ for(p = INT_LOSSLESS_FORMAT_SIZE; *p; )
+ *f++ = *p++;
+ }
*f++ = *s;
*f++ = 0;
{
case 'd': case 'i':
if(precision < 0) // not set
- o += dpsnprintf(o, end - o, formatbuf, width, (isfloat ? (int) GETARG_FLOAT(thisarg) : (int) GETARG_INT(thisarg)));
+ o += dpsnprintf(o, end - o, formatbuf, width, (isfloat ? INT_LOSSLESS_FORMAT_CONVERT_S(GETARG_FLOAT(thisarg)) : INT_LOSSLESS_FORMAT_CONVERT_S(GETARG_INT(thisarg))));
else
- o += dpsnprintf(o, end - o, formatbuf, width, precision, (isfloat ? (int) GETARG_FLOAT(thisarg) : (int) GETARG_INT(thisarg)));
+ o += dpsnprintf(o, end - o, formatbuf, width, precision, (isfloat ? INT_LOSSLESS_FORMAT_CONVERT_S(GETARG_FLOAT(thisarg)) : INT_LOSSLESS_FORMAT_CONVERT_S(GETARG_INT(thisarg))));
break;
case 'o': case 'u': case 'x': case 'X':
if(precision < 0) // not set
- o += dpsnprintf(o, end - o, formatbuf, width, (isfloat ? (unsigned int) GETARG_FLOAT(thisarg) : (unsigned int) GETARG_INT(thisarg)));
+ o += dpsnprintf(o, end - o, formatbuf, width, (isfloat ? INT_LOSSLESS_FORMAT_CONVERT_U(GETARG_FLOAT(thisarg)) : INT_LOSSLESS_FORMAT_CONVERT_U(GETARG_INT(thisarg))));
else
- o += dpsnprintf(o, end - o, formatbuf, width, precision, (isfloat ? (unsigned int) GETARG_FLOAT(thisarg) : (unsigned int) GETARG_INT(thisarg)));
+ o += dpsnprintf(o, end - o, formatbuf, width, precision, (isfloat ? INT_LOSSLESS_FORMAT_CONVERT_U(GETARG_FLOAT(thisarg)) : INT_LOSSLESS_FORMAT_CONVERT_U(GETARG_INT(thisarg))));
break;
case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
if(precision < 0) // not set
case 'v': case 'V':
f[-2] += 'g' - 'v';
if(precision < 0) // not set
- o += dpsnprintf(o, end - o, va("%s %s %s", /* NESTED SPRINTF IS NESTED */ formatbuf, formatbuf, formatbuf),
+ o += dpsnprintf(o, end - o, va(vabuf, sizeof(vabuf), "%s %s %s", /* NESTED SPRINTF IS NESTED */ formatbuf, formatbuf, formatbuf),
width, (isfloat ? (double) GETARG_VECTOR(thisarg)[0] : (double) GETARG_INTVECTOR(thisarg)[0]),
width, (isfloat ? (double) GETARG_VECTOR(thisarg)[1] : (double) GETARG_INTVECTOR(thisarg)[1]),
width, (isfloat ? (double) GETARG_VECTOR(thisarg)[2] : (double) GETARG_INTVECTOR(thisarg)[2])
);
else
- o += dpsnprintf(o, end - o, va("%s %s %s", /* NESTED SPRINTF IS NESTED */ formatbuf, formatbuf, formatbuf),
+ o += dpsnprintf(o, end - o, va(vabuf, sizeof(vabuf), "%s %s %s", /* NESTED SPRINTF IS NESTED */ formatbuf, formatbuf, formatbuf),
width, precision, (isfloat ? (double) GETARG_VECTOR(thisarg)[0] : (double) GETARG_INTVECTOR(thisarg)[0]),
width, precision, (isfloat ? (double) GETARG_VECTOR(thisarg)[1] : (double) GETARG_INTVECTOR(thisarg)[1]),
width, precision, (isfloat ? (double) GETARG_VECTOR(thisarg)[2] : (double) GETARG_INTVECTOR(thisarg)[2])
else
{
unsigned int c = (isfloat ? (unsigned int) GETARG_FLOAT(thisarg) : (unsigned int) GETARG_INT(thisarg));
- const char *buf = u8_encodech(c, NULL);
+ char charbuf16[16];
+ const char *buf = u8_encodech(c, NULL, charbuf16);
if(!buf)
buf = "";
if(precision < 0) // not set
o += u8_strpad(o, end - o, buf, (flags & PRINTF_LEFT) != 0, width, precision);
}
break;
+ //spike FIXME -- 'S' for quoted tokenize-safe-or-print escaping of strings so stuff can safely survive console commands.
case 's':
if(flags & PRINTF_ALTERNATE)
{
{
if(precision < 0) // not set
precision = end - o - 1;
- o += u8_strpad(o, end - o, GETARG_STRING(thisarg), (flags & PRINTF_LEFT) != 0, width, precision);
+ if(flags & PRINTF_SIGNPOSITIVE)
+ o += u8_strpad(o, end - o, GETARG_STRING(thisarg), (flags & PRINTF_LEFT) != 0, width, precision);
+ else
+ o += u8_strpad_colorcodes(o, end - o, GETARG_STRING(thisarg), (flags & PRINTF_LEFT) != 0, width, precision);
}
break;
default:
- VM_Warning("VM_sprintf: invalid directive in %s: %s\n", PRVM_NAME, s0);
+ VM_Warning(prog, "VM_sprintf: invalid directive in %s: %s\n", prog->name, s0);
goto finished;
}
}
default:
verbatim:
if(o < end - 1)
- *o++ = *s++;
+ *o++ = *s;
+ ++s;
break;
}
}
finished:
*o = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(outbuf);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outbuf);
}
// surface querying
-static dp_model_t *getmodel(prvm_edict_t *ed)
+static model_t *getmodel(prvm_prog_t *prog, prvm_edict_t *ed)
{
- switch(PRVM_GetProgNr())
- {
- case PRVM_SERVERPROG:
- return SV_GetModelFromEdict(ed);
- case PRVM_CLIENTPROG:
- return CL_GetModelFromEdict(ed);
- default:
- return NULL;
- }
+ if (prog == SVVM_prog)
+ return SV_GetModelFromEdict(ed);
+ else if (prog == CLVM_prog)
+ return CL_GetModelFromEdict(ed);
+ else
+ return NULL;
}
-typedef struct
+struct animatemodel_cache
{
- unsigned int progid;
- dp_model_t *model;
+ model_t *model;
frameblend_t frameblend[MAX_FRAMEBLENDS];
skeleton_t *skeleton_p;
skeleton_t skeleton;
float *buf_svector3f;
float *buf_tvector3f;
float *buf_normal3f;
+};
+
+static void animatemodel_reset(prvm_prog_t *prog)
+{
+ if (!prog->animatemodel_cache)
+ return;
+ if(prog->animatemodel_cache->buf_vertex3f) Mem_Free(prog->animatemodel_cache->buf_vertex3f);
+ if(prog->animatemodel_cache->buf_svector3f) Mem_Free(prog->animatemodel_cache->buf_svector3f);
+ if(prog->animatemodel_cache->buf_tvector3f) Mem_Free(prog->animatemodel_cache->buf_tvector3f);
+ if(prog->animatemodel_cache->buf_normal3f) Mem_Free(prog->animatemodel_cache->buf_normal3f);
+ Mem_Free(prog->animatemodel_cache);
}
-animatemodel_cache_t;
-static animatemodel_cache_t animatemodel_cache;
-void animatemodel(dp_model_t *model, prvm_edict_t *ed)
+static void animatemodel(prvm_prog_t *prog, model_t *model, prvm_edict_t *ed)
{
skeleton_t *skeleton;
int skeletonindex = -1;
- qboolean need = false;
+ qbool need = false;
+ struct animatemodel_cache *animatemodel_cache;
+ if (!prog->animatemodel_cache)
+ {
+ prog->animatemodel_cache = (struct animatemodel_cache *)Mem_Alloc(prog->progs_mempool, sizeof(struct animatemodel_cache));
+ memset(prog->animatemodel_cache, 0, sizeof(struct animatemodel_cache));
+ }
+ animatemodel_cache = prog->animatemodel_cache;
if(!(model->surfmesh.isanimated && model->AnimateVertices))
{
- animatemodel_cache.data_vertex3f = model->surfmesh.data_vertex3f;
- animatemodel_cache.data_svector3f = model->surfmesh.data_svector3f;
- animatemodel_cache.data_tvector3f = model->surfmesh.data_tvector3f;
- animatemodel_cache.data_normal3f = model->surfmesh.data_normal3f;
+ animatemodel_cache->data_vertex3f = model->surfmesh.data_vertex3f;
+ animatemodel_cache->data_svector3f = model->surfmesh.data_svector3f;
+ animatemodel_cache->data_tvector3f = model->surfmesh.data_tvector3f;
+ animatemodel_cache->data_normal3f = model->surfmesh.data_normal3f;
return;
}
- if(animatemodel_cache.progid != prog->id)
- memset(&animatemodel_cache, 0, sizeof(animatemodel_cache));
- need |= (animatemodel_cache.model != model);
- VM_GenerateFrameGroupBlend(ed->priv.server->framegroupblend, ed);
- VM_FrameBlendFromFrameGroupBlend(ed->priv.server->frameblend, ed->priv.server->framegroupblend, model);
- need |= (memcmp(&animatemodel_cache.frameblend, &ed->priv.server->frameblend, sizeof(ed->priv.server->frameblend))) != 0;
+ need |= (animatemodel_cache->model != model);
+ VM_GenerateFrameGroupBlend(prog, ed->priv.server->framegroupblend, ed);
+ VM_FrameBlendFromFrameGroupBlend(ed->priv.server->frameblend, ed->priv.server->framegroupblend, model, PRVM_serverglobalfloat(time));
+ need |= (memcmp(&animatemodel_cache->frameblend, &ed->priv.server->frameblend, sizeof(ed->priv.server->frameblend))) != 0;
skeletonindex = (int)PRVM_gameedictfloat(ed, skeletonindex) - 1;
if (!(skeletonindex >= 0 && skeletonindex < MAX_EDICTS && (skeleton = prog->skeletons[skeletonindex]) && skeleton->model->num_bones == ed->priv.server->skeleton.model->num_bones))
skeleton = NULL;
- need |= (animatemodel_cache.skeleton_p != skeleton);
+ need |= (animatemodel_cache->skeleton_p != skeleton);
if(skeleton)
- need |= (memcmp(&animatemodel_cache.skeleton, skeleton, sizeof(ed->priv.server->skeleton))) != 0;
+ need |= (memcmp(&animatemodel_cache->skeleton, skeleton, sizeof(ed->priv.server->skeleton))) != 0;
if(!need)
return;
- if(model->surfmesh.num_vertices > animatemodel_cache.max_vertices)
- {
- animatemodel_cache.max_vertices = model->surfmesh.num_vertices * 2;
- if(animatemodel_cache.buf_vertex3f) Mem_Free(animatemodel_cache.buf_vertex3f);
- if(animatemodel_cache.buf_svector3f) Mem_Free(animatemodel_cache.buf_svector3f);
- if(animatemodel_cache.buf_tvector3f) Mem_Free(animatemodel_cache.buf_tvector3f);
- if(animatemodel_cache.buf_normal3f) Mem_Free(animatemodel_cache.buf_normal3f);
- animatemodel_cache.buf_vertex3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache.max_vertices);
- animatemodel_cache.buf_svector3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache.max_vertices);
- animatemodel_cache.buf_tvector3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache.max_vertices);
- animatemodel_cache.buf_normal3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache.max_vertices);
- }
- animatemodel_cache.data_vertex3f = animatemodel_cache.buf_vertex3f;
- animatemodel_cache.data_svector3f = animatemodel_cache.buf_svector3f;
- animatemodel_cache.data_tvector3f = animatemodel_cache.buf_tvector3f;
- animatemodel_cache.data_normal3f = animatemodel_cache.buf_normal3f;
- VM_UpdateEdictSkeleton(ed, model, ed->priv.server->frameblend);
- model->AnimateVertices(model, ed->priv.server->frameblend, &ed->priv.server->skeleton, animatemodel_cache.data_vertex3f, animatemodel_cache.data_normal3f, animatemodel_cache.data_svector3f, animatemodel_cache.data_tvector3f);
- animatemodel_cache.progid = prog->id;
- animatemodel_cache.model = model;
- memcpy(&animatemodel_cache.frameblend, &ed->priv.server->frameblend, sizeof(ed->priv.server->frameblend));
- animatemodel_cache.skeleton_p = skeleton;
+ if(model->surfmesh.num_vertices > animatemodel_cache->max_vertices)
+ {
+ animatemodel_cache->max_vertices = model->surfmesh.num_vertices * 2;
+ if(animatemodel_cache->buf_vertex3f) Mem_Free(animatemodel_cache->buf_vertex3f);
+ if(animatemodel_cache->buf_svector3f) Mem_Free(animatemodel_cache->buf_svector3f);
+ if(animatemodel_cache->buf_tvector3f) Mem_Free(animatemodel_cache->buf_tvector3f);
+ if(animatemodel_cache->buf_normal3f) Mem_Free(animatemodel_cache->buf_normal3f);
+ animatemodel_cache->buf_vertex3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache->max_vertices);
+ animatemodel_cache->buf_svector3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache->max_vertices);
+ animatemodel_cache->buf_tvector3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache->max_vertices);
+ animatemodel_cache->buf_normal3f = (float *)Mem_Alloc(prog->progs_mempool, sizeof(float[3]) * animatemodel_cache->max_vertices);
+ }
+ animatemodel_cache->data_vertex3f = animatemodel_cache->buf_vertex3f;
+ animatemodel_cache->data_svector3f = animatemodel_cache->buf_svector3f;
+ animatemodel_cache->data_tvector3f = animatemodel_cache->buf_tvector3f;
+ animatemodel_cache->data_normal3f = animatemodel_cache->buf_normal3f;
+ VM_UpdateEdictSkeleton(prog, ed, model, ed->priv.server->frameblend);
+ model->AnimateVertices(model, ed->priv.server->frameblend, &ed->priv.server->skeleton, animatemodel_cache->data_vertex3f, animatemodel_cache->data_normal3f, animatemodel_cache->data_svector3f, animatemodel_cache->data_tvector3f);
+ animatemodel_cache->model = model;
+ memcpy(&animatemodel_cache->frameblend, &ed->priv.server->frameblend, sizeof(ed->priv.server->frameblend));
+ animatemodel_cache->skeleton_p = skeleton;
if(skeleton)
- memcpy(&animatemodel_cache.skeleton, skeleton, sizeof(ed->priv.server->skeleton));
+ memcpy(&animatemodel_cache->skeleton, skeleton, sizeof(ed->priv.server->skeleton));
}
-static void getmatrix(prvm_edict_t *ed, matrix4x4_t *out)
+static void getmatrix(prvm_prog_t *prog, prvm_edict_t *ed, matrix4x4_t *out)
{
- switch(PRVM_GetProgNr())
- {
- case PRVM_SERVERPROG:
- SV_GetEntityMatrix(ed, out, false);
- break;
- case PRVM_CLIENTPROG:
- CL_GetEntityMatrix(ed, out, false);
- break;
- default:
- *out = identitymatrix;
- break;
- }
+ if (prog == SVVM_prog)
+ SV_GetEntityMatrix(prog, ed, out, false);
+ else if (prog == CLVM_prog)
+ CL_GetEntityMatrix(prog, ed, out, false);
+ else
+ *out = identitymatrix;
}
-static void applytransform_forward(const vec3_t in, prvm_edict_t *ed, vec3_t out)
+static void applytransform_forward(prvm_prog_t *prog, const vec3_t in, prvm_edict_t *ed, vec3_t out)
{
matrix4x4_t m;
- getmatrix(ed, &m);
+ getmatrix(prog, ed, &m);
Matrix4x4_Transform(&m, in, out);
}
-static void applytransform_forward_direction(const vec3_t in, prvm_edict_t *ed, vec3_t out)
+static void applytransform_forward_direction(prvm_prog_t *prog, const vec3_t in, prvm_edict_t *ed, vec3_t out)
{
matrix4x4_t m;
- getmatrix(ed, &m);
+ getmatrix(prog, ed, &m);
Matrix4x4_Transform3x3(&m, in, out);
}
-static void applytransform_inverted(const vec3_t in, prvm_edict_t *ed, vec3_t out)
+static void applytransform_inverted(prvm_prog_t *prog, const vec3_t in, prvm_edict_t *ed, vec3_t out)
{
matrix4x4_t m, n;
- getmatrix(ed, &m);
+ getmatrix(prog, ed, &m);
Matrix4x4_Invert_Full(&n, &m);
Matrix4x4_Transform3x3(&n, in, out);
}
-static void applytransform_forward_normal(const vec3_t in, prvm_edict_t *ed, vec3_t out)
+static void applytransform_forward_normal(prvm_prog_t *prog, const vec3_t in, prvm_edict_t *ed, vec3_t out)
{
matrix4x4_t m;
float p[4];
- getmatrix(ed, &m);
+ getmatrix(prog, ed, &m);
Matrix4x4_TransformPositivePlane(&m, in[0], in[1], in[2], 0, p);
VectorCopy(p, out);
}
-static void clippointtosurface(prvm_edict_t *ed, dp_model_t *model, msurface_t *surface, vec3_t p, vec3_t out)
+static void clippointtosurface(prvm_prog_t *prog, prvm_edict_t *ed, model_t *model, msurface_t *surface, vec3_t p, vec3_t out)
{
int i, j, k;
float *v[3], facenormal[3], edgenormal[3], sidenormal[3], temp[3], offsetdist, dist, bestdist;
const int *e;
- animatemodel(model, ed);
+ animatemodel(prog, model, ed);
bestdist = 1000000000;
VectorCopy(p, out);
for (i = 0, e = (model->surfmesh.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] = animatemodel_cache.data_vertex3f + e[0] * 3;
- v[1] = animatemodel_cache.data_vertex3f + e[1] * 3;
- v[2] = animatemodel_cache.data_vertex3f + e[2] * 3;
+ v[0] = prog->animatemodel_cache->data_vertex3f + e[0] * 3;
+ v[1] = prog->animatemodel_cache->data_vertex3f + e[1] * 3;
+ v[2] = prog->animatemodel_cache->data_vertex3f + e[2] * 3;
TriangleNormal(v[0], v[1], v[2], facenormal);
VectorNormalize(facenormal);
offsetdist = DotProduct(v[0], facenormal) - DotProduct(p, facenormal);
}
}
-static msurface_t *getsurface(dp_model_t *model, int surfacenum)
+static msurface_t *getsurface(model_t *model, int surfacenum)
{
- if (surfacenum < 0 || surfacenum >= model->nummodelsurfaces)
+ if (surfacenum < 0 || surfacenum >= model->submodelsurfaces_end - model->submodelsurfaces_start)
return NULL;
- return model->data_surfaces + surfacenum + model->firstmodelsurface;
+ return model->data_surfaces + surfacenum + model->submodelsurfaces_start;
}
//PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints = #434;
-void VM_getsurfacenumpoints(void)
+void VM_getsurfacenumpoints(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
VM_SAFEPARMCOUNT(2, VM_getsurfacenumpoints);
// return 0 if no such surface
- if (!(model = getmodel(PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
{
PRVM_G_FLOAT(OFS_RETURN) = 0;
return;
PRVM_G_FLOAT(OFS_RETURN) = surface->num_vertices;
}
//PF_getsurfacepoint, // #435 vector(entity e, float s, float n) getsurfacepoint = #435;
-void VM_getsurfacepoint(void)
+void VM_getsurfacepoint(prvm_prog_t *prog)
{
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
int pointnum;
+ vec3_t result;
VM_SAFEPARMCOUNT(3, VM_getsurfacepoint);
VectorClear(PRVM_G_VECTOR(OFS_RETURN));
ed = PRVM_G_EDICT(OFS_PARM0);
- if (!(model = getmodel(ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
return;
// note: this (incorrectly) assumes it is a simple polygon
pointnum = (int)PRVM_G_FLOAT(OFS_PARM2);
if (pointnum < 0 || pointnum >= surface->num_vertices)
return;
- animatemodel(model, ed);
- applytransform_forward(&(animatemodel_cache.data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, PRVM_G_VECTOR(OFS_RETURN));
+ animatemodel(prog, model, ed);
+ applytransform_forward(prog, &(prog->animatemodel_cache->data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, result);
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
}
//PF_getsurfacepointattribute, // #486 vector(entity e, float s, float n, float a) getsurfacepointattribute = #486;
// float SPA_POSITION = 0;
// float SPA_TEXCOORDS0 = 4;
// float SPA_LIGHTMAP0_TEXCOORDS = 5;
// float SPA_LIGHTMAP0_COLOR = 6;
-void VM_getsurfacepointattribute(void)
+void VM_getsurfacepointattribute(prvm_prog_t *prog)
{
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
int pointnum;
int attributetype;
+ vec3_t result;
- VM_SAFEPARMCOUNT(4, VM_getsurfacepoint);
+ VM_SAFEPARMCOUNT(4, VM_getsurfacepointattribute);
VectorClear(PRVM_G_VECTOR(OFS_RETURN));
ed = PRVM_G_EDICT(OFS_PARM0);
- if (!(model = getmodel(ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
return;
pointnum = (int)PRVM_G_FLOAT(OFS_PARM2);
if (pointnum < 0 || pointnum >= surface->num_vertices)
return;
attributetype = (int) PRVM_G_FLOAT(OFS_PARM3);
- animatemodel(model, ed);
+ animatemodel(prog, model, ed);
switch( attributetype ) {
// float SPA_POSITION = 0;
case 0:
- applytransform_forward(&(animatemodel_cache.data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, PRVM_G_VECTOR(OFS_RETURN));
+ applytransform_forward(prog, &(prog->animatemodel_cache->data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, result);
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
break;
// float SPA_S_AXIS = 1;
case 1:
- applytransform_forward_direction(&(animatemodel_cache.data_svector3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, PRVM_G_VECTOR(OFS_RETURN));
+ applytransform_forward_direction(prog, &(prog->animatemodel_cache->data_svector3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, result);
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
break;
// float SPA_T_AXIS = 2;
case 2:
- applytransform_forward_direction(&(animatemodel_cache.data_tvector3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, PRVM_G_VECTOR(OFS_RETURN));
+ applytransform_forward_direction(prog, &(prog->animatemodel_cache->data_tvector3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, result);
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
break;
// float SPA_R_AXIS = 3; // same as SPA_NORMAL
case 3:
- applytransform_forward_direction(&(animatemodel_cache.data_normal3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, PRVM_G_VECTOR(OFS_RETURN));
+ applytransform_forward_direction(prog, &(prog->animatemodel_cache->data_normal3f + 3 * surface->num_firstvertex)[pointnum * 3], ed, result);
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
break;
// float SPA_TEXCOORDS0 = 4;
case 4: {
- float *ret = PRVM_G_VECTOR(OFS_RETURN);
float *texcoord = &(model->surfmesh.data_texcoordtexture2f + 2 * surface->num_firstvertex)[pointnum * 2];
- ret[0] = texcoord[0];
- ret[1] = texcoord[1];
- ret[2] = 0.0f;
+ result[0] = texcoord[0];
+ result[1] = texcoord[1];
+ result[2] = 0.0f;
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
break;
}
// float SPA_LIGHTMAP0_TEXCOORDS = 5;
case 5: {
- float *ret = PRVM_G_VECTOR(OFS_RETURN);
float *texcoord = &(model->surfmesh.data_texcoordlightmap2f + 2 * surface->num_firstvertex)[pointnum * 2];
- ret[0] = texcoord[0];
- ret[1] = texcoord[1];
- ret[2] = 0.0f;
+ result[0] = texcoord[0];
+ result[1] = texcoord[1];
+ result[2] = 0.0f;
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
break;
}
// float SPA_LIGHTMAP0_COLOR = 6;
}
}
//PF_getsurfacenormal, // #436 vector(entity e, float s) getsurfacenormal = #436;
-void VM_getsurfacenormal(void)
+void VM_getsurfacenormal(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
vec3_t normal;
+ vec3_t result;
VM_SAFEPARMCOUNT(2, VM_getsurfacenormal);
VectorClear(PRVM_G_VECTOR(OFS_RETURN));
- if (!(model = getmodel(PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
return;
// note: this only returns the first triangle, so it doesn't work very
// well for curved surfaces or arbitrary meshes
- animatemodel(model, PRVM_G_EDICT(OFS_PARM0));
- TriangleNormal((animatemodel_cache.data_vertex3f + 3 * surface->num_firstvertex), (animatemodel_cache.data_vertex3f + 3 * surface->num_firstvertex) + 3, (animatemodel_cache.data_vertex3f + 3 * surface->num_firstvertex) + 6, normal);
- applytransform_forward_normal(normal, PRVM_G_EDICT(OFS_PARM0), PRVM_G_VECTOR(OFS_RETURN));
- VectorNormalize(PRVM_G_VECTOR(OFS_RETURN));
+ animatemodel(prog, model, PRVM_G_EDICT(OFS_PARM0));
+ TriangleNormal((prog->animatemodel_cache->data_vertex3f + 3 * surface->num_firstvertex), (prog->animatemodel_cache->data_vertex3f + 3 * surface->num_firstvertex) + 3, (prog->animatemodel_cache->data_vertex3f + 3 * surface->num_firstvertex) + 6, normal);
+ applytransform_forward_normal(prog, normal, PRVM_G_EDICT(OFS_PARM0), result);
+ VectorNormalize(result);
+ VectorCopy(result, PRVM_G_VECTOR(OFS_RETURN));
}
//PF_getsurfacetexture, // #437 string(entity e, float s) getsurfacetexture = #437;
-void VM_getsurfacetexture(void)
+void VM_getsurfacetexture(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
VM_SAFEPARMCOUNT(2, VM_getsurfacetexture);
PRVM_G_INT(OFS_RETURN) = OFS_NULL;
- if (!(model = getmodel(PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
return;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(surface->texture->name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, surface->texture->name);
}
//PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
-void VM_getsurfacenearpoint(void)
+void VM_getsurfacenearpoint(prvm_prog_t *prog)
{
int surfacenum, best;
vec3_t clipped, p;
vec_t dist, bestdist;
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
- vec_t *point;
+ vec3_t point;
VM_SAFEPARMCOUNT(2, VM_getsurfacenearpoint);
PRVM_G_FLOAT(OFS_RETURN) = -1;
ed = PRVM_G_EDICT(OFS_PARM0);
- point = PRVM_G_VECTOR(OFS_PARM1);
+ VectorCopy(PRVM_G_VECTOR(OFS_PARM1), point);
if (!ed || ed->priv.server->free)
return;
- model = getmodel(ed);
+ model = getmodel(prog, ed);
if (!model || !model->num_surfaces)
return;
- animatemodel(model, ed);
+ animatemodel(prog, model, ed);
- applytransform_inverted(point, ed, p);
+ applytransform_inverted(prog, point, ed, p);
best = -1;
bestdist = 1000000000;
- for (surfacenum = 0;surfacenum < model->nummodelsurfaces;surfacenum++)
+ for (surfacenum = model->submodelsurfaces_start;surfacenum < model->submodelsurfaces_end;surfacenum++)
{
- surface = model->data_surfaces + surfacenum + model->firstmodelsurface;
+ surface = model->data_surfaces + surfacenum;
// 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];
if (dist < bestdist)
{
// it is, check the nearest point on the actual geometry
- clippointtosurface(ed, model, surface, p, clipped);
+ clippointtosurface(prog, ed, model, surface, p, clipped);
VectorSubtract(clipped, p, clipped);
dist += VectorLength2(clipped);
if (dist < bestdist)
{
// that's closer too, store it as the best match
- best = surfacenum;
+ best = surfacenum - model->submodelsurfaces_start;
bestdist = dist;
}
}
PRVM_G_FLOAT(OFS_RETURN) = best;
}
//PF_getsurfaceclippedpoint, // #439 vector(entity e, float s, vector p) getsurfaceclippedpoint = #439;
-void VM_getsurfaceclippedpoint(void)
+void VM_getsurfaceclippedpoint(prvm_prog_t *prog)
{
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
- vec3_t p, out;
- VM_SAFEPARMCOUNT(3, VM_te_getsurfaceclippedpoint);
+ vec3_t p, out, inp;
+ VM_SAFEPARMCOUNT(3, VM_getsurfaceclippedpoint);
VectorClear(PRVM_G_VECTOR(OFS_RETURN));
ed = PRVM_G_EDICT(OFS_PARM0);
- if (!(model = getmodel(ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
return;
- animatemodel(model, ed);
- applytransform_inverted(PRVM_G_VECTOR(OFS_PARM2), ed, p);
- clippointtosurface(ed, model, surface, p, out);
+ animatemodel(prog, model, ed);
+ VectorCopy(PRVM_G_VECTOR(OFS_PARM2), inp);
+ applytransform_inverted(prog, inp, ed, p);
+ clippointtosurface(prog, ed, model, surface, p, out);
VectorAdd(out, PRVM_serveredictvector(ed, origin), PRVM_G_VECTOR(OFS_RETURN));
}
//PF_getsurfacenumtriangles, // #??? float(entity e, float s) getsurfacenumtriangles = #???;
-void VM_getsurfacenumtriangles(void)
+void VM_getsurfacenumtriangles(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
- VM_SAFEPARMCOUNT(2, VM_SV_getsurfacenumtriangles);
+ VM_SAFEPARMCOUNT(2, VM_getsurfacenumtriangles);
// return 0 if no such surface
- if (!(model = getmodel(PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
{
PRVM_G_FLOAT(OFS_RETURN) = 0;
return;
}
- // note: this (incorrectly) assumes it is a simple polygon
PRVM_G_FLOAT(OFS_RETURN) = surface->num_triangles;
}
//PF_getsurfacetriangle, // #??? vector(entity e, float s, float n) getsurfacetriangle = #???;
-void VM_getsurfacetriangle(void)
+void VM_getsurfacetriangle(prvm_prog_t *prog)
{
const vec3_t d = {-1, -1, -1};
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
int trinum;
- VM_SAFEPARMCOUNT(3, VM_SV_getsurfacetriangle);
+ VM_SAFEPARMCOUNT(3, VM_getsurfacetriangle);
VectorClear(PRVM_G_VECTOR(OFS_RETURN));
ed = PRVM_G_EDICT(OFS_PARM0);
- if (!(model = getmodel(ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+ if (!(model = getmodel(prog, ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
return;
trinum = (int)PRVM_G_FLOAT(OFS_PARM2);
if (trinum < 0 || trinum >= surface->num_triangles)
// physics builtins
//
-void World_Physics_ApplyCmd(prvm_edict_t *ed, edict_odefunc_t *f);
+#define VM_physics_ApplyCmd(ed,f) if (!ed->priv.server->ode_body) VM_physics_newstackfunction(prog, ed, f); else World_Physics_ApplyCmd(ed, f)
-#define VM_physics_ApplyCmd(ed,f) if (!ed->priv.server->ode_body) VM_physics_newstackfunction(ed, f); else World_Physics_ApplyCmd(ed, f)
-
-edict_odefunc_t *VM_physics_newstackfunction(prvm_edict_t *ed, edict_odefunc_t *f)
+static edict_odefunc_t *VM_physics_newstackfunction(prvm_prog_t *prog, prvm_edict_t *ed, edict_odefunc_t *f)
{
edict_odefunc_t *newfunc, *func;
}
// void(entity e, float physics_enabled) physics_enable = #;
-void VM_physics_enable(void)
+void VM_physics_enable(prvm_prog_t *prog)
{
prvm_edict_t *ed;
edict_odefunc_t f;
if (!ed)
{
if (developer.integer > 0)
- VM_Warning("VM_physics_enable: null entity!\n");
+ VM_Warning(prog, "VM_physics_enable: null entity!\n");
return;
}
// entity should have MOVETYPE_PHYSICS already set, this can damage memory (making leaked allocation) so warn about this even if non-developer
if (PRVM_serveredictfloat(ed, movetype) != MOVETYPE_PHYSICS)
{
- VM_Warning("VM_physics_enable: entity is not MOVETYPE_PHYSICS!\n");
+ VM_Warning(prog, "VM_physics_enable: entity is not MOVETYPE_PHYSICS!\n");
return;
}
f.type = PRVM_G_FLOAT(OFS_PARM1) == 0 ? ODEFUNC_DISABLE : ODEFUNC_ENABLE;
}
// void(entity e, vector force, vector relative_ofs) physics_addforce = #;
-void VM_physics_addforce(void)
+void VM_physics_addforce(prvm_prog_t *prog)
{
prvm_edict_t *ed;
edict_odefunc_t f;
if (!ed)
{
if (developer.integer > 0)
- VM_Warning("VM_physics_addforce: null entity!\n");
+ VM_Warning(prog, "VM_physics_addforce: null entity!\n");
return;
}
// entity should have MOVETYPE_PHYSICS already set, this can damage memory (making leaked allocation) so warn about this even if non-developer
if (PRVM_serveredictfloat(ed, movetype) != MOVETYPE_PHYSICS)
{
- VM_Warning("VM_physics_addforce: entity is not MOVETYPE_PHYSICS!\n");
+ VM_Warning(prog, "VM_physics_addforce: entity is not MOVETYPE_PHYSICS!\n");
return;
}
- f.type = ODEFUNC_RELFORCEATPOS;
+ f.type = ODEFUNC_FORCE;
VectorCopy(PRVM_G_VECTOR(OFS_PARM1), f.v1);
- VectorSubtract(PRVM_serveredictvector(ed, origin), PRVM_G_VECTOR(OFS_PARM2), f.v2);
+ VectorCopy(PRVM_G_VECTOR(OFS_PARM2), f.v2);
VM_physics_ApplyCmd(ed, &f);
}
// void(entity e, vector torque) physics_addtorque = #;
-void VM_physics_addtorque(void)
+void VM_physics_addtorque(prvm_prog_t *prog)
{
prvm_edict_t *ed;
edict_odefunc_t f;
if (!ed)
{
if (developer.integer > 0)
- VM_Warning("VM_physics_addtorque: null entity!\n");
+ VM_Warning(prog, "VM_physics_addtorque: null entity!\n");
return;
}
// entity should have MOVETYPE_PHYSICS already set, this can damage memory (making leaked allocation) so warn about this even if non-developer
if (PRVM_serveredictfloat(ed, movetype) != MOVETYPE_PHYSICS)
{
- VM_Warning("VM_physics_addtorque: entity is not MOVETYPE_PHYSICS!\n");
+ VM_Warning(prog, "VM_physics_addtorque: entity is not MOVETYPE_PHYSICS!\n");
return;
}
- f.type = ODEFUNC_RELTORQUE;
+ f.type = ODEFUNC_TORQUE;
VectorCopy(PRVM_G_VECTOR(OFS_PARM1), f.v1);
VM_physics_ApplyCmd(ed, &f);
}
+
+extern cvar_t prvm_coverage;
+void VM_coverage(prvm_prog_t *prog)
+{
+ VM_SAFEPARMCOUNT(0, VM_coverage);
+ if (prog->explicit_profile[prog->xstatement]++ == 0 && (prvm_coverage.integer & 2))
+ PRVM_ExplicitCoverageEvent(prog, prog->xfunction, prog->xstatement);
+}
projects / xonotic / darkplaces.git / blobdiff