// cause large (I think they will) parts are from pr_cmds the same copyright like in pr_cmds
// also applies here
+#include "prvm_cmds.h"
+#include <time.h>
-/*
-============================================================================
-common cmd list:
-=================
-
- checkextension(string)
- error(...[string])
- objerror(...[string)
- print(...[strings])
- bprint(...[string])
- sprint(float clientnum,...[string])
- centerprint(...[string])
-vector normalize(vector)
-float vlen(vector)
-float vectoyaw(vector)
-vector vectoangles(vector)
-float random()
- cmd(string)
- float cvar (string)
- cvar_set (string,string)
- dprint(...[string])
-string ftos(float)
-float fabs(float)
-string vtos(vector)
-string etos(entity)
-float stof(...[string])
-entity spawn()
- remove(entity e)
-entity find(entity start, .string field, string match)
-
-entity findfloat(entity start, .float field, float match)
-entity findentity(entity start, .entity field, entity match)
-
-entity findchain(.string field, string match)
-
-entity findchainfloat(.string field, float match)
-entity findchainentity(.string field, entity match)
-
-string precache_file(string)
-string precache_sound (string sample)
- coredump()
- traceon()
- traceoff()
- eprint(entity e)
-float rint(float)
-float floor(float)
-float ceil(float)
-entity nextent(entity)
-float sin(float)
-float cos(float)
-float sqrt(float)
-vector randomvec()
-float registercvar (string name, string value, float flags)
-float min(float a, float b, ...[float])
-float max(float a, float b, ...[float])
-float bound(float min, float value, float max)
-float pow(float a, float b)
- copyentity(entity src, entity dst)
-float fopen(string filename, float mode)
- fclose(float fhandle)
-string fgets(float fhandle)
- fputs(float fhandle, string s)
-float strlen(string s)
-string strcat(string,string,...[string])
-string substring(string s, float start, float length)
-vector stov(string s)
-string strzone(string s)
- strunzone(string s)
-float tokenize(string s)
-string argv(float n)
-float isserver()
-float clientcount()
-float clientstate()
- clientcommand(float client, string s) (for client and menu)
- changelevel(string map)
- localsound(string sample)
-vector getmousepos()
-float gettime()
- loadfromdata(string data)
- loadfromfile(string file)
-float mod(float val, float m)
-const string str_cvar (string)
- crash()
- stackdump()
-
-float search_begin(string pattern, float caseinsensitive, float quiet)
-void search_end(float handle)
-float search_getsize(float handle)
-string search_getfilename(float handle, float num)
-
-string chr(float ascii)
-
-float itof(intt ent)
-intt ftoi(float num)
-
-float altstr_count(string)
-string altstr_prepare(string)
-string altstr_get(string,float)
-string altstr_set(string altstr, float num, string set)
-string altstr_ins(string altstr, float num, string set)
-
-perhaps only : Menu : WriteMsg
-===============================
-
- WriteByte(float data, float dest, float desto)
- WriteChar(float data, float dest, float desto)
- WriteShort(float data, float dest, float desto)
- WriteLong(float data, float dest, float desto)
- WriteAngle(float data, float dest, float desto)
- WriteCoord(float data, float dest, float desto)
- WriteString(string data, float dest, float desto)
- WriteEntity(entity data, float dest, float desto)
-
-Client & Menu : draw functions & video functions
-===================================================
-
-float iscachedpic(string pic)
-string precache_pic(string pic)
- freepic(string s)
-float drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag)
-float drawstring(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-float drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag)
-float drawfill(vector position, vector size, vector rgb, float alpha, float flag)
- drawsetcliparea(float x, float y, float width, float height)
- drawresetcliparea()
-vector getimagesize(string pic)
-
-float cin_open(string file, string name)
-void cin_close(string name)
-void cin_setstate(string name, float type)
-float cin_getstate(string name)
-void cin_restart(string name)
-
-==============================================================================
-menu cmd list:
-===============
-
- setkeydest(float dest)
-float getkeydest()
- setmousetarget(float target)
-float getmousetarget()
-
- callfunction(...,string function_name)
- writetofile(float fhandle, entity ent)
-float isfunction(string function_name)
-vector getresolution(float number)
-string keynumtostring(float keynum)
-string findkeysforcommand(string command)
-float getserverliststat(float type)
-string getserverliststring(float fld, float hostnr)
-
- parseentitydata(entity ent, string data)
-
-float stringtokeynum(string key)
-
- resetserverlistmasks()
- setserverlistmaskstring(float mask, float fld, string str)
- setserverlistmasknumber(float mask, float fld, float num, float op)
- resortserverlist()
- setserverlistsort(float field, float descending)
- refreshserverlist()
-float getserverlistnumber(float fld, float hostnr)
-float getserverlistindexforkey(string key)
- addwantedserverlistkey(string key)
-*/
-
-#include "quakedef.h"
-#include "progdefs.h"
-#include "progsvm.h"
-#include "clprogdefs.h"
-#include "mprogdefs.h"
-
-#include "cl_video.h"
-
-//============================================================================
-// nice helper macros
+// 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, ...)
+{
+ va_list argptr;
+ char msg[MAX_INPUTLINE];
-#ifndef VM_NOPARMCHECK
-#define VM_SAFEPARMCOUNT(p,f) if(prog->argc != p) PRVM_ERROR(#f " wrong parameter count (" #p " expected ) !\n")
-#else
-#define VM_SAFEPARMCOUNT(p,f)
-#endif
+ va_start(argptr,fmt);
+ dpvsnprintf(msg,sizeof(msg),fmt,argptr);
+ va_end(argptr);
-#define VM_RETURN_EDICT(e) (((int *)prog->globals)[OFS_RETURN] = PRVM_EDICT_TO_PROG(e))
+ Con_Print(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]
+ //PRVM_PrintState();
+}
-#define e10 0,0,0,0,0,0,0,0,0,0
-#define e100 e10,e10,e10,e10,e10,e10,e10,e10,e10,e10
-#define e1000 e100,e100,e100,e100,e100,e100,e100,e100,e100,e100
//============================================================================
// Common
-// temp string handling
-// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
-#define VM_STRINGTEMP_BUFFERS 16
-#define VM_STRINGTEMP_LENGTH 4096
-static char vm_string_temp[VM_STRINGTEMP_BUFFERS][VM_STRINGTEMP_LENGTH];
-static int vm_string_tempindex = 0;
-
-// qc file handling
-#define MAX_VMFILES 256
-#define MAX_PRVMFILES MAX_VMFILES * PRVM_MAXPROGS
-#define VM_FILES ((qfile_t**)(vm_files + PRVM_GetProgNr() * MAX_VMFILES))
-
-qfile_t *vm_files[MAX_PRVMFILES];
-
-// qc fs search handling
-#define MAX_VMSEARCHES 128
-#define TOTAL_VMSEARCHES MAX_VMSEARCHES * PRVM_MAXPROGS
-#define VM_SEARCHLIST ((fssearch_t**)(vm_fssearchlist + PRVM_GetProgNr() * MAX_VMSEARCHES))
-
-fssearch_t *vm_fssearchlist[TOTAL_VMSEARCHES];
-
-static char *VM_GetTempString(void)
-{
- char *s;
- s = vm_string_temp[vm_string_tempindex];
- vm_string_tempindex = (vm_string_tempindex + 1) % VM_STRINGTEMP_BUFFERS;
- return s;
-}
+// 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]
void VM_CheckEmptyString (const char *s)
{
{
int len;
char *e, *start;
- len = strlen(name);
+ len = (int)strlen(name);
for (e = prog->extensionstring;*e;e++)
{
start = e;
while (*e && *e != ' ')
e++;
- if (e - start == len)
- if (!strncasecmp(start, name, len))
- {
- return true;
- }
+ if ((e - start) == len && !strncasecmp(start, name, len))
+ return true;
}
return false;
}
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);
- if(prog->self)
+ Con_Printf("======%s ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+ if (prog->globaloffsets.self >= 0)
{
- ed = PRVM_G_EDICT(prog->self->ofs);
+ ed = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict);
PRVM_ED_Print(ed);
}
- PRVM_ERROR ("%s: Program error", PRVM_NAME);
+ 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);
}
/*
char string[VM_STRINGTEMP_LENGTH];
VM_VarString(0, string, sizeof(string));
- Con_Printf("======%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
- if(prog->self)
+ Con_Printf("======OBJECT ERROR======\n"); // , PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); // or include them? FIXME
+ if (prog->globaloffsets.self >= 0)
{
- ed = PRVM_G_EDICT (prog->self->ofs);
+ ed = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict);
PRVM_ED_Print(ed);
PRVM_ED_Free (ed);
}
else
// objerror has to display the object fields -> else call
- PRVM_ERROR ("VM_objecterror: self not defined !\n");
+ PRVM_ERROR ("VM_objecterror: self not defined !");
+ 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);
}
/*
=================
-VM_print (actually used only by client and menu)
+VM_print
print to console
-print(string)
+print(...[string])
=================
*/
void VM_print (void)
if(!sv.active)
{
- Con_Printf("VM_bprint: game is not server(%s) !\n", PRVM_NAME);
+ VM_Warning("VM_bprint: game is not server(%s) !\n", PRVM_NAME);
return;
}
int clientnum;
char string[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_sprint);
+
//find client for this entity
- clientnum = PRVM_G_FLOAT(OFS_PARM0);
+ clientnum = (int)PRVM_G_FLOAT(OFS_PARM0);
if (!sv.active || clientnum < 0 || clientnum >= svs.maxclients || !svs.clients[clientnum].active)
{
- Con_Printf("VM_sprint: %s: invalid client or server is not active !\n", PRVM_NAME);
+ VM_Warning("VM_sprint: %s: invalid client or server is not active !\n", PRVM_NAME);
return;
}
client = svs.clients + clientnum;
+ if (!client->netconnection)
+ return;
+
VM_VarString(1, string, sizeof(string));
- MSG_WriteChar(&client->message,svc_print);
- MSG_WriteString(&client->message, string);
+ MSG_WriteChar(&client->netconnection->message,svc_print);
+ MSG_WriteString(&client->netconnection->message, string);
}
/*
single print to the screen
-centerprint(clientent, value)
+centerprint(value)
=================
*/
void VM_centerprint (void)
{
char string[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_centerprint);
VM_VarString(0, string, sizeof(string));
SCR_CenterPrint(string);
}
{
float *value1;
vec3_t newvalue;
- float new;
+ double f;
VM_SAFEPARMCOUNT(1,VM_normalize);
value1 = PRVM_G_VECTOR(OFS_PARM0);
- new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2];
- new = sqrt(new);
-
- if (new == 0)
- newvalue[0] = newvalue[1] = newvalue[2] = 0;
- else
+ f = VectorLength2(value1);
+ if (f)
{
- new = 1/new;
- newvalue[0] = value1[0] * new;
- newvalue[1] = value1[1] * new;
- newvalue[2] = value1[2] * new;
+ f = 1.0 / sqrt(f);
+ VectorScale(value1, f, newvalue);
}
+ else
+ VectorClear(newvalue);
VectorCopy (newvalue, PRVM_G_VECTOR(OFS_RETURN));
}
*/
void VM_vlen (void)
{
- float *value1;
- float new;
-
VM_SAFEPARMCOUNT(1,VM_vlen);
-
- value1 = PRVM_G_VECTOR(OFS_PARM0);
-
- new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2];
- new = sqrt(new);
-
- PRVM_G_FLOAT(OFS_RETURN) = new;
+ PRVM_G_FLOAT(OFS_RETURN) = VectorLength(PRVM_G_VECTOR(OFS_PARM0));
}
/*
yaw = 270;
forward = sqrt(value1[0]*value1[0] + value1[1]*value1[1]);
- pitch = (int) (atan2(value1[2], forward) * 180 / M_PI);
+ pitch = (atan2(value1[2], forward) * 180 / M_PI);
if (pitch < 0)
pitch += 360;
}
PRVM_G_FLOAT(OFS_RETURN) = lhrandom(0, 1);
}
-/*
-=================
-PF_sound
-
-Each entity can have eight independant sound sources, like voice,
-weapon, feet, etc.
-
-Channel 0 is an auto-allocate channel, the others override anything
-already running on that entity/channel pair.
-
-An attenuation of 0 will play full volume everywhere in the level.
-Larger attenuations will drop off.
-
-=================
-*/
-/*
-void PF_sound (void)
-{
- char *sample;
- int channel;
- edict_t *entity;
- int volume;
- float attenuation;
-
- entity = G_EDICT(OFS_PARM0);
- channel = G_FLOAT(OFS_PARM1);
- sample = G_STRING(OFS_PARM2);
- volume = G_FLOAT(OFS_PARM3) * 255;
- attenuation = G_FLOAT(OFS_PARM4);
-
- if (volume < 0 || volume > 255)
- Host_Error ("SV_StartSound: volume = %i", volume);
-
- if (attenuation < 0 || attenuation > 4)
- Host_Error ("SV_StartSound: attenuation = %f", attenuation);
-
- if (channel < 0 || channel > 7)
- Host_Error ("SV_StartSound: channel = %i", channel);
-
- SV_StartSound (entity, channel, sample, volume, attenuation);
-}
-*/
-
/*
=========
VM_localsound
if(!S_LocalSound (s))
{
- Con_Printf("VM_localsound: Failed to play %s for %s !\n", s, PRVM_NAME);
PRVM_G_FLOAT(OFS_RETURN) = -4;
+ VM_Warning("VM_localsound: Failed to play %s for %s !\n", s, PRVM_NAME);
return;
}
Sends text over to the client's execution buffer
-[localcmd (string) or]
-cmd (string)
+[localcmd (string, ...) or]
+cmd (string, ...)
=================
*/
void VM_localcmd (void)
{
- VM_SAFEPARMCOUNT(1,VM_localcmd);
-
- Cbuf_AddText(PRVM_G_STRING(OFS_PARM0));
+ char string[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd);
+ VM_VarString(0, string, sizeof(string));
+ Cbuf_AddText(string);
}
/*
/*
=================
-VM_str_cvar
+VM_cvar_string
-const string str_cvar (string)
+const string VM_cvar_string (string)
=================
*/
-void VM_str_cvar(void)
+void VM_cvar_string(void)
{
- char *out;
const char *name;
- const char *cvar_string;
- VM_SAFEPARMCOUNT(1,VM_str_cvar);
+ VM_SAFEPARMCOUNT(1,VM_cvar_string);
name = PRVM_G_STRING(OFS_PARM0);
- if(!name)
- PRVM_ERROR("VM_str_cvar: %s: null string\n", PRVM_NAME);
-
VM_CheckEmptyString(name);
- out = VM_GetTempString();
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableString(name));
+}
- cvar_string = Cvar_VariableString(name);
- strcpy(out, cvar_string);
+/*
+========================
+VM_cvar_defstring
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(out);
-}
+const string VM_cvar_defstring (string)
+========================
+*/
+void VM_cvar_defstring (void)
+{
+ const char *name;
+ VM_SAFEPARMCOUNT(1,VM_cvar_string);
+
+ name = PRVM_G_STRING(OFS_PARM0);
+
+ VM_CheckEmptyString(name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableDefString(name));
+}
/*
=================
VM_cvar_set
void VM_dprint (void)
{
char string[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_dprint);
if (developer.integer)
{
VM_VarString(0, string, sizeof(string));
+#if 1
+ Con_Printf("%s", string);
+#else
Con_Printf("%s: %s", PRVM_NAME, string);
+#endif
}
}
void VM_ftos (void)
{
float v;
- char *s;
+ char s[128];
VM_SAFEPARMCOUNT(1, VM_ftos);
v = PRVM_G_FLOAT(OFS_PARM0);
- s = VM_GetTempString();
if ((float)((int)v) == v)
sprintf(s, "%i", (int)v);
else
sprintf(s, "%f", v);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
}
/*
void VM_vtos (void)
{
- char *s;
+ char s[512];
VM_SAFEPARMCOUNT(1,VM_vtos);
- s = VM_GetTempString();
sprintf (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_SetEngineString(s);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
}
/*
void VM_etos (void)
{
- char *s;
+ char s[128];
VM_SAFEPARMCOUNT(1, VM_etos);
- s = VM_GetTempString();
sprintf (s, "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
}
/*
void VM_stof(void)
{
char string[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_stof);
VM_VarString(0, string, sizeof(string));
PRVM_G_FLOAT(OFS_RETURN) = atof(string);
}
/*
========================
-VM_itoe
+VM_ftoe
-intt ftoi(float num)
+entity ftoe(float num)
========================
*/
-void VM_ftoi(void)
+void VM_ftoe(void)
{
int ent;
- VM_SAFEPARMCOUNT(1, VM_ftoi);
+ VM_SAFEPARMCOUNT(1, VM_ftoe);
- ent = PRVM_G_FLOAT(OFS_PARM0);
- if(PRVM_PROG_TO_EDICT(ent)->p.e->free)
- PRVM_ERROR ("VM_ftoe: %s tried to access a freed entity (entity %i)!\n", PRVM_NAME, ent);
+ ent = (int)PRVM_G_FLOAT(OFS_PARM0);
+ if (ent < 0 || ent >= MAX_EDICTS || PRVM_PROG_TO_EDICT(ent)->priv.required->free)
+ ent = 0; // return world instead of a free or invalid entity
PRVM_G_INT(OFS_RETURN) = ent;
}
+/*
+=========
+VM_strftime
+
+string strftime(float uselocaltime, string[, string ...])
+=========
+*/
+void VM_strftime(void)
+{
+ time_t t;
+ struct tm *tm;
+ char fmt[VM_STRINGTEMP_LENGTH];
+ char result[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(2, 8, VM_strftime);
+ VM_VarString(1, fmt, sizeof(fmt));
+ t = time(NULL);
+ if (PRVM_G_FLOAT(OFS_PARM0))
+ tm = localtime(&t);
+ else
+ tm = gmtime(&t);
+ if (!tm)
+ {
+ PRVM_G_FLOAT(OFS_RETURN) = 0;
+ return;
+ }
+ strftime(result, sizeof(result), fmt, tm);
+ PRVM_G_FLOAT(OFS_RETURN) = PRVM_SetTempString(result);
+}
+
/*
=========
VM_spawn
void VM_spawn (void)
{
prvm_edict_t *ed;
+ VM_SAFEPARMCOUNT(0, VM_spawn);
prog->xfunction->builtinsprofile += 20;
ed = PRVM_ED_Alloc();
VM_RETURN_EDICT(ed);
VM_SAFEPARMCOUNT(1, VM_remove);
ed = PRVM_G_EDICT(OFS_PARM0);
+ if( PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts )
+ {
+ if (developer.integer >= 1)
+ VM_Warning( "VM_remove: tried to remove the null entity or a reserved entity!\n" );
+ }
+ else if( ed->priv.required->free )
+ {
+ if (developer.integer >= 1)
+ VM_Warning( "VM_remove: tried to remove an already freed entity!\n" );
+ }
+ else
+ PRVM_ED_Free (ed);
// if (ed == prog->edicts)
-// PRVM_ERROR ("remove: tried to remove world\n");
+// PRVM_ERROR ("remove: tried to remove world");
// if (PRVM_NUM_FOR_EDICT(ed) <= sv.maxclients)
-// Host_Error("remove: tried to remove a client\n");
- PRVM_ED_Free (ed);
+// Host_Error("remove: tried to remove a client");
}
/*
f = PRVM_G_INT(OFS_PARM1);
s = PRVM_G_STRING(OFS_PARM2);
- if (!s || !s[0])
- {
- // return reserved edict 0 (could be used for whatever the prog wants)
- VM_RETURN_EDICT(prog->edicts);
- return;
- }
+ // LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
+ // expects it to find all the monsters, so we must be careful to support
+ // searching for ""
for (e++ ; e < prog->num_edicts ; e++)
{
prog->xfunction->builtinsprofile++;
ed = PRVM_EDICT_NUM(e);
- if (ed->p.e->free)
+ if (ed->priv.required->free)
continue;
t = PRVM_E_STRING(ed,f);
if (!t)
- continue;
+ t = "";
if (!strcmp(t,s))
{
VM_RETURN_EDICT(ed);
{
prog->xfunction->builtinsprofile++;
ed = PRVM_EDICT_NUM(e);
- if (ed->p.e->free)
+ if (ed->priv.required->free)
continue;
if (PRVM_E_FLOAT(ed,f) == s)
{
entity findchain(.string field, string match)
=========
*/
-int PRVM_ED_FindFieldOffset(const char *field);
// chained search for strings in entity fields
// entity(.string field, string match) findchain = #402;
void VM_findchain (void)
{
int i;
int f;
- int chain_of;
const char *s, *t;
prvm_edict_t *ent, *chain;
VM_SAFEPARMCOUNT(2,VM_findchain);
- // is the same like !(prog->flag & PRVM_FE_CHAIN) - even if the operator precedence is another
- if(!prog->flag & PRVM_FE_CHAIN)
- PRVM_ERROR("VM_findchain: %s doesnt have a chain field !\n", PRVM_NAME);
-
- chain_of = PRVM_ED_FindFieldOffset ("chain");
+ if (prog->fieldoffsets.chain < 0)
+ PRVM_ERROR("VM_findchain: %s doesnt have a chain field !", PRVM_NAME);
chain = prog->edicts;
f = PRVM_G_INT(OFS_PARM0);
s = PRVM_G_STRING(OFS_PARM1);
- if (!s || !s[0])
- {
- VM_RETURN_EDICT(prog->edicts);
- return;
- }
+
+ // LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
+ // expects it to find all the monsters, so we must be careful to support
+ // searching for ""
ent = PRVM_NEXT_EDICT(prog->edicts);
for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
{
prog->xfunction->builtinsprofile++;
- if (ent->p.e->free)
+ if (ent->priv.required->free)
continue;
t = PRVM_E_STRING(ent,f);
if (!t)
- continue;
+ t = "";
if (strcmp(t,s))
continue;
- PRVM_E_INT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain);
+ PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_NUM_FOR_EDICT(chain);
chain = ent;
}
{
int i;
int f;
- int chain_of;
float s;
prvm_edict_t *ent, *chain;
VM_SAFEPARMCOUNT(2, VM_findchainfloat);
- if(!prog->flag & PRVM_FE_CHAIN)
- PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !\n", PRVM_NAME);
-
- chain_of = PRVM_ED_FindFieldOffset ("chain");
+ if (prog->fieldoffsets.chain < 0)
+ PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !", PRVM_NAME);
chain = (prvm_edict_t *)prog->edicts;
for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
{
prog->xfunction->builtinsprofile++;
- if (ent->p.e->free)
+ if (ent->priv.required->free)
continue;
if (PRVM_E_FLOAT(ent,f) != s)
continue;
- PRVM_E_INT(ent,chain_of) = PRVM_EDICT_TO_PROG(chain);
+ PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
chain = ent;
}
}
/*
-=========
-VM_precache_file
+========================
+VM_findflags
-string precache_file(string)
-=========
+entity findflags(entity start, .float field, float match)
+========================
*/
-void VM_precache_file (void)
-{ // precache_file is only used to copy files with qcc, it does nothing
- VM_SAFEPARMCOUNT(1,VM_precache_file);
+// LordHavoc: search for flags in float fields
+void VM_findflags (void)
+{
+ int e;
+ int f;
+ int s;
+ prvm_edict_t *ed;
- PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
+ VM_SAFEPARMCOUNT(3, VM_findflags);
+
+
+ e = PRVM_G_EDICTNUM(OFS_PARM0);
+ f = PRVM_G_INT(OFS_PARM1);
+ s = (int)PRVM_G_FLOAT(OFS_PARM2);
+
+ for (e++ ; e < prog->num_edicts ; e++)
+ {
+ prog->xfunction->builtinsprofile++;
+ ed = PRVM_EDICT_NUM(e);
+ if (ed->priv.required->free)
+ continue;
+ if (!PRVM_E_FLOAT(ed,f))
+ continue;
+ if ((int)PRVM_E_FLOAT(ed,f) & s)
+ {
+ VM_RETURN_EDICT(ed);
+ return;
+ }
+ }
+
+ VM_RETURN_EDICT(prog->edicts);
}
/*
-=========
-VM_preache_error
+========================
+VM_findchainflags
-used instead of the other VM_precache_* functions in the builtin list
-=========
+entity findchainflags(.float field, float match)
+========================
*/
-
-void VM_precache_error (void)
+// LordHavoc: chained search for flags in float fields
+void VM_findchainflags (void)
{
- PRVM_ERROR ("PF_Precache_*: Precache can only be done in spawn functions");
+ int i;
+ int f;
+ int s;
+ prvm_edict_t *ent, *chain;
+
+ VM_SAFEPARMCOUNT(2, VM_findchainflags);
+
+ if (prog->fieldoffsets.chain < 0)
+ PRVM_ERROR("VM_findchainflags: %s doesnt have a chain field !", PRVM_NAME);
+
+ chain = (prvm_edict_t *)prog->edicts;
+
+ f = PRVM_G_INT(OFS_PARM0);
+ s = (int)PRVM_G_FLOAT(OFS_PARM1);
+
+ ent = PRVM_NEXT_EDICT(prog->edicts);
+ for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
+ {
+ prog->xfunction->builtinsprofile++;
+ if (ent->priv.required->free)
+ continue;
+ if (!PRVM_E_FLOAT(ent,f))
+ continue;
+ if (!((int)PRVM_E_FLOAT(ent,f) & s))
+ continue;
+
+ PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
+ chain = ent;
+ }
+
+ VM_RETURN_EDICT(chain);
}
/*
*/
void VM_precache_sound (void)
{
- const char *s;
+ const char *s;
VM_SAFEPARMCOUNT(1, VM_precache_sound);
s = PRVM_G_STRING(OFS_PARM0);
PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
- VM_CheckEmptyString (s);
+ VM_CheckEmptyString(s);
+
+ if(snd_initialized.integer && !S_PrecacheSound(s, true, false))
+ {
+ VM_Warning("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+ return;
+ }
+}
+
+/*
+=================
+VM_precache_file
- if(snd_initialized.integer && !S_PrecacheSound (s,true, true))
- Con_Printf("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+returns the same string as output
+
+does nothing, only used by qcc to build .pak archives
+=================
+*/
+void VM_precache_file (void)
+{
+ VM_SAFEPARMCOUNT(1,VM_precache_file);
+ // precache_file is only used to copy files with qcc, it does nothing
+ PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
}
/*
{
VM_SAFEPARMCOUNT(0, VM_crash);
- PRVM_ERROR("Crash called by %s\n",PRVM_NAME);
+ PRVM_ERROR("Crash called by %s",PRVM_NAME);
}
/*
*/
void VM_rint (void)
{
- float f;
-
+ float f;
VM_SAFEPARMCOUNT(1,VM_rint);
f = PRVM_G_FLOAT(OFS_PARM0);
if (f > 0)
- PRVM_G_FLOAT(OFS_RETURN) = (int)(f + 0.5);
+ PRVM_G_FLOAT(OFS_RETURN) = floor(f + 0.5);
else
- PRVM_G_FLOAT(OFS_RETURN) = (int)(f - 0.5);
+ PRVM_G_FLOAT(OFS_RETURN) = ceil(f - 0.5);
}
/*
int i;
prvm_edict_t *ent;
+ VM_SAFEPARMCOUNT(1, VM_nextent);
+
i = PRVM_G_EDICTNUM(OFS_PARM0);
while (1)
{
return;
}
ent = PRVM_EDICT_NUM(i);
- if (!ent->p.e->free)
+ if (!ent->priv.required->free)
{
VM_RETURN_EDICT(ent);
return;
}
}
-/*
-===============================================================================
-MESSAGE WRITING
-
-used only for client and menu
-severs uses VM_SV_...
+//=============================================================================
-Write*(* data, float type, float to)
+/*
+==============
+VM_changelevel
+server and menu
-===============================================================================
+changelevel(string map)
+==============
*/
-
-#define MSG_BROADCAST 0 // unreliable to all
-#define MSG_ONE 1 // reliable to one (msg_entity)
-#define MSG_ALL 2 // reliable to all
-#define MSG_INIT 3 // write to the init string
-
-sizebuf_t *VM_WriteDest (void)
+void VM_changelevel (void)
{
- int dest;
- int destclient;
+ VM_SAFEPARMCOUNT(1, VM_changelevel);
if(!sv.active)
- PRVM_ERROR("VM_WriteDest: game is not server (%s)\n", PRVM_NAME);
-
- dest = G_FLOAT(OFS_PARM1);
- switch (dest)
{
- case MSG_BROADCAST:
- return &sv.datagram;
-
- case MSG_ONE:
- destclient = (int) PRVM_G_FLOAT(OFS_PARM2);
- if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active)
- PRVM_ERROR("VM_clientcommand: %s: invalid client !\n", PRVM_NAME);
+ VM_Warning("VM_changelevel: game is not server (%s)\n", PRVM_NAME);
+ return;
+ }
- return &svs.clients[destclient].message;
+// make sure we don't issue two changelevels
+ if (svs.changelevel_issued)
+ return;
+ svs.changelevel_issued = true;
- case MSG_ALL:
- return &sv.reliable_datagram;
+ Cbuf_AddText (va("changelevel %s\n",PRVM_G_STRING(OFS_PARM0)));
+}
- case MSG_INIT:
- return &sv.signon;
+/*
+=========
+VM_sin
- default:
- PRVM_ERROR ("WriteDest: bad destination");
- break;
- }
-
- return NULL;
-}
-
-void VM_WriteByte (void)
-{
- MSG_WriteByte (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
-}
-
-void VM_WriteChar (void)
-{
- MSG_WriteChar (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
-}
-
-void VM_WriteShort (void)
+float sin(float)
+=========
+*/
+void VM_sin (void)
{
- MSG_WriteShort (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+ VM_SAFEPARMCOUNT(1,VM_sin);
+ PRVM_G_FLOAT(OFS_RETURN) = sin(PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_WriteLong (void)
+/*
+=========
+VM_cos
+float cos(float)
+=========
+*/
+void VM_cos (void)
{
- MSG_WriteLong (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+ VM_SAFEPARMCOUNT(1,VM_cos);
+ PRVM_G_FLOAT(OFS_RETURN) = cos(PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_WriteAngle (void)
-{
- MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
-}
+/*
+=========
+VM_sqrt
-void VM_WriteCoord (void)
+float sqrt(float)
+=========
+*/
+void VM_sqrt (void)
{
- MSG_WriteCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
+ VM_SAFEPARMCOUNT(1,VM_sqrt);
+ PRVM_G_FLOAT(OFS_RETURN) = sqrt(PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_WriteString (void)
-{
- MSG_WriteString (VM_WriteDest(), PRVM_G_STRING(OFS_PARM0));
-}
+/*
+=========
+VM_asin
-void VM_WriteEntity (void)
+float asin(float)
+=========
+*/
+void VM_asin (void)
{
- MSG_WriteShort (VM_WriteDest(), PRVM_G_EDICTNUM(OFS_PARM0));
+ VM_SAFEPARMCOUNT(1,VM_asin);
+ PRVM_G_FLOAT(OFS_RETURN) = asin(PRVM_G_FLOAT(OFS_PARM0));
}
-//=============================================================================
-
/*
-==============
-VM_changelevel
-server and menu
-
-changelevel(string map)
-==============
+=========
+VM_acos
+float acos(float)
+=========
*/
-void VM_changelevel (void)
+void VM_acos (void)
{
- const char *s;
-
- VM_SAFEPARMCOUNT(1, VM_changelevel);
-
- if(!sv.active)
- {
- Con_Printf("VM_changelevel: game is not server (%s)\n", PRVM_NAME);
- return;
- }
-
-// make sure we don't issue two changelevels
- if (svs.changelevel_issued)
- return;
- svs.changelevel_issued = true;
-
- s = PRVM_G_STRING(OFS_PARM0);
- Cbuf_AddText (va("changelevel %s\n",s));
+ VM_SAFEPARMCOUNT(1,VM_acos);
+ PRVM_G_FLOAT(OFS_RETURN) = acos(PRVM_G_FLOAT(OFS_PARM0));
}
/*
=========
-VM_sin
-
-float sin(float)
+VM_atan
+float atan(float)
=========
*/
-void VM_sin (void)
+void VM_atan (void)
{
- VM_SAFEPARMCOUNT(1,VM_sin);
- PRVM_G_FLOAT(OFS_RETURN) = sin(PRVM_G_FLOAT(OFS_PARM0));
+ VM_SAFEPARMCOUNT(1,VM_atan);
+ PRVM_G_FLOAT(OFS_RETURN) = atan(PRVM_G_FLOAT(OFS_PARM0));
}
/*
=========
-VM_cos
-float cos(float)
+VM_atan2
+float atan2(float,float)
=========
*/
-void VM_cos (void)
+void VM_atan2 (void)
{
- VM_SAFEPARMCOUNT(1,VM_cos);
- PRVM_G_FLOAT(OFS_RETURN) = cos(PRVM_G_FLOAT(OFS_PARM0));
+ VM_SAFEPARMCOUNT(2,VM_atan2);
+ PRVM_G_FLOAT(OFS_RETURN) = atan2(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
}
/*
=========
-VM_sqrt
-
-float sqrt(float)
+VM_tan
+float tan(float)
=========
*/
-void VM_sqrt (void)
+void VM_tan (void)
{
- VM_SAFEPARMCOUNT(1,VM_sqrt);
- PRVM_G_FLOAT(OFS_RETURN) = sqrt(PRVM_G_FLOAT(OFS_PARM0));
+ VM_SAFEPARMCOUNT(1,VM_tan);
+ PRVM_G_FLOAT(OFS_RETURN) = tan(PRVM_G_FLOAT(OFS_PARM0));
}
/*
=========
VM_registercvar
-float registercvar (string name, string value, float flags)
+float registercvar (string name, string value[, float flags])
=========
*/
void VM_registercvar (void)
const char *name, *value;
int flags;
- VM_SAFEPARMCOUNT(3,VM_registercvar);
+ VM_SAFEPARMCOUNTRANGE(2, 3, VM_registercvar);
name = PRVM_G_STRING(OFS_PARM0);
value = PRVM_G_STRING(OFS_PARM1);
- flags = PRVM_G_FLOAT(OFS_PARM2);
+ flags = prog->argc >= 3 ? (int)PRVM_G_FLOAT(OFS_PARM2) : 0;
PRVM_G_FLOAT(OFS_RETURN) = 0;
if(flags > CVAR_MAXFLAGSVAL)
// check for overlap with a command
if (Cmd_Exists (name))
{
- Con_Printf("VM_registercvar: %s is a command\n", name);
+ VM_Warning("VM_registercvar: %s is a command\n", name);
return;
}
PRVM_G_FLOAT(OFS_RETURN) = 1; // success
}
+
/*
=================
VM_min
*/
void VM_min (void)
{
+ VM_SAFEPARMCOUNTRANGE(2, 8, VM_min);
// LordHavoc: 3+ argument enhancement suggested by FrikaC
- if (prog->argc == 2)
- PRVM_G_FLOAT(OFS_RETURN) = min(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
- else if (prog->argc >= 3)
+ if (prog->argc >= 3)
{
int i;
float f = PRVM_G_FLOAT(OFS_PARM0);
for (i = 1;i < prog->argc;i++)
- if (PRVM_G_FLOAT((OFS_PARM0+i*3)) < f)
+ if (f > PRVM_G_FLOAT((OFS_PARM0+i*3)))
f = PRVM_G_FLOAT((OFS_PARM0+i*3));
PRVM_G_FLOAT(OFS_RETURN) = f;
}
else
- PRVM_ERROR("VM_min: %s must supply at least 2 floats\n", PRVM_NAME);
+ PRVM_G_FLOAT(OFS_RETURN) = min(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
}
/*
*/
void VM_max (void)
{
+ VM_SAFEPARMCOUNTRANGE(2, 8, VM_max);
// LordHavoc: 3+ argument enhancement suggested by FrikaC
- if (prog->argc == 2)
- PRVM_G_FLOAT(OFS_RETURN) = max(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
- else if (prog->argc >= 3)
+ if (prog->argc >= 3)
{
int i;
float f = PRVM_G_FLOAT(OFS_PARM0);
for (i = 1;i < prog->argc;i++)
- if (PRVM_G_FLOAT((OFS_PARM0+i*3)) > f)
+ if (f < PRVM_G_FLOAT((OFS_PARM0+i*3)))
f = PRVM_G_FLOAT((OFS_PARM0+i*3));
PRVM_G_FLOAT(OFS_RETURN) = f;
}
else
- PRVM_ERROR("VM_max: %s must supply at least 2 floats\n", PRVM_NAME);
+ PRVM_G_FLOAT(OFS_RETURN) = max(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
}
/*
PRVM_G_FLOAT(OFS_RETURN) = pow(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
}
-/*
-=================
-VM_copyentity
-
-copies data from one entity to another
-
-copyentity(entity src, entity dst)
-=================
-*/
-void VM_copyentity (void)
+void VM_Files_Init(void)
{
- prvm_edict_t *in, *out;
- VM_SAFEPARMCOUNT(2,VM_copyentity);
- in = PRVM_G_EDICT(OFS_PARM0);
- out = PRVM_G_EDICT(OFS_PARM1);
- memcpy(out->v, in->v, prog->progs->entityfields * 4);
+ int i;
+ for (i = 0;i < PRVM_MAX_OPENFILES;i++)
+ prog->openfiles[i] = NULL;
}
-/*
-=================
-VM_setcolor
-
-sets the color of a client and broadcasts the update to all connected clients
-
-setcolor(clientent, value)
-=================
-*/
-/*void PF_setcolor (void)
+void VM_Files_CloseAll(void)
{
- client_t *client;
- int entnum, i;
- eval_t *val;
-
- entnum = G_EDICTNUM(OFS_PARM0);
- i = G_FLOAT(OFS_PARM1);
-
- if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
+ int i;
+ for (i = 0;i < PRVM_MAX_OPENFILES;i++)
{
- Con_Print("tried to setcolor a non-client\n");
- return;
+ if (prog->openfiles[i])
+ FS_Close(prog->openfiles[i]);
+ prog->openfiles[i] = NULL;
}
-
- client = svs.clients + entnum-1;
- if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
- val->_float = i;
- client->colors = i;
- client->old_colors = i;
- client->edict->v->team = (i & 15) + 1;
-
- MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
- MSG_WriteByte (&sv.reliable_datagram, entnum - 1);
- MSG_WriteByte (&sv.reliable_datagram, i);
-}*/
-
-void VM_Files_Init(void)
-{
- memset(VM_FILES, 0, sizeof(qfile_t*[MAX_VMFILES]));
}
-void VM_Files_CloseAll(void)
+static qfile_t *VM_GetFileHandle( int index )
{
- int i;
- for (i = 0;i < MAX_VMFILES;i++)
+ if (index < 0 || index >= PRVM_MAX_OPENFILES)
+ {
+ Con_Printf("VM_GetFileHandle: invalid file handle %i used in %s\n", index, PRVM_NAME);
+ return NULL;
+ }
+ if (prog->openfiles[index] == NULL)
{
- if (VM_FILES[i])
- FS_Close(VM_FILES[i]);
- //VM_FILES[i] = NULL;
+ Con_Printf("VM_GetFileHandle: no such file handle %i (or file has been closed) in %s\n", index, PRVM_NAME);
+ return NULL;
}
- memset(VM_FILES,0,sizeof(qfile_t*[MAX_VMFILES])); // this should be faster (is it ?)
+ return prog->openfiles[index];
}
/*
VM_SAFEPARMCOUNT(2,VM_fopen);
- for (filenum = 0;filenum < MAX_VMFILES;filenum++)
- if (VM_FILES[filenum] == NULL)
+ for (filenum = 0;filenum < PRVM_MAX_OPENFILES;filenum++)
+ if (prog->openfiles[filenum] == NULL)
break;
- if (filenum >= MAX_VMFILES)
+ if (filenum >= PRVM_MAX_OPENFILES)
{
- Con_Printf("VM_fopen: %s ran out of file handles (%i)\n", PRVM_NAME, MAX_VMFILES);
PRVM_G_FLOAT(OFS_RETURN) = -2;
+ VM_Warning("VM_fopen: %s ran out of file handles (%i)\n", PRVM_NAME, PRVM_MAX_OPENFILES);
return;
}
- mode = PRVM_G_FLOAT(OFS_PARM1);
+ mode = (int)PRVM_G_FLOAT(OFS_PARM1);
switch(mode)
{
case 0: // FILE_READ
modestring = "wb";
break;
default:
- Con_Printf("VM_fopen: %s no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode);
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);
return;
}
filename = PRVM_G_STRING(OFS_PARM0);
- // .. is parent directory on many platforms
- // / is parent directory on Amiga
- // : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea)
- // \ is a windows-ism (so it's naughty to use it, / works on all platforms)
- if ((filename[0] == '.' && filename[1] == '.') || filename[0] == '/' || strrchr(filename, ':') || strrchr(filename, '\\'))
- {
- Con_Printf("VM_fopen: %s dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", PRVM_NAME, filename);
- PRVM_G_FLOAT(OFS_RETURN) = -4;
- return;
- }
- VM_FILES[filenum] = FS_Open(va("data/%s", filename), modestring, false, false);
- if (VM_FILES[filenum] == NULL && mode == 0)
- VM_FILES[filenum] = FS_Open(va("%s", filename), modestring, false, false);
- if (VM_FILES[filenum] == NULL)
+ prog->openfiles[filenum] = FS_Open(va("data/%s", filename), modestring, false, false);
+ if (prog->openfiles[filenum] == NULL && mode == 0)
+ prog->openfiles[filenum] = FS_Open(va("%s", filename), modestring, false, false);
+
+ if (prog->openfiles[filenum] == NULL)
+ {
PRVM_G_FLOAT(OFS_RETURN) = -1;
+ if (developer.integer >= 100)
+ VM_Warning("VM_fopen: %s: %s mode %s failed\n", PRVM_NAME, filename, modestring);
+ }
else
+ {
PRVM_G_FLOAT(OFS_RETURN) = filenum;
+ if (developer.integer >= 100)
+ Con_Printf("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum);
+ }
}
/*
VM_SAFEPARMCOUNT(1,VM_fclose);
- filenum = PRVM_G_FLOAT(OFS_PARM0);
- if (filenum < 0 || filenum >= MAX_VMFILES)
+ filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
+ if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
{
- Con_Printf("VM_fclose: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_fclose: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
return;
}
- if (VM_FILES[filenum] == NULL)
+ if (prog->openfiles[filenum] == NULL)
{
- Con_Printf("VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
return;
}
- FS_Close(VM_FILES[filenum]);
- VM_FILES[filenum] = NULL;
+ FS_Close(prog->openfiles[filenum]);
+ prog->openfiles[filenum] = NULL;
+ if (developer.integer >= 100)
+ Con_Printf("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum);
}
/*
void VM_fgets(void)
{
int c, end;
- static char string[VM_STRINGTEMP_LENGTH];
+ char string[VM_STRINGTEMP_LENGTH];
int filenum;
VM_SAFEPARMCOUNT(1,VM_fgets);
- filenum = PRVM_G_FLOAT(OFS_PARM0);
- if (filenum < 0 || filenum >= MAX_VMFILES)
+ filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
+ if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
{
- Con_Printf("VM_fgets: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_fgets: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
return;
}
- if (VM_FILES[filenum] == NULL)
+ if (prog->openfiles[filenum] == NULL)
{
- Con_Printf("VM_fgets: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_fgets: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
return;
}
end = 0;
for (;;)
{
- c = FS_Getc(VM_FILES[filenum]);
+ c = FS_Getc(prog->openfiles[filenum]);
if (c == '\r' || c == '\n' || c < 0)
break;
if (end < VM_STRINGTEMP_LENGTH - 1)
// remove \n following \r
if (c == '\r')
{
- c = FS_Getc(VM_FILES[filenum]);
+ c = FS_Getc(prog->openfiles[filenum]);
if (c != '\n')
- FS_UnGetc(VM_FILES[filenum], (unsigned char)c);
+ FS_UnGetc(prog->openfiles[filenum], (unsigned char)c);
}
- if (developer.integer >= 3)
+ if (developer.integer >= 100)
Con_Printf("fgets: %s: %s\n", PRVM_NAME, string);
if (c >= 0 || end)
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
else
- PRVM_G_INT(OFS_RETURN) = 0;
+ PRVM_G_INT(OFS_RETURN) = OFS_NULL;
}
/*
VM_SAFEPARMCOUNT(2,VM_fputs);
- filenum = PRVM_G_FLOAT(OFS_PARM0);
- if (filenum < 0 || filenum >= MAX_VMFILES)
+ filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
+ if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
{
- Con_Printf("VM_fputs: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_fputs: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
return;
}
- if (VM_FILES[filenum] == NULL)
+ if (prog->openfiles[filenum] == NULL)
{
- Con_Printf("VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
return;
}
VM_VarString(1, string, sizeof(string));
- if ((stringlength = strlen(string)))
- FS_Write(VM_FILES[filenum], string, stringlength);
- if (developer.integer)
+ if ((stringlength = (int)strlen(string)))
+ FS_Write(prog->openfiles[filenum], string, stringlength);
+ if (developer.integer >= 100)
Con_Printf("fputs: %s: %s\n", PRVM_NAME, string);
}
+/*
+=========
+VM_writetofile
+
+ writetofile(float fhandle, entity ent)
+=========
+*/
+void VM_writetofile(void)
+{
+ prvm_edict_t * ent;
+ qfile_t *file;
+
+ VM_SAFEPARMCOUNT(2, VM_writetofile);
+
+ file = VM_GetFileHandle( (int)PRVM_G_FLOAT(OFS_PARM0) );
+ if( !file )
+ {
+ VM_Warning("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));
+ return;
+ }
+
+ PRVM_ED_Write (file, ent);
+}
+
/*
=========
VM_strlen
//float(string s) strlen = #114; // returns how many characters are in a string
void VM_strlen(void)
{
- const char *s;
-
VM_SAFEPARMCOUNT(1,VM_strlen);
- s = PRVM_G_STRING(OFS_PARM0);
- if (s)
- PRVM_G_FLOAT(OFS_RETURN) = strlen(s);
- else
- PRVM_G_FLOAT(OFS_RETURN) = 0;
+ PRVM_G_FLOAT(OFS_RETURN) = strlen(PRVM_G_STRING(OFS_PARM0));
+}
+
+// DRESK - Decolorized String
+/*
+=========
+VM_strdecolorize
+
+string strdecolorize(string s)
+=========
+*/
+// string (string s) strdecolorize = #472; // returns the passed in string with color codes stripped
+void VM_strdecolorize(void)
+{
+ char szNewString[VM_STRINGTEMP_LENGTH];
+ const char *szString;
+ size_t nCnt;
+ int nPos;
+ int nFillPos;
+ int bFinished;
+ nPos = 0;
+ nFillPos = 0;
+ nCnt = 0;
+ bFinished = 0;
+
+ // Prepare Strings
+ VM_SAFEPARMCOUNT(1,VM_strdecolorize);
+ szString = PRVM_G_STRING(OFS_PARM0);
+
+ while(!bFinished)
+ { // Traverse through String
+ if( szString[nPos] == '\n' || szString[nPos] == '\r' || szString[nPos] <= 0)
+ { // String End Found
+ szNewString[nFillPos++] = szString[nPos];
+ bFinished = 1;
+ }
+ else
+ if( szString[nPos] == STRING_COLOR_TAG)
+ { // Color Code Located
+ if( szString[nPos + 1] == STRING_COLOR_TAG)
+ { // Valid Characters to Include
+ szNewString[nFillPos++] = szString[nPos];
+ nPos = nPos + 1;
+ szNewString[nFillPos++] = szString[nPos];
+ }
+ else
+ if( szString[nPos + 1] >= '0' && szString[nPos + 1] <= '9' )
+ { // Color Code Found; Increment Position
+ nPos = nPos + 1;
+ }
+ else
+ { // Unknown Color Code; Include
+ szNewString[nFillPos++] = szString[nPos];
+ nPos = nPos + 1;
+ }
+ }
+ else
+ // Include Character
+ szNewString[nFillPos++] = szString[nPos];
+
+ // Increment Position
+ nPos = nPos + 1;
+ }
+
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+}
+
+// DRESK - String Length (not counting color codes)
+/*
+=========
+VM_strlennocol
+
+float strlennocol(string s)
+=========
+*/
+// 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)
+{
+ const char *szString;
+ size_t nCnt;
+ int nPos;
+ int bFinished;
+ nPos = 0;
+ nCnt = 0;
+ bFinished = 0;
+
+ VM_SAFEPARMCOUNT(1,VM_strlennocol);
+
+ szString = PRVM_G_STRING(OFS_PARM0);
+
+ while(!bFinished)
+ { // Count Characters
+ // SV_BroadcastPrintf("Position '%d'; Character '%c'; Length '%d'\n", nPos, szString[nPos], nCnt);
+
+ if( szString[nPos] == '\n' || szString[nPos] == '\r' || szString[nPos] <= 0)
+ { // String End Found
+ // SV_BroadcastPrintf("Found End of String at '%d'\n", nPos);
+ bFinished = 1;
+ }
+ else
+ if( szString[nPos] == STRING_COLOR_TAG)
+ { // Color Code Located
+ if( szString[nPos + 1] == STRING_COLOR_TAG)
+ { // Increment Length; Skip Color Code
+ nCnt = nCnt + 1;
+ nPos = nPos + 1;
+ }
+ else
+ if( szString[nPos + 1] >= '0' && szString[nPos + 1] <= '9' )
+ { // Color Code Found; Increment Position
+ // SV_BroadcastPrintf("Found Color Codes at '%d'\n", nPos);
+ nPos = nPos + 1;
+ }
+ else
+ { // Unknown Color Code; Increment Length!
+ nPos = nPos + 1;
+ nCnt = nCnt + 1;
+ }
+ }
+ else
+ // Increment String Length
+ nCnt = nCnt + 1;
+
+ // Increment Position
+ nPos = nPos + 1;
+ }
+ PRVM_G_FLOAT(OFS_RETURN) = nCnt;
}
/*
// and returns as a tempstring
void VM_strcat(void)
{
- char *s;
+ char s[VM_STRINGTEMP_LENGTH];
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_strcat);
- if(prog->argc < 1)
- PRVM_ERROR("VM_strcat wrong parameter count (min. 1 expected ) !\n");
-
- s = VM_GetTempString();
- VM_VarString(0, s, VM_STRINGTEMP_LENGTH);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
+ VM_VarString(0, s, sizeof(s));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
}
/*
{
int i, start, length;
const char *s;
- char *string;
+ char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNT(3,VM_substring);
- string = VM_GetTempString();
s = PRVM_G_STRING(OFS_PARM0);
- start = PRVM_G_FLOAT(OFS_PARM1);
- length = PRVM_G_FLOAT(OFS_PARM2);
- if (!s)
- s = "";
+ start = (int)PRVM_G_FLOAT(OFS_PARM1);
+ length = (int)PRVM_G_FLOAT(OFS_PARM2);
for (i = 0;i < start && *s;i++, s++);
- for (i = 0;i < VM_STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
+ for (i = 0;i < (int)sizeof(string) - 1 && *s && i < length;i++, s++)
string[i] = *s;
string[i] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
}
/*
string strzone(string s)
=========
*/
-//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)
+//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)
{
- const char *in;
char *out;
+ char string[VM_STRINGTEMP_LENGTH];
+ size_t alloclen;
VM_SAFEPARMCOUNT(1,VM_strzone);
- in = PRVM_G_STRING(OFS_PARM0);
- out = PRVM_AllocString(strlen(in) + 1);
- strcpy(out, in);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetQCString(out);
+ VM_VarString(0, string, sizeof(string));
+ alloclen = strlen(string) + 1;
+ PRVM_G_INT(OFS_RETURN) = PRVM_AllocString(alloclen, &out);
+ memcpy(out, string, alloclen);
}
/*
void VM_strunzone(void)
{
VM_SAFEPARMCOUNT(1,VM_strunzone);
- PRVM_FreeString((char *)PRVM_G_STRING(OFS_PARM0));
+ PRVM_FreeString(PRVM_G_INT(OFS_PARM0));
}
/*
VM_SAFEPARMCOUNT(2,VM_clcommand);
- i = PRVM_G_FLOAT(OFS_PARM0);
+ i = (int)PRVM_G_FLOAT(OFS_PARM0);
if (!sv.active || i < 0 || i >= svs.maxclients || !svs.clients[i].active)
{
- Con_Printf("VM_clientcommand: %s: invalid client/server is not active !\n", PRVM_NAME);
+ VM_Warning("VM_clientcommand: %s: invalid client/server is not active !\n", PRVM_NAME);
return;
}
float tokenize(string s)
=========
*/
-//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
-static char **tokens = NULL;
-static int max_tokens, num_tokens = 0;
+//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)
+int num_tokens = 0;
+int tokens[256];
void VM_tokenize (void)
{
- const char *p, *str;
+ const char *p;
+#if 0
+ size_t pos = 0;
+ char tokenbuf[MAX_INPUTLINE];
+ size_t tokenlen;
+#endif
VM_SAFEPARMCOUNT(1,VM_tokenize);
- str = PRVM_G_STRING(OFS_PARM0);
-
- if (tokens != NULL)
- {
- int i;
- for (i=0;i<num_tokens;i++)
- Z_Free(tokens[i]);
- Z_Free(tokens);
- num_tokens = 0;
- }
-
- tokens = Z_Malloc(strlen(str) * sizeof(char *));
- max_tokens = strlen(str);
+ p = PRVM_G_STRING(OFS_PARM0);
- for (p = str;COM_ParseToken(&p, false) && num_tokens < max_tokens;num_tokens++)
+ num_tokens = 0;
+ while(COM_ParseToken(&p, false))
{
- tokens[num_tokens] = Z_Malloc(strlen(com_token) + 1);
- strcpy(tokens[num_tokens], com_token);
+ if (num_tokens >= (int)(sizeof(tokens)/sizeof(tokens[0])))
+ break;
+#if 0
+ tokenlen = strlen(com_token) + 1;
+ if (pos + tokenlen > sizeof(tokenbuf))
+ break;
+ tokens[num_tokens++] = PRVM_SetEngineString(tokenbuf + pos);
+ memcpy(tokenbuf + pos, com_token, tokenlen);
+ pos += tokenlen;
+#else
+ tokens[num_tokens++] = PRVM_SetTempString(com_token);
+#endif
}
PRVM_G_FLOAT(OFS_RETURN) = num_tokens;
}
-/*
-=========
-VM_argv
-
-string argv(float n)
-=========
-*/
-//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
+//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)
{
int token_num;
VM_SAFEPARMCOUNT(1,VM_argv);
- token_num = PRVM_G_FLOAT(OFS_PARM0);
+ token_num = (int)PRVM_G_FLOAT(OFS_PARM0);
+
if (token_num >= 0 && token_num < num_tokens)
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tokens[token_num]);
+ PRVM_G_INT(OFS_RETURN) = tokens[token_num];
else
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(NULL);
+ PRVM_G_INT(OFS_RETURN) = OFS_NULL;
}
-/*
-//void(entity e, entity tagentity, string tagname) setattachment = #443; // attachs e to a tag on tagentity (note: use "" to attach to entity origin/angles instead of a tag)
-void PF_setattachment (void)
-{
- edict_t *e = G_EDICT(OFS_PARM0);
- edict_t *tagentity = G_EDICT(OFS_PARM1);
- char *tagname = G_STRING(OFS_PARM2);
- eval_t *v;
- int i, modelindex;
- model_t *model;
-
- if (tagentity == NULL)
- tagentity = sv.edicts;
-
- v = GETEDICTFIELDVALUE(e, eval_tag_entity);
- if (v)
- v->edict = EDICT_TO_PROG(tagentity);
-
- v = GETEDICTFIELDVALUE(e, eval_tag_index);
- if (v)
- v->_float = 0;
- if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0])
- {
- modelindex = (int)tagentity->v->modelindex;
- if (modelindex >= 0 && modelindex < MAX_MODELS)
- {
- model = sv.models[modelindex];
- if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
- for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
- if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
- v->_float = i + 1;
- // FIXME: use a model function to get tag info (need to handle skeletal)
- if (v->_float == 0 && model->num_tags)
- for (i = 0;i < model->num_tags;i++)
- if (!strcmp(tagname, model->data_tags[i].name))
- v->_float = i + 1;
- if (v->_float == 0)
- Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity), model->name);
- }
- else
- Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i but it has no model\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity));
- }
-}*/
-
/*
=========
VM_isserver
{
VM_SAFEPARMCOUNT(0,VM_serverstate);
- PRVM_G_FLOAT(OFS_RETURN) = sv.active;
+ PRVM_G_FLOAT(OFS_RETURN) = sv.active && (svs.maxclients > 1 || cls.state == ca_dedicated);
}
/*
OS_MAC - not supported
*/
-#ifdef _WIN32
+#ifdef WIN32
PRVM_G_FLOAT(OFS_RETURN) = 0;
-#elif defined _MAC
+#elif defined(MACOSX)
PRVM_G_FLOAT(OFS_RETURN) = 2;
#else
PRVM_G_FLOAT(OFS_RETURN) = 1;
{
VM_SAFEPARMCOUNT(0,VM_gettime);
- PRVM_G_FLOAT(OFS_RETURN) = (float) *prog->time;
+ PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
}
/*
/*
========================
-VM_M_parseentitydata
+VM_parseentitydata
parseentitydata(entity ent, string data)
========================
*/
-void VM_M_parseentitydata(void)
+void VM_parseentitydata(void)
{
prvm_edict_t *ent;
const char *data;
// get edict and test it
ent = PRVM_G_EDICT(OFS_PARM0);
- if (ent->p.e->free)
- PRVM_ERROR ("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+ 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));
data = PRVM_G_STRING(OFS_PARM1);
// parse the opening brace
- if (!COM_ParseToken(&data, false) || com_token[0] != '{' )
- PRVM_ERROR ("VM_parseentitydata: %s: Couldn't parse entity data:\n%s\n", PRVM_NAME, data );
+ if (!COM_ParseTokenConsole(&data) || com_token[0] != '{' )
+ PRVM_ERROR ("VM_parseentitydata: %s: Couldn't parse entity data:\n%s", PRVM_NAME, data );
PRVM_ED_ParseEdict (data, ent);
}
void VM_loadfromfile(void)
{
const char *filename;
- qbyte *data;
+ char *data;
VM_SAFEPARMCOUNT(1,VM_loadfromfile);
filename = PRVM_G_STRING(OFS_PARM0);
- // .. is parent directory on many platforms
- // / is parent directory on Amiga
- // : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea)
- // \ is a windows-ism (so it's naughty to use it, / works on all platforms)
- if ((filename[0] == '.' && filename[1] == '.') || filename[0] == '/' || strrchr(filename, ':') || strrchr(filename, '\\'))
+ if (FS_CheckNastyPath(filename, false))
{
- Con_Printf("VM_loadfromfile: %s dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", PRVM_NAME, filename);
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);
return;
}
// not conform with VM_fopen
- data = FS_LoadFile(filename, tempmempool, false);
+ data = (char *)FS_LoadFile(filename, tempmempool, false, NULL);
if (data == NULL)
PRVM_G_FLOAT(OFS_RETURN) = -1;
void VM_Search_Init(void)
{
- memset(VM_SEARCHLIST,0,sizeof(fssearch_t*[MAX_VMSEARCHES]));
+ int i;
+ for (i = 0;i < PRVM_MAX_OPENSEARCHES;i++)
+ prog->opensearches[i] = NULL;
}
void VM_Search_Reset(void)
{
int i;
// reset the fssearch list
- for(i = 0; i < MAX_VMSEARCHES; i++)
- if(VM_SEARCHLIST[i])
- FS_FreeSearch(VM_SEARCHLIST[i]);
- memset(VM_SEARCHLIST,0,sizeof(fssearch_t*[MAX_VMSEARCHES]));
+ for(i = 0; i < PRVM_MAX_OPENSEARCHES; i++)
+ {
+ if(prog->opensearches[i])
+ FS_FreeSearch(prog->opensearches[i]);
+ prog->opensearches[i] = NULL;
+ }
}
/*
VM_CheckEmptyString(pattern);
- caseinsens = PRVM_G_FLOAT(OFS_PARM1);
- quiet = PRVM_G_FLOAT(OFS_PARM2);
+ caseinsens = (int)PRVM_G_FLOAT(OFS_PARM1);
+ quiet = (int)PRVM_G_FLOAT(OFS_PARM2);
- for(handle = 0; handle < MAX_VMSEARCHES; handle++)
- if(!VM_SEARCHLIST[handle])
+ for(handle = 0; handle < PRVM_MAX_OPENSEARCHES; handle++)
+ if(!prog->opensearches[handle])
break;
- if(handle >= MAX_VMSEARCHES)
+ if(handle >= PRVM_MAX_OPENSEARCHES)
{
- Con_Printf("VM_search_begin: %s ran out of search handles (%i)\n", PRVM_NAME, MAX_VMSEARCHES);
PRVM_G_FLOAT(OFS_RETURN) = -2;
+ VM_Warning("VM_search_begin: %s ran out of search handles (%i)\n", PRVM_NAME, PRVM_MAX_OPENSEARCHES);
return;
}
- if(!(VM_SEARCHLIST[handle] = FS_Search(pattern,caseinsens, quiet)))
+ if(!(prog->opensearches[handle] = FS_Search(pattern,caseinsens, quiet)))
PRVM_G_FLOAT(OFS_RETURN) = -1;
else
PRVM_G_FLOAT(OFS_RETURN) = handle;
int handle;
VM_SAFEPARMCOUNT(1, VM_search_end);
- handle = PRVM_G_FLOAT(OFS_PARM0);
+ handle = (int)PRVM_G_FLOAT(OFS_PARM0);
- if(handle < 0 || handle >= MAX_VMSEARCHES)
+ if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
{
- Con_Printf("VM_search_end: invalid handle %i used in %s\n", handle, PRVM_NAME);
+ VM_Warning("VM_search_end: invalid handle %i used in %s\n", handle, PRVM_NAME);
return;
}
- if(VM_SEARCHLIST[handle] == NULL)
+ if(prog->opensearches[handle] == NULL)
{
- Con_Printf("VM_search_end: no such handle %i in %s\n", handle, PRVM_NAME);
+ VM_Warning("VM_search_end: no such handle %i in %s\n", handle, PRVM_NAME);
return;
}
- FS_FreeSearch(VM_SEARCHLIST[handle]);
- VM_SEARCHLIST[handle] = NULL;
+ FS_FreeSearch(prog->opensearches[handle]);
+ prog->opensearches[handle] = NULL;
}
/*
int handle;
VM_SAFEPARMCOUNT(1, VM_M_search_getsize);
- handle = PRVM_G_FLOAT(OFS_PARM0);
+ handle = (int)PRVM_G_FLOAT(OFS_PARM0);
- if(handle < 0 || handle >= MAX_VMSEARCHES)
+ if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
{
- Con_Printf("VM_search_getsize: invalid handle %i used in %s\n", handle, PRVM_NAME);
+ VM_Warning("VM_search_getsize: invalid handle %i used in %s\n", handle, PRVM_NAME);
return;
}
- if(VM_SEARCHLIST[handle] == NULL)
+ if(prog->opensearches[handle] == NULL)
{
- Con_Printf("VM_search_getsize: no such handle %i in %s\n", handle, PRVM_NAME);
+ VM_Warning("VM_search_getsize: no such handle %i in %s\n", handle, PRVM_NAME);
return;
}
- PRVM_G_FLOAT(OFS_RETURN) = VM_SEARCHLIST[handle]->numfilenames;
+ PRVM_G_FLOAT(OFS_RETURN) = prog->opensearches[handle]->numfilenames;
}
/*
void VM_search_getfilename(void)
{
int handle, filenum;
- char *tmp;
VM_SAFEPARMCOUNT(2, VM_search_getfilename);
- handle = PRVM_G_FLOAT(OFS_PARM0);
- filenum = PRVM_G_FLOAT(OFS_PARM1);
+ handle = (int)PRVM_G_FLOAT(OFS_PARM0);
+ filenum = (int)PRVM_G_FLOAT(OFS_PARM1);
- if(handle < 0 || handle >= MAX_VMSEARCHES)
+ if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
{
- Con_Printf("VM_search_getfilename: invalid handle %i used in %s\n", handle, PRVM_NAME);
+ VM_Warning("VM_search_getfilename: invalid handle %i used in %s\n", handle, PRVM_NAME);
return;
}
- if(VM_SEARCHLIST[handle] == NULL)
+ if(prog->opensearches[handle] == NULL)
{
- Con_Printf("VM_search_getfilename: no such handle %i in %s\n", handle, PRVM_NAME);
+ VM_Warning("VM_search_getfilename: no such handle %i in %s\n", handle, PRVM_NAME);
return;
}
- if(filenum < 0 || filenum >= VM_SEARCHLIST[handle]->numfilenames)
+ if(filenum < 0 || filenum >= prog->opensearches[handle]->numfilenames)
{
- Con_Printf("VM_search_getfilename: invalid filenum %i in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_search_getfilename: invalid filenum %i in %s\n", filenum, PRVM_NAME);
return;
}
- tmp = VM_GetTempString();
- strcpy(tmp, VM_SEARCHLIST[handle]->filenames[filenum]);
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog->opensearches[handle]->filenames[filenum]);
}
/*
*/
void VM_chr(void)
{
- char *tmp;
+ char tmp[2];
VM_SAFEPARMCOUNT(1, VM_chr);
- tmp = VM_GetTempString();
tmp[0] = (unsigned char) PRVM_G_FLOAT(OFS_PARM0);
tmp[1] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(tmp);
}
//=============================================================================
s = PRVM_G_STRING(OFS_PARM0);
PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
-
- if(!s)
- PRVM_ERROR ("VM_precache_pic: %s: NULL\n", PRVM_NAME);
-
VM_CheckEmptyString (s);
// AK Draw_CachePic is supposed to always return a valid pointer
if( Draw_CachePic(s, false)->tex == r_texture_notexture )
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(NULL);
+ PRVM_G_INT(OFS_RETURN) = OFS_NULL;
}
/*
VM_SAFEPARMCOUNT(1,VM_freepic);
s = PRVM_G_STRING(OFS_PARM0);
-
- if(!s)
- PRVM_ERROR ("VM_freepic: %s: NULL\n");
-
VM_CheckEmptyString (s);
Draw_FreePic(s);
character = (char) PRVM_G_FLOAT(OFS_PARM1);
if(character == 0)
{
- Con_Printf("VM_drawcharacter: %s passed null character !\n",PRVM_NAME);
PRVM_G_FLOAT(OFS_RETURN) = -1;
+ VM_Warning("VM_drawcharacter: %s passed null character !\n",PRVM_NAME);
return;
}
if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
{
- Con_Printf("VM_drawcharacter: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
PRVM_G_FLOAT(OFS_RETURN) = -2;
+ VM_Warning("VM_drawcharacter: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
return;
}
if(!scale[0] || !scale[1])
{
- Con_Printf("VM_drawcharacter: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
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;
}
VM_SAFEPARMCOUNT(6,VM_drawstring);
string = PRVM_G_STRING(OFS_PARM1);
- if(!string)
- {
- Con_Printf("VM_drawstring: %s passed null string !\n",PRVM_NAME);
- PRVM_G_FLOAT(OFS_RETURN) = -1;
- return;
- }
-
- //VM_CheckEmptyString(string); Why should it be checked - perhaps the menu wants to support the precolored letters, too?
-
pos = PRVM_G_VECTOR(OFS_PARM0);
scale = PRVM_G_VECTOR(OFS_PARM2);
rgb = PRVM_G_VECTOR(OFS_PARM3);
if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
{
- Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
PRVM_G_FLOAT(OFS_RETURN) = -2;
+ VM_Warning("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
return;
}
if(!scale[0] || !scale[1])
{
- Con_Printf("VM_drawstring: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
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%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
+ 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")));
DrawQ_String (pos[0], pos[1], string, 0, scale[0], scale[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
PRVM_G_FLOAT(OFS_RETURN) = 1;
*/
void VM_drawpic(void)
{
- const char *pic;
+ const char *picname;
float *size, *pos, *rgb;
int flag;
VM_SAFEPARMCOUNT(6,VM_drawpic);
- pic = PRVM_G_STRING(OFS_PARM1);
-
- if(!pic)
- {
- Con_Printf("VM_drawpic: %s passed null picture name !\n", PRVM_NAME);
- PRVM_G_FLOAT(OFS_RETURN) = -1;
- return;
- }
-
- VM_CheckEmptyString (pic);
+ picname = PRVM_G_STRING(OFS_PARM1);
+ VM_CheckEmptyString (picname);
// is pic cached ? no function yet for that
if(!1)
{
- Con_Printf("VM_drawpic: %s: %s not cached !\n", PRVM_NAME, pic);
PRVM_G_FLOAT(OFS_RETURN) = -4;
+ VM_Warning("VM_drawpic: %s: %s not cached !\n", PRVM_NAME, picname);
return;
}
if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
{
- Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
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_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
+ 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], pic, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
+ DrawQ_Pic(pos[0], pos[1], Draw_CachePic(picname, true), size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
PRVM_G_FLOAT(OFS_RETURN) = 1;
}
if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
{
- Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
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_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
+ 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_Pic(pos[0], pos[1], 0, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag);
+ DrawQ_Pic(pos[0], pos[1], NULL, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag);
PRVM_G_FLOAT(OFS_RETURN) = 1;
}
VM_SAFEPARMCOUNT(1,VM_getimagesize);
p = PRVM_G_STRING(OFS_PARM0);
-
- if(!p)
- PRVM_ERROR("VM_getimagepos: %s passed null picture name !\n", PRVM_NAME);
-
- VM_CheckEmptyString (p);
+ VM_CheckEmptyString (p);
pic = Draw_CachePic (p, false);
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_stringtokeynum
+
+float stringtokeynum(string key)
+=========
+*/
+void VM_stringtokeynum (void)
+{
+ VM_SAFEPARMCOUNT( 1, VM_keynumtostring );
+
+ PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum(PRVM_G_STRING(OFS_PARM0));
+}
+
// CL_Video interface functions
/*
name = PRVM_G_STRING( OFS_PARM0 );
VM_CheckEmptyString( name );
- CL_CloseVideo( CL_GetVideo( name ) );
+ CL_CloseVideo( CL_GetVideoByName( name ) );
}
/*
name = PRVM_G_STRING( OFS_PARM0 );
VM_CheckEmptyString( name );
- state = PRVM_G_FLOAT( OFS_PARM1 );
+ state = (clvideostate_t)((int)PRVM_G_FLOAT( OFS_PARM1 ));
- video = CL_GetVideo( name );
+ video = CL_GetVideoByName( name );
if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT )
CL_SetVideoState( video, state );
}
name = PRVM_G_STRING( OFS_PARM0 );
VM_CheckEmptyString( name );
- video = CL_GetVideo( name );
+ video = CL_GetVideoByName( name );
if( video )
PRVM_G_FLOAT( OFS_RETURN ) = (int)video->state;
else
name = PRVM_G_STRING( OFS_PARM0 );
VM_CheckEmptyString( name );
- video = CL_GetVideo( name );
+ video = CL_GetVideoByName( name );
if( video )
CL_RestartVideo( video );
}
+/*
+==============
+VM_makevectors
+
+Writes new values for v_forward, v_up, and v_right based on angles
+void makevectors(vector angle)
+==============
+*/
+void VM_makevectors (void)
+{
+ prvm_eval_t *valforward, *valright, *valup;
+ valforward = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_forward);
+ valright = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_right);
+ valup = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_up);
+ if (!valforward || !valright || !valup)
+ {
+ VM_Warning("makevectors: could not find v_forward, v_right, or v_up global variables\n");
+ return;
+ }
+ VM_SAFEPARMCOUNT(1, VM_makevectors);
+ AngleVectors (PRVM_G_VECTOR(OFS_PARM0), valforward->vector, valright->vector, valup->vector);
+}
+
+/*
+==============
+VM_vectorvectors
+
+Writes new values for v_forward, v_up, and v_right based on the given forward vector
+vectorvectors(vector)
+==============
+*/
+void VM_vectorvectors (void)
+{
+ prvm_eval_t *valforward, *valright, *valup;
+ valforward = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_forward);
+ valright = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_right);
+ valup = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_up);
+ if (!valforward || !valright || !valup)
+ {
+ VM_Warning("vectorvectors: could not find v_forward, v_right, or v_up global variables\n");
+ return;
+ }
+ VM_SAFEPARMCOUNT(1, VM_vectorvectors);
+ VectorNormalize2(PRVM_G_VECTOR(OFS_PARM0), valforward->vector);
+ VectorVectors(valforward->vector, valright->vector, valup->vector);
+}
+
+/*
+========================
+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);
+}
+
+
+
+
+
+// float(float number, float quantity) bitshift (EXT_BITSHIFT)
+void VM_bitshift (void)
+{
+ int n1, n2;
+ VM_SAFEPARMCOUNT(2, VM_bitshift);
+
+ n1 = (int)fabs((int)PRVM_G_FLOAT(OFS_PARM0));
+ n2 = (int)PRVM_G_FLOAT(OFS_PARM1);
+ if(!n1)
+ PRVM_G_FLOAT(OFS_RETURN) = n1;
+ else
+ if(n2 < 0)
+ PRVM_G_FLOAT(OFS_RETURN) = (n1 >> -n2);
+ else
+ PRVM_G_FLOAT(OFS_RETURN) = (n1 << n2);
+}
+
////////////////////////////////////////
// AltString functions
////////////////////////////////////////
altstr = PRVM_G_STRING( OFS_PARM0 );
//VM_CheckEmptyString( altstr );
- for( count = 0, pos = altstr ; *pos ; pos++ )
- if( *pos == '\\' && !*++pos )
+ for( count = 0, pos = altstr ; *pos ; pos++ ) {
+ if( *pos == '\\' ) {
+ if( !*++pos ) {
break;
- else if( *pos == '\'' )
+ }
+ } else if( *pos == '\'' ) {
count++;
+ }
+ }
PRVM_G_FLOAT( OFS_RETURN ) = (float) (count / 2);
}
*/
void VM_altstr_prepare( void )
{
- char *outstr, *out;
+ char *out;
const char *instr, *in;
int size;
+ char outstr[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNT( 1, VM_altstr_prepare );
instr = PRVM_G_STRING( OFS_PARM0 );
- //VM_CheckEmptyString( instr );
- outstr = VM_GetTempString();
- for( out = outstr, in = instr, size = VM_STRINGTEMP_LENGTH - 1 ; size && *in ; size--, in++, out++ )
+ for( out = outstr, in = instr, size = sizeof(outstr) - 1 ; size && *in ; size--, in++, out++ )
if( *in == '\'' ) {
*out++ = '\\';
*out = '\'';
*out = *in;
*out = 0;
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
}
/*
void VM_altstr_get( void )
{
const char *altstr, *pos;
- char *outstr, *out;
+ char *out;
int count, size;
+ char outstr[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNT( 2, VM_altstr_get );
altstr = PRVM_G_STRING( OFS_PARM0 );
- //VM_CheckEmptyString( altstr );
- count = PRVM_G_FLOAT( OFS_PARM1 );
+ count = (int)PRVM_G_FLOAT( OFS_PARM1 );
count = count * 2 + 1;
for( pos = altstr ; *pos && count ; pos++ )
- if( *pos == '\\' && !*++pos )
- break;
- else if( *pos == '\'' )
+ if( *pos == '\\' ) {
+ if( !*++pos )
+ break;
+ } else if( *pos == '\'' )
count--;
if( !*pos ) {
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( NULL );
+ PRVM_G_INT( OFS_RETURN ) = 0;
return;
}
- outstr = VM_GetTempString();
- for( out = outstr, size = VM_STRINGTEMP_LENGTH - 1 ; size && *pos ; size--, pos++, out++ )
+ for( out = outstr, size = sizeof(outstr) - 1 ; size && *pos ; size--, pos++, out++ )
if( *pos == '\\' ) {
if( !*++pos )
break;
*out = *pos;
*out = 0;
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
}
/*
int num;
const char *altstr, *str;
const char *in;
- char *outstr, *out;
+ char *out;
+ char outstr[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNT( 3, VM_altstr_set );
altstr = PRVM_G_STRING( OFS_PARM0 );
- //VM_CheckEmptyString( altstr );
- num = PRVM_G_FLOAT( OFS_PARM1 );
+ num = (int)PRVM_G_FLOAT( OFS_PARM1 );
str = PRVM_G_STRING( OFS_PARM2 );
- //VM_CheckEmptyString( str );
- outstr = out = VM_GetTempString();
+ out = outstr;
for( num = num * 2 + 1, in = altstr; *in && num; *out++ = *in++ )
- if( *in == '\\' && !*++in )
- break;
- else if( *in == '\'' )
+ if( *in == '\\' ) {
+ if( !*++in ) {
+ break;
+ }
+ } else if( *in == '\'' ) {
num--;
+ }
- if( !in ) {
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( NULL );
- return;
- }
// copy set in
for( ; *str; *out++ = *str++ );
- // now jump over the old contents
+ // now jump over the old content
for( ; *in ; in++ )
if( *in == '\'' || (*in == '\\' && !*++in) )
break;
- if( !in ) {
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( NULL );
- return;
- }
-
- strcpy( out, in );
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
+ strlcpy(out, in, outstr + sizeof(outstr) - out);
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
}
/*
const char *set;
const char *instr;
const char *in;
- char *outstr;
char *out;
+ char outstr[VM_STRINGTEMP_LENGTH];
+
+ VM_SAFEPARMCOUNT(3, VM_altstr_ins);
in = instr = PRVM_G_STRING( OFS_PARM0 );
- num = PRVM_G_FLOAT( OFS_PARM1 );
+ num = (int)PRVM_G_FLOAT( OFS_PARM1 );
set = setstr = PRVM_G_STRING( OFS_PARM2 );
- out = outstr = VM_GetTempString();
+ out = outstr;
for( num = num * 2 + 2 ; *in && num > 0 ; *out++ = *in++ )
- if( *in == '\\' && !*++in )
- break;
- else if( *in == '\'' )
+ if( *in == '\\' ) {
+ if( !*++in ) {
+ break;
+ }
+ } else if( *in == '\'' ) {
num--;
+ }
+ *out++ = '\'';
for( ; *set ; *out++ = *set++ );
+ *out++ = '\'';
- strcpy( out, in );
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
-}
-
-void VM_Cmd_Init(void)
-{
- // only init the stuff for the current prog
- VM_Files_Init();
- VM_Search_Init();
+ strlcpy(out, in, outstr + sizeof(outstr) - out);
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
}
-void VM_Cmd_Reset(void)
-{
- CL_PurgeOwner( MENUOWNER );
- VM_Search_Reset();
- VM_Files_CloseAll();
-}
-//============================================================================
-// Server
+////////////////////////////////////////
+// BufString functions
+////////////////////////////////////////
+//[515]: string buffers support
+#define MAX_QCSTR_BUFFERS 128
+#define MAX_QCSTR_STRINGS 1024
-char *vm_sv_extensions =
-"";
+typedef struct
+{
+ int num_strings;
+ char *strings[MAX_QCSTR_STRINGS];
+}qcstrbuffer_t;
-prvm_builtin_t vm_sv_builtins[] = {
-0 // to be consistent with the old vm
-};
+// FIXME: move stringbuffers to prog_t to allow multiple progs!
+static qcstrbuffer_t *qcstringbuffers[MAX_QCSTR_BUFFERS];
+static int num_qcstringbuffers;
+static int buf_sortpower;
-const int vm_sv_numbuiltins = sizeof(vm_sv_builtins) / sizeof(prvm_builtin_t);
+#define BUFSTR_BUFFER(a) (a>=MAX_QCSTR_BUFFERS) ? NULL : (qcstringbuffers[a])
+#define BUFSTR_ISFREE(a) (a<MAX_QCSTR_BUFFERS&&qcstringbuffers[a]&&qcstringbuffers[a]->num_strings<=0) ? 1 : 0
-void VM_SV_Cmd_Init(void)
+static int BufStr_FindFreeBuffer (void)
{
+ int i;
+ if(num_qcstringbuffers == MAX_QCSTR_BUFFERS)
+ return -1;
+ for(i=0;i<MAX_QCSTR_BUFFERS;i++)
+ if(!qcstringbuffers[i])
+ {
+ qcstringbuffers[i] = (qcstrbuffer_t *)Z_Malloc(sizeof(qcstrbuffer_t));
+ memset(qcstringbuffers[i], 0, sizeof(qcstrbuffer_t));
+ return i;
+ }
+ return -1;
}
-void VM_SV_Cmd_Reset(void)
+static void BufStr_ClearBuffer (int index)
{
-}
-
-//============================================================================
-// Client
-
-char *vm_cl_extensions =
-"";
+ qcstrbuffer_t *b = qcstringbuffers[index];
+ int i;
-prvm_builtin_t vm_cl_builtins[] = {
-0 // to be consistent with the old vm
-};
-
-const int vm_cl_numbuiltins = sizeof(vm_cl_builtins) / sizeof(prvm_builtin_t);
-
-void VM_CL_Cmd_Init(void)
-{
+ if(b)
+ {
+ if(b->num_strings > 0)
+ {
+ for(i=0;i<b->num_strings;i++)
+ if(b->strings[i])
+ Z_Free(b->strings[i]);
+ num_qcstringbuffers--;
+ }
+ Z_Free(qcstringbuffers[index]);
+ qcstringbuffers[index] = NULL;
+ }
}
-void VM_CL_Cmd_Reset(void)
+static int BufStr_FindFreeString (qcstrbuffer_t *b)
{
+ int i;
+ for(i=0;i<b->num_strings;i++)
+ if(!b->strings[i] || !b->strings[i][0])
+ return i;
+ if(i == MAX_QCSTR_STRINGS) return -1;
+ else return i;
}
-//============================================================================
-// Menu
-
-char *vm_m_extensions =
-"DP_CINEMATIC_DPV";
-
-/*
-=========
-VM_M_setmousetarget
-
-setmousetarget(float target)
-=========
-*/
-void VM_M_setmousetarget(void)
+static int BufStr_SortStringsUP (const void *in1, const void *in2)
{
- VM_SAFEPARMCOUNT(1, VM_M_setmousetarget);
-
- switch((int)PRVM_G_FLOAT(OFS_PARM0))
- {
- case 1:
- in_client_mouse = false;
- break;
- case 2:
- in_client_mouse = true;
- break;
- default:
- PRVM_ERROR("VM_M_setmousetarget: wrong destination %i !\n",PRVM_G_FLOAT(OFS_PARM0));
- }
+ const char *a, *b;
+ a = *((const char **) in1);
+ b = *((const char **) in2);
+ if(!a[0]) return 1;
+ if(!b[0]) return -1;
+ return strncmp(a, b, buf_sortpower);
}
-/*
-=========
-VM_M_getmousetarget
-
-float getmousetarget
-=========
-*/
-void VM_M_getmousetarget(void)
+static int BufStr_SortStringsDOWN (const void *in1, const void *in2)
{
- VM_SAFEPARMCOUNT(0,VM_M_getmousetarget);
-
- if(in_client_mouse)
- PRVM_G_FLOAT(OFS_RETURN) = 2;
- else
- PRVM_G_FLOAT(OFS_RETURN) = 1;
+ const char *a, *b;
+ a = *((const char **) in1);
+ b = *((const char **) in2);
+ if(!a[0]) return 1;
+ if(!b[0]) return -1;
+ return strncmp(b, a, buf_sortpower);
}
-
-
/*
-=========
-VM_M_setkeydest
-
-setkeydest(float dest)
-=========
+========================
+VM_buf_create
+creates new buffer, and returns it's index, returns -1 if failed
+float buf_create(void) = #460;
+========================
*/
-void VM_M_setkeydest(void)
+void VM_buf_create (void)
{
- VM_SAFEPARMCOUNT(1,VM_M_setkeydest);
-
- switch((int)PRVM_G_FLOAT(OFS_PARM0))
- {
- case 0:
- // key_game
- key_dest = key_game;
- break;
- case 2:
- // key_menu
- key_dest = key_menu;
- break;
- case 1:
- // key_message
- // key_dest = key_message
- // break;
- default:
- PRVM_ERROR("VM_M_setkeydest: wrong destination %i !\n",prog->globals[OFS_PARM0]);
- }
+ int i;
+ VM_SAFEPARMCOUNT(0, VM_buf_create);
+ i = BufStr_FindFreeBuffer();
+ if(i >= 0)
+ num_qcstringbuffers++;
+ //else
+ //Con_Printf("VM_buf_create: buffers overflow in %s\n", PRVM_NAME);
+ PRVM_G_FLOAT(OFS_RETURN) = i;
}
/*
-=========
-VM_M_getkeydest
-
-float getkeydest
-=========
+========================
+VM_buf_del
+deletes buffer and all strings in it
+void buf_del(float bufhandle) = #461;
+========================
*/
-void VM_M_getkeydest(void)
+void VM_buf_del (void)
{
- VM_SAFEPARMCOUNT(0,VM_M_getkeydest);
-
- // key_game = 0, key_message = 1, key_menu = 2, unknown = 3
- switch(key_dest)
+ VM_SAFEPARMCOUNT(1, VM_buf_del);
+ if(BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)))
+ BufStr_ClearBuffer((int)PRVM_G_FLOAT(OFS_PARM0));
+ else
{
- case key_game:
- PRVM_G_FLOAT(OFS_RETURN) = 0;
- break;
- case key_menu:
- PRVM_G_FLOAT(OFS_RETURN) = 2;
- break;
- case key_message:
- // not supported
- // PRVM_G_FLOAT(OFS_RETURN) = 1;
- // break;
- default:
- PRVM_G_FLOAT(OFS_RETURN) = 3;
+ VM_Warning("VM_buf_del: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ return;
}
}
/*
-=========
-VM_M_callfunction
-
- callfunction(...,string function_name)
-Extension: pass
-=========
+========================
+VM_buf_getsize
+how many strings are stored in buffer
+float buf_getsize(float bufhandle) = #462;
+========================
*/
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_M_callfunction(void)
+void VM_buf_getsize (void)
{
- mfunction_t *func;
- const char *s;
-
- if(prog->argc == 0)
- PRVM_ERROR("VM_M_callfunction: 1 parameter is required !\n");
-
- s = PRVM_G_STRING(OFS_PARM0 + (prog->argc - 1));
-
- if(!s)
- PRVM_ERROR("VM_M_callfunction: null string !\n");
-
- VM_CheckEmptyString(s);
+ qcstrbuffer_t *b;
+ VM_SAFEPARMCOUNT(1, VM_buf_getsize);
- func = PRVM_ED_FindFunction(s);
-
- if(!func)
- PRVM_ERROR("VM_M_callfunciton: function %s not found !\n", s);
- else if (func->first_statement < 0)
+ b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
+ if(!b)
{
- // negative statements are built in functions
- int builtinnumber = -func->first_statement;
- prog->xfunction->builtinsprofile++;
- if (builtinnumber < prog->numbuiltins && prog->builtins[builtinnumber])
- prog->builtins[builtinnumber]();
- else
- PRVM_ERROR("No such builtin #%i in %s", builtinnumber, PRVM_NAME);
- }
- else if(func > 0)
- {
- prog->argc--;
- PRVM_ExecuteProgram(func - prog->functions,"");
- prog->argc++;
+ 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);
+ return;
}
-}
-
-/*
-=========
-VM_M_isfunction
-
-float isfunction(string function_name)
-=========
-*/
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_M_isfunction(void)
-{
- mfunction_t *func;
- const char *s;
-
- VM_SAFEPARMCOUNT(1, VM_M_isfunction);
-
- s = PRVM_G_STRING(OFS_PARM0);
-
- if(!s)
- PRVM_ERROR("VM_M_isfunction: null string !\n");
-
- VM_CheckEmptyString(s);
-
- func = PRVM_ED_FindFunction(s);
-
- if(!func)
- PRVM_G_FLOAT(OFS_RETURN) = false;
else
- PRVM_G_FLOAT(OFS_RETURN) = true;
+ PRVM_G_FLOAT(OFS_RETURN) = b->num_strings;
}
/*
-=========
-VM_M_writetofile
-
- writetofile(float fhandle, entity ent)
-=========
+========================
+VM_buf_copy
+copy all content from one buffer to another, make sure it exists
+void buf_copy(float bufhandle_from, float bufhandle_to) = #463;
+========================
*/
-void VM_M_writetofile(void)
+void VM_buf_copy (void)
{
- prvm_edict_t * ent;
- int filenum;
+ qcstrbuffer_t *b1, *b2;
+ int i;
+ VM_SAFEPARMCOUNT(2, VM_buf_copy);
- VM_SAFEPARMCOUNT(2, VM_M_writetofile);
-
- filenum = PRVM_G_FLOAT(OFS_PARM0);
- if (filenum < 0 || filenum >= MAX_VMFILES)
+ b1 = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
+ if(!b1)
{
- Con_Printf("VM_fputs: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_buf_copy: invalid source buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
return;
}
- if (VM_FILES[filenum] == NULL)
+ i = (int)PRVM_G_FLOAT(OFS_PARM1);
+ if(i == (int)PRVM_G_FLOAT(OFS_PARM0))
{
- Con_Printf("VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+ VM_Warning("VM_buf_copy: source == destination (%i) in %s\n", i, PRVM_NAME);
return;
}
-
- ent = PRVM_G_EDICT(OFS_PARM1);
- if(ent->p.e->free)
+ b2 = BUFSTR_BUFFER(i);
+ if(!b2)
{
- Con_Printf("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1));
+ VM_Warning("VM_buf_copy: invalid destination buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME);
return;
}
- PRVM_ED_Write (VM_FILES[filenum], ent);
-}
-
-/*
-=========
-VM_M_getresolution
-
-vector getresolution(float number)
-=========
-*/
-extern unsigned short video_resolutions[][2];
-void VM_M_getresolution(void)
-{
- int nr;
- VM_SAFEPARMCOUNT(1, VM_getresolution);
-
- nr = PRVM_G_FLOAT(OFS_PARM0);
+ BufStr_ClearBuffer(i);
+ qcstringbuffers[i] = (qcstrbuffer_t *)Z_Malloc(sizeof(qcstrbuffer_t));
+ memset(qcstringbuffers[i], 0, sizeof(qcstrbuffer_t));
+ b2->num_strings = b1->num_strings;
-
- PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr][0];
- PRVM_G_VECTOR(OFS_RETURN)[1] = video_resolutions[nr][1];
- PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
+ for(i=0;i<b1->num_strings;i++)
+ if(b1->strings[i] && b1->strings[i][0])
+ {
+ size_t stringlen;
+ stringlen = strlen(b1->strings[i]) + 1;
+ b2->strings[i] = (char *)Z_Malloc(stringlen);
+ if(!b2->strings[i])
+ {
+ VM_Warning("VM_buf_copy: not enough memory for buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME);
+ break;
+ }
+ memcpy(b2->strings[i], b1->strings[i], stringlen);
+ }
}
/*
-=========
-VM_M_keynumtostring
-
-string keynumtostring(float keynum)
-=========
+========================
+VM_buf_sort
+sort buffer by beginnings of strings (sortpower defaults it's lenght)
+"backward == TRUE" means that sorting goes upside-down
+void buf_sort(float bufhandle, float sortpower, float backward) = #464;
+========================
*/
-void VM_M_keynumtostring(void)
+void VM_buf_sort (void)
{
- int keynum;
- char *tmp;
- VM_SAFEPARMCOUNT(1, VM_M_keynumtostring);
+ qcstrbuffer_t *b;
+ int i;
+ VM_SAFEPARMCOUNT(3, VM_buf_sort);
- keynum = PRVM_G_FLOAT(OFS_PARM0);
-
- tmp = VM_GetTempString();
-
- strcpy(tmp, Key_KeynumToString(keynum));
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
-}
-
-/*
-=========
-VM_M_stringtokeynum
-
-float stringtokeynum(string key)
-=========
-*/
-void VM_M_stringtokeynum( void )
-{
- const char *str;
- VM_SAFEPARMCOUNT( 1, VM_M_keynumtostring );
+ b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
+ if(!b)
+ {
+ VM_Warning("VM_buf_sort: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ return;
+ }
+ if(b->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);
+ return;
+ }
+ buf_sortpower = (int)PRVM_G_FLOAT(OFS_PARM1);
+ if(buf_sortpower <= 0)
+ buf_sortpower = 99999999;
- str = PRVM_G_STRING( OFS_PARM0 );
+ if(!PRVM_G_FLOAT(OFS_PARM2))
+ qsort(b->strings, b->num_strings, sizeof(char*), BufStr_SortStringsUP);
+ else
+ qsort(b->strings, b->num_strings, sizeof(char*), BufStr_SortStringsDOWN);
- PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str );
+ for(i=b->num_strings-1;i>=0;i--) //[515]: delete empty lines
+ if(b->strings)
+ {
+ if(b->strings[i][0])
+ break;
+ else
+ {
+ Z_Free(b->strings[i]);
+ --b->num_strings;
+ b->strings[i] = NULL;
+ }
+ }
+ else
+ --b->num_strings;
}
/*
-=========
-VM_M_findkeysforcommand
-
-string findkeysforcommand(string command)
-
-the returned string is an altstring
-=========
+========================
+VM_buf_implode
+concantenates all buffer string into one with "glue" separator and returns it as tempstring
+string buf_implode(float bufhandle, string glue) = #465;
+========================
*/
-#define NUMKEYS 5 // TODO: merge the constant in keys.c with this one somewhen
-
-void M_FindKeysForCommand(const char *command, int *keys);
-void VM_M_findkeysforcommand(void)
+void VM_buf_implode (void)
{
- const char *cmd;
- char *ret;
- int keys[NUMKEYS];
- int i;
-
- VM_SAFEPARMCOUNT(1, VM_M_findkeysforcommand);
-
- cmd = PRVM_G_STRING(OFS_PARM0);
+ qcstrbuffer_t *b;
+ char k[VM_STRINGTEMP_LENGTH];
+ const char *sep;
+ int i;
+ size_t l;
+ VM_SAFEPARMCOUNT(2, VM_buf_implode);
- VM_CheckEmptyString(cmd);
-
- (ret = VM_GetTempString())[0] = 0;
-
- M_FindKeysForCommand(cmd, keys);
-
- for(i = 0; i < NUMKEYS; i++)
- ret = strcat(ret, va(" \'%i\'", keys[i]));
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(ret);
+ b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
+ PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+ if(!b)
+ {
+ VM_Warning("VM_buf_implode: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+ return;
+ }
+ if(!b->num_strings)
+ return;
+ sep = PRVM_G_STRING(OFS_PARM1);
+ k[0] = 0;
+ for(l=i=0;i<b->num_strings;i++)
+ if(b->strings[i])
+ {
+ l += (i > 0 ? strlen(sep) : 0) + strlen(b->strings[i]);
+ if (l >= sizeof(k) - 1)
+ break;
+ strlcat(k, sep, sizeof(k));
+ strlcat(k, b->strings[i], sizeof(k));
+ }
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(k);
}
/*
-=========
-VM_M_getserverliststat
-
-float getserverliststat(float type)
-=========
-*/
-/*
- type:
-0 serverlist_viewcount
-1 serverlist_totalcount
-2 masterquerycount
-3 masterreplycount
-4 serverquerycount
-5 serverreplycount
-6 sortfield
-7 sortdescending
+========================
+VM_bufstr_get
+get a string from buffer, returns tempstring, dont str_unzone it!
+string bufstr_get(float bufhandle, float string_index) = #465;
+========================
*/
-void VM_M_getserverliststat( void )
+void VM_bufstr_get (void)
{
- int type;
- VM_SAFEPARMCOUNT ( 1, VM_M_getserverliststat );
+ qcstrbuffer_t *b;
+ int strindex;
+ VM_SAFEPARMCOUNT(2, VM_bufstr_get);
- PRVM_G_FLOAT( OFS_RETURN ) = 0;
-
- type = PRVM_G_FLOAT( OFS_PARM0 );
- switch(type)
+ PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+ b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
+ if(!b)
{
- case 0:
- PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_viewcount;
- return;
- case 1:
- PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_cachecount;
- case 2:
- PRVM_G_FLOAT ( OFS_RETURN ) = masterquerycount;
- return;
- case 3:
- PRVM_G_FLOAT ( OFS_RETURN ) = masterreplycount;
- return;
- case 4:
- PRVM_G_FLOAT ( OFS_RETURN ) = serverquerycount;
+ VM_Warning("VM_bufstr_get: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
return;
- case 5:
- PRVM_G_FLOAT ( OFS_RETURN ) = serverreplycount;
- return;
- case 6:
- PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_sortbyfield;
- return;
- case 7:
- PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_sortdescending;
+ }
+ strindex = (int)PRVM_G_FLOAT(OFS_PARM1);
+ if(strindex < 0 || strindex > MAX_QCSTR_STRINGS)
+ {
+ VM_Warning("VM_bufstr_get: invalid string index %i used in %s\n", strindex, PRVM_NAME);
return;
- default:
- Con_Printf( "VM_M_getserverliststat: bad type %i!\n", type );
}
+ if(b->num_strings <= strindex)
+ return;
+ if(b->strings[strindex])
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(b->strings[strindex]);
}
/*
========================
-VM_M_resetserverlistmasks
-
-resetserverlistmasks()
+VM_bufstr_set
+copies a string into selected slot of buffer
+void bufstr_set(float bufhandle, float string_index, string str) = #466;
========================
*/
-void VM_M_resetserverlistmasks( void )
+void VM_bufstr_set (void)
{
- ServerList_ResetMasks();
-}
+ int bufindex, strindex;
+ qcstrbuffer_t *b;
+ const char *news;
+ size_t alloclen;
+
+ VM_SAFEPARMCOUNT(3, VM_bufstr_set);
+ bufindex = (int)PRVM_G_FLOAT(OFS_PARM0);
+ b = BUFSTR_BUFFER(bufindex);
+ if(!b)
+ {
+ VM_Warning("VM_bufstr_set: invalid buffer %i used in %s\n", bufindex, PRVM_NAME);
+ return;
+ }
+ strindex = (int)PRVM_G_FLOAT(OFS_PARM1);
+ if(strindex < 0 || strindex > MAX_QCSTR_STRINGS)
+ {
+ VM_Warning("VM_bufstr_set: invalid string index %i used in %s\n", strindex, PRVM_NAME);
+ return;
+ }
+ news = PRVM_G_STRING(OFS_PARM2);
+ if(b->strings[strindex])
+ Z_Free(b->strings[strindex]);
+ alloclen = strlen(news) + 1;
+ b->strings[strindex] = (char *)Z_Malloc(alloclen);
+ memcpy(b->strings[strindex], news, alloclen);
+}
/*
========================
-VM_M_setserverlistmaskstring
-
-setserverlistmaskstring(float mask, float fld, string str, float op)
-0-511 and
-512 - 1024 or
+VM_bufstr_add
+adds string to buffer in nearest free slot and returns it
+"order == TRUE" means that string will be added after last "full" slot
+float bufstr_add(float bufhandle, string str, float order) = #467;
========================
*/
-void VM_M_setserverlistmaskstring( void )
+void VM_bufstr_add (void)
{
- const char *str;
- int masknr;
- serverlist_mask_t *mask;
- int field;
+ int bufindex, order, strindex;
+ qcstrbuffer_t *b;
+ const char *string;
+ size_t alloclen;
- VM_SAFEPARMCOUNT( 4, VM_M_setserverlistmaskstring );
- str = PRVM_G_STRING( OFS_PARM1 );
- if( !str )
- PRVM_ERROR( "VM_M_setserverlistmaskstring: null string passed!" );
+ VM_SAFEPARMCOUNT(3, VM_bufstr_add);
- masknr = PRVM_G_FLOAT( OFS_PARM0 );
- if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
- mask = &serverlist_andmasks[masknr];
- else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
- mask = &serverlist_ormasks[masknr - 512 ];
- else {
- Con_Printf( "VM_M_setserverlistmaskstring: invalid mask number %i\n", masknr );
+ bufindex = (int)PRVM_G_FLOAT(OFS_PARM0);
+ b = BUFSTR_BUFFER(bufindex);
+ PRVM_G_FLOAT(OFS_RETURN) = -1;
+ if(!b)
+ {
+ VM_Warning("VM_bufstr_add: invalid buffer %i used in %s\n", bufindex, PRVM_NAME);
return;
}
-
- field = (int) PRVM_G_FLOAT( OFS_PARM1 );
-
- switch( field ) {
- case SLIF_CNAME:
- strncpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) );
- break;
- case SLIF_NAME:
- strncpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name) );
- break;
- case SLIF_MAP:
- strncpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map) );
- break;
- case SLIF_MOD:
- strncpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod) );
- break;
- case SLIF_GAME:
- strncpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game) );
- break;
- default:
- Con_Printf( "VM_M_setserverlistmaskstring: Bad field number %i passed!\n", field );
+ string = PRVM_G_STRING(OFS_PARM1);
+ order = (int)PRVM_G_FLOAT(OFS_PARM2);
+ if(order)
+ strindex = b->num_strings;
+ else
+ {
+ strindex = BufStr_FindFreeString(b);
+ if(strindex < 0)
+ {
+ VM_Warning("VM_bufstr_add: buffer %i has no free string slots in %s\n", bufindex, PRVM_NAME);
return;
+ }
}
- mask->active = true;
- mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+ while(b->num_strings <= strindex)
+ {
+ if(b->num_strings == MAX_QCSTR_STRINGS)
+ {
+ VM_Warning("VM_bufstr_add: buffer %i has no free string slots in %s\n", bufindex, PRVM_NAME);
+ return;
+ }
+ b->strings[b->num_strings] = NULL;
+ b->num_strings++;
+ }
+ if(b->strings[strindex])
+ Z_Free(b->strings[strindex]);
+ alloclen = strlen(string) + 1;
+ b->strings[strindex] = (char *)Z_Malloc(alloclen);
+ memcpy(b->strings[strindex], string, alloclen);
+ PRVM_G_FLOAT(OFS_RETURN) = strindex;
}
/*
========================
-VM_M_setserverlistmasknumber
-
-setserverlistmasknumber(float mask, float fld, float num, float op)
-
-0-511 and
-512 - 1024 or
+VM_bufstr_free
+delete string from buffer
+void bufstr_free(float bufhandle, float string_index) = #468;
========================
*/
-void VM_M_setserverlistmasknumber( void )
+void VM_bufstr_free (void)
{
- int number;
- serverlist_mask_t *mask;
- int masknr;
- int field;
- VM_SAFEPARMCOUNT( 4, VM_M_setserverlistmasknumber );
+ int i;
+ qcstrbuffer_t *b;
+ VM_SAFEPARMCOUNT(2, VM_bufstr_free);
- masknr = PRVM_G_FLOAT( OFS_PARM0 );
- if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
- mask = &serverlist_andmasks[masknr];
- else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
- mask = &serverlist_ormasks[masknr - 512 ];
- else {
- Con_Printf( "VM_M_setserverlistmasknumber: invalid mask number %i\n", masknr );
+ b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
+ if(!b)
+ {
+ VM_Warning("VM_bufstr_free: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
return;
}
-
- number = PRVM_G_FLOAT( OFS_PARM2 );
- field = (int) PRVM_G_FLOAT( OFS_PARM1 );
-
- switch( field ) {
- case SLIF_MAXPLAYERS:
- mask->info.maxplayers = number;
- break;
- case SLIF_NUMPLAYERS:
- mask->info.numplayers = number;
- break;
- case SLIF_PING:
- mask->info.ping = number;
- break;
- case SLIF_PROTOCOL:
- mask->info.protocol = number;
- break;
- default:
- Con_Printf( "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
- return;
+ i = (int)PRVM_G_FLOAT(OFS_PARM1);
+ if(i < 0 || i > MAX_QCSTR_STRINGS)
+ {
+ VM_Warning("VM_bufstr_free: invalid string index %i used in %s\n", i, PRVM_NAME);
+ return;
}
-
- mask->active = true;
- mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+ if(b->strings[i])
+ Z_Free(b->strings[i]);
+ b->strings[i] = NULL;
+ if(i+1 == b->num_strings)
+ --b->num_strings;
}
+//=============
/*
-========================
-VM_M_resortserverlist
-
-resortserverlist
-========================
-*/
-void VM_M_resortserverlist( void )
-{
- ServerList_RebuildViewList();
-}
-
-/*
-=========
-VM_M_getserverliststring
+==============
+VM_changeyaw
-string getserverliststring(float field, float hostnr)
-=========
+This was a major timewaster in progs, so it was converted to C
+==============
*/
-void VM_M_getserverliststring(void)
+void VM_changeyaw (void)
{
- serverlist_entry_t *cache;
- int hostnr;
-
- VM_SAFEPARMCOUNT(2, VM_M_getserverliststring);
+ prvm_edict_t *ent;
+ float ideal, current, move, speed;
- PRVM_G_INT(OFS_RETURN) = 0;
+ VM_SAFEPARMCOUNT(0, VM_changeyaw);
- hostnr = PRVM_G_FLOAT(OFS_PARM1);
-
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ ent = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict);
+ if (ent == prog->edicts)
{
- Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
+ VM_Warning("changeyaw: can not modify world entity\n");
return;
}
- cache = serverlist_viewlist[hostnr];
- switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
- case SLIF_CNAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.cname );
- break;
- case SLIF_NAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.name );
- break;
- case SLIF_GAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.game );
- break;
- case SLIF_MOD:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.mod );
- break;
- case SLIF_MAP:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.map );
- break;
- // TODO remove this again
- case 1024:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->line1 );
- break;
- case 1025:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->line2 );
- break;
- default:
- Con_Print("VM_M_getserverliststring: bad field number passed!\n");
+ if (ent->priv.server->free)
+ {
+ VM_Warning("changeyaw: can not modify free entity\n");
+ return;
+ }
+ if (prog->fieldoffsets.angles < 0 || prog->fieldoffsets.ideal_yaw < 0 || prog->fieldoffsets.yaw_speed < 0)
+ {
+ VM_Warning("changeyaw: angles, ideal_yaw, or yaw_speed field(s) not found\n");
+ return;
+ }
+ current = ANGLEMOD(PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[1]);
+ ideal = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.ideal_yaw)->_float;
+ speed = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.yaw_speed)->_float;
+
+ if (current == ideal)
+ return;
+ move = ideal - current;
+ if (ideal > current)
+ {
+ if (move >= 180)
+ move = move - 360;
}
+ else
+ {
+ if (move <= -180)
+ move = move + 360;
+ }
+ if (move > 0)
+ {
+ if (move > speed)
+ move = speed;
+ }
+ else
+ {
+ if (move < -speed)
+ move = -speed;
+ }
+
+ PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[1] = ANGLEMOD (current + move);
}
/*
-=========
-VM_M_getserverlistnumber
-
-float getserverlistnumber(float field, float hostnr)
-=========
+==============
+VM_changepitch
+==============
*/
-void VM_M_getserverlistnumber(void)
+void VM_changepitch (void)
{
- serverlist_entry_t *cache;
- int hostnr;
+ prvm_edict_t *ent;
+ float ideal, current, move, speed;
- VM_SAFEPARMCOUNT(2, VM_M_getserverliststring);
+ VM_SAFEPARMCOUNT(1, VM_changepitch);
- PRVM_G_INT(OFS_RETURN) = 0;
-
- hostnr = PRVM_G_FLOAT(OFS_PARM1);
-
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ ent = PRVM_G_EDICT(OFS_PARM0);
+ if (ent == prog->edicts)
{
- Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
+ VM_Warning("changepitch: can not modify world entity\n");
return;
}
- cache = serverlist_viewlist[hostnr];
- switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
- case SLIF_MAXPLAYERS:
- PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers;
- break;
- case SLIF_NUMPLAYERS:
- PRVM_G_FLOAT( OFS_RETURN ) = cache->info.numplayers;
- break;
- case SLIF_PING:
- PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping;
- break;
- case SLIF_PROTOCOL:
- PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol;
- break;
- default:
- Con_Print("VM_M_getserverlistnumber: bad field number passed!\n");
+ if (ent->priv.server->free)
+ {
+ VM_Warning("changepitch: can not modify free entity\n");
+ return;
+ }
+ if (prog->fieldoffsets.angles < 0 || prog->fieldoffsets.idealpitch < 0 || prog->fieldoffsets.pitch_speed < 0)
+ {
+ VM_Warning("changepitch: angles, idealpitch, or pitch_speed field(s) not found\n");
+ return;
+ }
+ current = ANGLEMOD(PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[0]);
+ ideal = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.idealpitch)->_float;
+ speed = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.pitch_speed)->_float;
+
+ if (current == ideal)
+ return;
+ move = ideal - current;
+ if (ideal > current)
+ {
+ if (move >= 180)
+ move = move - 360;
+ }
+ else
+ {
+ if (move <= -180)
+ move = move + 360;
+ }
+ if (move > 0)
+ {
+ if (move > speed)
+ move = speed;
}
+ else
+ {
+ if (move < -speed)
+ move = -speed;
+ }
+
+ PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[0] = ANGLEMOD (current + move);
}
-/*
-========================
-VM_M_setserverlistsort
-setserverlistsort(float field, float descending)
-========================
-*/
-void VM_M_setserverlistsort( void )
+static int Is_Text_Color (char c, char t)
{
- VM_SAFEPARMCOUNT( 2, VM_M_setserverlistsort );
+ int a = 0;
+ char c2 = c - (c & 128);
+ char t2 = t - (t & 128);
- serverlist_sortbyfield = (int) PRVM_G_FLOAT( OFS_PARM0 );
- serverlist_sortdescending = (qboolean) PRVM_G_FLOAT( OFS_PARM1 );
+ if(c != STRING_COLOR_TAG && c2 != STRING_COLOR_TAG) return 0;
+ if(t >= '0' && t <= '9') a = 1;
+ if(t2 >= '0' && t2 <= '9') a = 1;
+/* if(t >= 'A' && t <= 'Z') a = 2;
+ if(t2 >= 'A' && t2 <= 'Z') a = 2;
+
+ if(a == 1 && scr_colortext.integer > 0)
+ return 1;
+ if(a == 2 && scr_multifonts.integer > 0)
+ return 2;
+*/
+ return a;
}
-/*
-========================
-VM_M_refreshserverlist
+void VM_uncolorstring (void)
+{
+ const char *in;
+ char out[VM_STRINGTEMP_LENGTH];
+ int k = 0, i = 0;
-refreshserverlist()
-========================
-*/
-void VM_M_refreshserverlist( void )
+ VM_SAFEPARMCOUNT(1, VM_uncolorstring);
+ in = PRVM_G_STRING(OFS_PARM0);
+ VM_CheckEmptyString (in);
+
+ while (in[k])
+ {
+ if(in[k+1])
+ if(Is_Text_Color(in[k], in[k+1]) == 1/* || (in[k] == '&' && in[k+1] == 'r')*/)
+ {
+ k += 2;
+ continue;
+ }
+ out[i] = in[k];
+ ++k;
+ ++i;
+ }
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(out);
+}
+
+//#222 string(string s, float index) str2chr (FTE_STRINGS)
+void VM_str2chr (void)
{
- VM_SAFEPARMCOUNT( 0, VM_M_refreshserverlist );
- ServerList_QueryList();
+ const char *s;
+ VM_SAFEPARMCOUNT(2, VM_str2chr);
+ s = PRVM_G_STRING(OFS_PARM0);
+ if((unsigned)PRVM_G_FLOAT(OFS_PARM1) > strlen(s))
+ return;
+ PRVM_G_FLOAT(OFS_RETURN) = (unsigned char)s[(int)PRVM_G_FLOAT(OFS_PARM1)];
}
-/*
-========================
-VM_M_getserverlistindexforkey
+//#223 string(float c, ...) chr2str (FTE_STRINGS)
+void VM_chr2str (void)
+{
+ char t[9];
+ int i;
+ VM_SAFEPARMCOUNTRANGE(0, 8, VM_chr2str);
+ 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);
+}
+
+//#228 float(string s1, string s2, float len) strncmp (FTE_STRINGS)
+void VM_strncmp (void)
+{
+ const char *s1, *s2;
+ VM_SAFEPARMCOUNT(1, VM_strncmp);
+ s1 = PRVM_G_STRING(OFS_PARM0);
+ s2 = PRVM_G_STRING(OFS_PARM1);
+ PRVM_G_FLOAT(OFS_RETURN) = strncmp(s1, s2, (size_t)PRVM_G_FLOAT(OFS_PARM2));
+}
+
+void VM_wasfreed (void)
+{
+ 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)
+{
+ prvm_eval_t *val;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_allsolid)))
+ val->_float = trace->allsolid;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_startsolid)))
+ val->_float = trace->startsolid;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_fraction)))
+ val->_float = trace->fraction;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_inwater)))
+ val->_float = trace->inwater;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_inopen)))
+ val->_float = trace->inopen;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_endpos)))
+ VectorCopy(trace->endpos, val->vector);
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_plane_normal)))
+ VectorCopy(trace->plane.normal, val->vector);
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_plane_dist)))
+ val->_float = trace->plane.dist;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_ent)))
+ val->edict = PRVM_EDICT_TO_PROG(trace->ent ? trace->ent : prog->edicts);
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
+ val->_float = trace->startsupercontents;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
+ val->_float = trace->hitsupercontents;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
+ val->_float = trace->hitq3surfaceflags;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
+ val->string = trace->hittexture ? PRVM_SetTempString(trace->hittexture->name) : 0;
+}
+
+//=============
-float getserverlistindexforkey(string key)
-========================
-*/
-void VM_M_getserverlistindexforkey( void )
-{
- const char *key;
- VM_SAFEPARMCOUNT( 1, VM_M_getserverlistindexforkey );
-
- key = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString( key );
-
- if( !strcmp( key, "cname" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_CNAME;
- else if( !strcmp( key, "ping" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_PING;
- else if( !strcmp( key, "game" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_GAME;
- else if( !strcmp( key, "mod" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_MOD;
- else if( !strcmp( key, "map" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_MAP;
- else if( !strcmp( key, "name" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NAME;
- else if( !strcmp( key, "maxplayers" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_MAXPLAYERS;
- else if( !strcmp( key, "numplayers" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NUMPLAYERS;
- else if( !strcmp( key, "protocol" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = SLIF_PROTOCOL;
- else
- PRVM_G_FLOAT( OFS_RETURN ) = -1;
+void VM_Cmd_Init(void)
+{
+ // only init the stuff for the current prog
+ VM_Files_Init();
+ VM_Search_Init();
+// VM_BufStr_Init();
}
-/*
-========================
-VM_M_addwantedserverlistkey
-
-addwantedserverlistkey(string key)
-========================
-*/
-void VM_M_addwantedserverlistkey( void )
-{
- VM_SAFEPARMCOUNT( 1, VM_M_addwantedserverlistkey );
-}
-
-prvm_builtin_t vm_m_builtins[] = {
- 0, // to be consistent with the old vm
- // common builtings (mostly)
- VM_checkextension,
- VM_error,
- VM_objerror,
- VM_print,
- VM_bprint,
- VM_sprint,
- VM_centerprint,
- VM_normalize,
- VM_vlen,
- VM_vectoyaw, // #10
- VM_vectoangles,
- VM_random,
- VM_localcmd,
- VM_cvar,
- VM_cvar_set,
- VM_dprint,
- VM_ftos,
- VM_fabs,
- VM_vtos,
- VM_etos, // 20
- VM_stof,
- VM_spawn,
- VM_remove,
- VM_find,
- VM_findfloat,
- VM_findchain,
- VM_findchainfloat,
- VM_precache_file,
- VM_precache_sound,
- VM_coredump, // 30
- VM_traceon,
- VM_traceoff,
- VM_eprint,
- VM_rint,
- VM_floor,
- VM_ceil,
- VM_nextent,
- VM_sin,
- VM_cos,
- VM_sqrt, // 40
- VM_randomvec,
- VM_registercvar,
- VM_min,
- VM_max,
- VM_bound,
- VM_pow,
- VM_copyentity,
- VM_fopen,
- VM_fclose,
- VM_fgets, // 50
- VM_fputs,
- VM_strlen,
- VM_strcat,
- VM_substring,
- VM_stov,
- VM_strzone,
- VM_strunzone,
- VM_tokenize,
- VM_argv,
- VM_isserver, // 60
- VM_clientcount,
- VM_clientstate,
- VM_clcommand,
- VM_changelevel,
- VM_localsound,
- VM_getmousepos,
- VM_gettime,
- VM_loadfromdata,
- VM_loadfromfile,
- VM_modulo, // 70
- VM_str_cvar,
- VM_crash,
- VM_stackdump, // 73
- VM_search_begin,
- VM_search_end,
- VM_search_getsize,
- VM_search_getfilename, // 77
- VM_chr,
- VM_itof,
- VM_ftoi, // 80
- VM_itof, // isString
- VM_altstr_count,
- VM_altstr_prepare,
- VM_altstr_get,
- VM_altstr_set,
- VM_altstr_ins, // 86
- 0,0,0,0, // 90
- e10, // 100
- e100, // 200
- e100, // 300
- e100, // 400
- // msg functions
- VM_WriteByte,
- VM_WriteChar,
- VM_WriteShort,
- VM_WriteLong,
- VM_WriteAngle,
- VM_WriteCoord,
- VM_WriteString,
- VM_WriteEntity, // 408
- 0,
- 0, // 410
- e10, // 420
- e10, // 430
- e10, // 440
- e10, // 450
- // draw functions
- VM_iscachedpic,
- VM_precache_pic,
- VM_freepic,
- VM_drawcharacter,
- VM_drawstring,
- VM_drawpic,
- VM_drawfill,
- VM_drawsetcliparea,
- VM_drawresetcliparea,
- VM_getimagesize,// 460
- VM_cin_open,
- VM_cin_close,
- VM_cin_setstate,
- VM_cin_getstate,
- VM_cin_restart, // 465
- 0,0,0,0,0, // 470
- e10, // 480
- e10, // 490
- e10, // 500
- e100, // 600
- // menu functions
- VM_M_setkeydest,
- VM_M_getkeydest,
- VM_M_setmousetarget,
- VM_M_getmousetarget,
- VM_M_callfunction,
- VM_M_writetofile,
- VM_M_isfunction,
- VM_M_getresolution,
- VM_M_keynumtostring,
- VM_M_findkeysforcommand,// 610
- VM_M_getserverliststat,
- VM_M_getserverliststring,
- VM_M_parseentitydata,
- VM_M_stringtokeynum,
- VM_M_resetserverlistmasks,
- VM_M_setserverlistmaskstring,
- VM_M_setserverlistmasknumber,
- VM_M_resortserverlist,
- VM_M_setserverlistsort,
- VM_M_refreshserverlist,
- VM_M_getserverlistnumber,
- VM_M_getserverlistindexforkey,
- VM_M_addwantedserverlistkey // 623
-};
-
-const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);
-
-void VM_M_Cmd_Init(void)
-{
- VM_Cmd_Init();
-}
-
-void VM_M_Cmd_Reset(void)
-{
- //VM_Cmd_Init();
- VM_Cmd_Reset();
+void VM_Cmd_Reset(void)
+{
+ CL_PurgeOwner( MENUOWNER );
+ VM_Search_Reset();
+ VM_Files_CloseAll();
+// VM_BufStr_ShutDown();
}
+
projects / xonotic / darkplaces.git / blobdiff