X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=prvm_cmds.c;h=126d3a45d0663d23ae6769d85cc91d13e31e9aef;hb=9dc8149ee231682452a52a4ec4bdee3981da5492;hp=6adb8be7239b5ad5672624a3bbbd801ba17574b1;hpb=38f51a0737fd4570ce597f6d01a26d3d90e06582;p=xonotic%2Fdarkplaces.git diff --git a/prvm_cmds.c b/prvm_cmds.c index 6adb8be7..126d3a45 100644 --- a/prvm_cmds.c +++ b/prvm_cmds.c @@ -1,7 +1,7 @@ // AK // Basically every vm builtin cmd should be in here. -// All 3 builtin list and extension lists can be found here -// cause large (I think they will) are from pr_cmds the same copyright like in pr_cms +// All 3 builtin and extension lists can be found here +// cause large (I think they will) parts are from pr_cmds the same copyright like in pr_cmds // also applies here @@ -42,7 +42,7 @@ 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() @@ -57,7 +57,7 @@ float sin(float) float cos(float) float sqrt(float) vector randomvec() -float registercvar (string name, string value) +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) @@ -88,8 +88,24 @@ float gettime() float mod(float val, float m) const string str_cvar (string) crash() - -perhaps only : Menu : WriteMsg + 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) + +perhaps only : Menu : WriteMsg =============================== WriteByte(float data, float dest, float desto) @@ -100,12 +116,12 @@ perhaps only : Menu : WriteMsg 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 -=============================== + +Client & Menu : draw functions & video functions +=================================================== float iscachedpic(string pic) -string precache_pic(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) @@ -114,26 +130,54 @@ 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 +float getkeydest() setmousetarget(float target) -float getmousetarget(void) +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 gethostcachestat(float type) +string gethostcachestring(float fld, float hostnr) + + parseentitydata(entity ent, string data) + +float stringtokeynum(string key) + + resethostcachemasks() + sethostcachemaskstring(float mask, float fld, string str) + sethostcachemasknumber(float mask, float fld, float num, float op) + resorthostcache() + sethostcachesort(float field, float descending) + refreshhostcache() +float gethostcachenumber(float fld, float hostnr) +float gethostcacheindexforkey(string key) + addwantedhostcachekey(string key) */ #include "quakedef.h" #include "progdefs.h" +#include "progsvm.h" #include "clprogdefs.h" #include "mprogdefs.h" +#include "cl_video.h" + //============================================================================ // nice helper macros @@ -164,11 +208,6 @@ mempool_t *vm_strings_mempool[PRVM_MAXPROGS]; static char vm_string_temp[VM_STRINGTEMP_BUFFERS][VM_STRINGTEMP_LENGTH]; static int vm_string_tempindex = 0; -// qc cvar -#define MAX_QC_CVARS 128 * PRVM_MAXPROGS -cvar_t vm_qc_cvar[MAX_QC_CVARS]; -int vm_currentqc_cvar; - // qc file handling #define MAX_VMFILES 256 #define MAX_PRVMFILES MAX_VMFILES * PRVM_MAXPROGS @@ -176,6 +215,13 @@ int vm_currentqc_cvar; 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; @@ -267,11 +313,11 @@ void VM_error (void) 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); + Con_Printf("======%S ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); if(prog->self) { ed = PRVM_G_EDICT(prog->self->ofs); - PRVM_ED_Print (ed); + PRVM_ED_Print(ed); } PRVM_ERROR ("%s: Program error", PRVM_NAME); @@ -293,11 +339,11 @@ void VM_objerror (void) 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); + Con_Printf("======%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); if(prog->self) { ed = PRVM_G_EDICT (prog->self->ofs); - PRVM_ED_Print (ed); + PRVM_ED_Print(ed); PRVM_ED_Free (ed); } @@ -320,7 +366,7 @@ void VM_print (void) char string[VM_STRINGTEMP_LENGTH]; VM_VarString(0, string, sizeof(string)); - Con_Printf(string); + Con_Print(string); } /* @@ -338,12 +384,12 @@ void VM_bprint (void) if(!sv.active) { - Con_Printf("VM_bprint: game is not server(%s) !", PRVM_NAME); + Con_Printf("VM_bprint: game is not server(%s) !\n", PRVM_NAME); return; } VM_VarString(0, string, sizeof(string)); - SV_BroadcastPrintf("%s", string); + SV_BroadcastPrint(string); } /* @@ -365,13 +411,11 @@ void VM_sprint (void) clientnum = 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 !", PRVM_NAME); + Con_Printf("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); @@ -539,13 +583,9 @@ float random() */ void VM_random (void) { - float num; - VM_SAFEPARMCOUNT(0,VM_random); - num = (rand ()&0x7fff) / ((float)0x7fff); - - PRVM_G_FLOAT(OFS_RETURN) = num; + PRVM_G_FLOAT(OFS_RETURN) = lhrandom(0, 1); } /* @@ -601,19 +641,18 @@ localsound(string sample) void VM_localsound(void) { char *s; - + VM_SAFEPARMCOUNT(1,VM_localsound); s = PRVM_G_STRING(OFS_PARM0); - if(!S_GetCached(s)) + if(!S_LocalSound (s)) { - Con_Printf("VM_localsound: %s : %s not cached !\n", PRVM_NAME, s); + Con_Printf("VM_localsound: Failed to play %s for %s !\n", s, PRVM_NAME); PRVM_G_FLOAT(OFS_RETURN) = -4; return; - } + } - S_LocalSound(s); PRVM_G_FLOAT(OFS_RETURN) = 1; } @@ -669,7 +708,7 @@ VM_str_cvar const string str_cvar (string) ================= */ -void VM_str_cvar(void) +void VM_str_cvar(void) { char *out, *name; const char *cvar_string; @@ -682,13 +721,13 @@ void VM_str_cvar(void) VM_CheckEmptyString(name); - out = VM_GetTempString(); + out = VM_GetTempString(); cvar_string = Cvar_VariableString(name); - + strcpy(out, cvar_string); - PRVM_G_INT(OFS_PARM0) = PRVM_SetString(out); + PRVM_G_INT(OFS_RETURN) = PRVM_SetString(out); } /* @@ -817,6 +856,38 @@ void VM_stof(void) PRVM_G_FLOAT(OFS_RETURN) = atof(string); } +/* +======================== +VM_itof + +float itof(intt ent) +======================== +*/ +void VM_itof(void) +{ + VM_SAFEPARMCOUNT(1, VM_itof); + PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0); +} + +/* +======================== +VM_itoe + +intt ftoi(float num) +======================== +*/ +void VM_ftoi(void) +{ + int ent; + VM_SAFEPARMCOUNT(1, VM_ftoi); + + 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); + + PRVM_G_INT(OFS_RETURN) = ent; +} + /* ========= VM_spawn @@ -837,7 +908,7 @@ void VM_spawn (void) ========= VM_remove -entity remove() +remove(entity e) ========= */ @@ -888,7 +959,7 @@ void VM_find (void) { prog->xfunction->builtinsprofile++; ed = PRVM_EDICT_NUM(e); - if (ed->e->free) + if (ed->p.e->free) continue; t = PRVM_E_STRING(ed,f); if (!t) @@ -929,7 +1000,7 @@ void VM_findfloat (void) { prog->xfunction->builtinsprofile++; ed = PRVM_EDICT_NUM(e); - if (ed->e->free) + if (ed->p.e->free) continue; if (PRVM_E_FLOAT(ed,f) == s) { @@ -981,7 +1052,7 @@ void VM_findchain (void) for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) { prog->xfunction->builtinsprofile++; - if (ent->e->free) + if (ent->p.e->free) continue; t = PRVM_E_STRING(ent,f); if (!t) @@ -989,7 +1060,7 @@ void VM_findchain (void) if (strcmp(t,s)) continue; - PRVM_E_FLOAT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain); + PRVM_E_INT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain); chain = ent; } @@ -1030,12 +1101,12 @@ void VM_findchainfloat (void) for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) { prog->xfunction->builtinsprofile++; - if (ent->e->free) + if (ent->p.e->free) continue; - if (E_FLOAT(ent,f) != s) + if (PRVM_E_FLOAT(ent,f) != s) continue; - PRVM_E_FLOAT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain); + PRVM_E_INT(ent,chain_of) = PRVM_EDICT_TO_PROG(chain); chain = ent; } @@ -1085,15 +1156,9 @@ void VM_precache_sound (void) s = PRVM_G_STRING(OFS_PARM0); PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0); VM_CheckEmptyString (s); - - if(S_GetCached(s)) - { - Con_Printf("VM_precache_sound: %s already cached (%s)\n", s, PRVM_NAME); - return; - } - - if(!S_PrecacheSound(s,true)) - Con_Printf("VM_prache_sound: Failed to load %s for %s\n", s, PRVM_NAME); + + if(snd_initialized.integer && !S_PrecacheSound (s,true, true)) + Con_Printf("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME); } /* @@ -1112,6 +1177,21 @@ void VM_coredump (void) Cbuf_AddText("\n"); } +/* +========= +VM_stackdump + +stackdump() +========= +*/ +void PRVM_StackTrace(void); +void VM_stackdump (void) +{ + VM_SAFEPARMCOUNT(0, VM_stackdump); + + PRVM_StackTrace(); +} + /* ========= VM_crash @@ -1120,7 +1200,7 @@ crash() ========= */ -void VM_crash(void) +void VM_crash(void) { VM_SAFEPARMCOUNT(0, VM_crash); @@ -1241,7 +1321,7 @@ void VM_nextent (void) return; } ent = PRVM_EDICT_NUM(i); - if (!ent->e->free) + if (!ent->p.e->free) { VM_RETURN_EDICT(ent); return; @@ -1323,12 +1403,12 @@ void VM_WriteLong (void) void VM_WriteAngle (void) { - MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); + MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol); } void VM_WriteCoord (void) { - MSG_WriteDPCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); + MSG_WriteCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol); } void VM_WriteString (void) @@ -1359,7 +1439,7 @@ void VM_changelevel (void) if(!sv.active) { - Con_Printf("VM_changelevel: game is not server (%s)\n", PRVM_NAME); + Con_Printf("VM_changelevel: game is not server (%s)\n", PRVM_NAME); return; } @@ -1452,19 +1532,24 @@ void VM_randomvec (void) ========= VM_registercvar -float registercvar (string name, string value) +float registercvar (string name, string value, float flags) ========= */ void VM_registercvar (void) { char *name, *value; - cvar_t *variable; + int flags; - VM_SAFEPARMCOUNT(2,VM_registercvar); + VM_SAFEPARMCOUNT(3,VM_registercvar); name = PRVM_G_STRING(OFS_PARM0); value = PRVM_G_STRING(OFS_PARM1); + flags = PRVM_G_FLOAT(OFS_PARM2); PRVM_G_FLOAT(OFS_RETURN) = 0; + + if(flags > CVAR_MAXFLAGSVAL) + return; + // first check to see if it has already been defined if (Cvar_FindVar (name)) return; @@ -1472,22 +1557,12 @@ void VM_registercvar (void) // check for overlap with a command if (Cmd_Exists (name)) { - Con_Printf ("VM_registercvar: %s is a command\n", name); + Con_Printf("VM_registercvar: %s is a command\n", name); return; } - if (vm_currentqc_cvar >= MAX_QC_CVARS) - PRVM_ERROR ("VM_registercvar: ran out of cvar slots (%i)\n", MAX_QC_CVARS); + Cvar_Get(name, value, flags); -// copy the name and value - variable = &vm_qc_cvar[vm_currentqc_cvar++]; - variable->name = Z_Malloc (strlen(name)+1); - strcpy (variable->name, name); - variable->string = Z_Malloc (strlen(value)+1); - strcpy (variable->string, value); - variable->value = atof (value); - - Cvar_RegisterVariable(variable); PRVM_G_FLOAT(OFS_RETURN) = 1; // success } @@ -1539,7 +1614,7 @@ void VM_max (void) for (i = 1;i < prog->argc;i++) if (PRVM_G_FLOAT((OFS_PARM0+i*3)) > f) f = PRVM_G_FLOAT((OFS_PARM0+i*3)); - G_FLOAT(OFS_RETURN) = f; + PRVM_G_FLOAT(OFS_RETURN) = f; } else PRVM_ERROR("VM_max: %s must supply at least 2 floats\n", PRVM_NAME); @@ -1613,7 +1688,7 @@ setcolor(clientent, value) if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active) { - Con_Printf ("tried to setcolor a non-client\n"); + Con_Print("tried to setcolor a non-client\n"); return; } @@ -1685,7 +1760,7 @@ void VM_fopen(void) modestring = "wb"; break; default: - Con_Printf ("VM_fopen: %s no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode); + 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; return; } @@ -1700,7 +1775,10 @@ void VM_fopen(void) PRVM_G_FLOAT(OFS_RETURN) = -4; return; } - VM_FILES[filenum] = FS_Open(va("data/%s", filename), modestring, false); + 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) PRVM_G_FLOAT(OFS_RETURN) = -1; else @@ -1775,10 +1853,14 @@ void VM_fgets(void) string[end] = 0; // remove \n following \r if (c == '\r') + { c = FS_Getc(VM_FILES[filenum]); - if (developer.integer) + if (c != '\n') + FS_UnGetc(VM_FILES[filenum], (unsigned char)c); + } + if (developer.integer >= 3) Con_Printf("fgets: %s: %s\n", PRVM_NAME, string); - if (c >= 0) + if (c >= 0 || end) PRVM_G_INT(OFS_RETURN) = PRVM_SetString(string); else PRVM_G_INT(OFS_RETURN) = 0; @@ -1853,9 +1935,9 @@ void VM_strcat(void) { char *s; - if(prog->argc < 2) - PRVM_ERROR("VM_strcat wrong parameter count (min. 2 expected ) !\n"); - + 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_SetString(s); @@ -1938,9 +2020,14 @@ strunzone(string s) //void(string s) strunzone = #119; // removes a copy of a string from the string zone (you can not use that string again or it may crash!!!) void VM_strunzone(void) { + char *str; VM_SAFEPARMCOUNT(1,VM_strunzone); - Mem_Free(PRVM_G_STRING(OFS_PARM0)); + str = PRVM_G_STRING(OFS_PARM0); + if( developer.integer && !Mem_IsAllocated( VM_STRINGS_MEMPOOL, str ) ) + PRVM_ERROR( "VM_strunzone: Zone string already freed in %s!", PRVM_NAME ); + else + Mem_Free( str ); } /* @@ -1962,7 +2049,7 @@ void VM_clcommand (void) i = 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 !", PRVM_NAME); + Con_Printf("VM_clientcommand: %s: invalid client/server is not active !\n", PRVM_NAME); return; } @@ -2069,6 +2156,7 @@ void PF_setattachment (void) for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++) if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name)) v->_float = i + 1; + // FIXME: use a model function to get tag info (need to handle skeletal) if (v->_float == 0 && model->alias.aliasnum_tags) for (i = 0;i < model->alias.aliasnum_tags;i++) if (!strcmp(tagname, model->alias.aliasdata_tags[i].name)) @@ -2160,7 +2248,7 @@ void VM_getmousepos(void) { VM_SAFEPARMCOUNT(0,VM_getmousepos); - + PRVM_G_VECTOR(OFS_RETURN)[0] = in_mouse_x; PRVM_G_VECTOR(OFS_RETURN)[1] = in_mouse_y; PRVM_G_VECTOR(OFS_RETURN)[2] = 0; @@ -2194,6 +2282,34 @@ void VM_loadfromdata(void) PRVM_ED_LoadFromFile(PRVM_G_STRING(OFS_PARM0)); } +/* +======================== +VM_M_parseentitydata + +parseentitydata(entity ent, string data) +======================== +*/ +void VM_M_parseentitydata(void) +{ + prvm_edict_t *ent; + const char *data; + + VM_SAFEPARMCOUNT(2, VM_parseentitydata); + + // 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)); + + 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 ); + + PRVM_ED_ParseEdict (data, ent); +} + /* ========= VM_loadfromfile @@ -2205,9 +2321,9 @@ void VM_loadfromfile(void) { char *filename; qbyte *data; - + VM_SAFEPARMCOUNT(1,VM_loadfromfile); - + filename = PRVM_G_STRING(OFS_PARM0); // .. is parent directory on many platforms // / is parent directory on Amiga @@ -2221,10 +2337,10 @@ void VM_loadfromfile(void) } // not conform with VM_fopen - data = FS_LoadFile(filename, false); + data = FS_LoadFile(filename, tempmempool, false); if (data == NULL) PRVM_G_FLOAT(OFS_RETURN) = -1; - + PRVM_ED_LoadFromFile(data); if(data) @@ -2250,6 +2366,174 @@ void VM_modulo(void) PRVM_G_FLOAT(OFS_RETURN) = (float) (val % m); } +void VM_Search_Init(void) +{ + memset(VM_SEARCHLIST,0,sizeof(fssearch_t*[MAX_VMSEARCHES])); +} + +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])); +} + +/* +========= +VM_search_begin + +float search_begin(string pattern, float caseinsensitive, float quiet) +========= +*/ +void VM_search_begin(void) +{ + int handle; + char *pattern; + int caseinsens, quiet; + + VM_SAFEPARMCOUNT(3, VM_search_begin); + + pattern = PRVM_G_STRING(OFS_PARM0); + + VM_CheckEmptyString(pattern); + + caseinsens = PRVM_G_FLOAT(OFS_PARM1); + quiet = PRVM_G_FLOAT(OFS_PARM2); + + for(handle = 0; handle < MAX_VMSEARCHES; handle++) + if(!VM_SEARCHLIST[handle]) + break; + + if(handle >= MAX_VMSEARCHES) + { + Con_Printf("VM_search_begin: %s ran out of search handles (%i)\n", PRVM_NAME, MAX_VMSEARCHES); + PRVM_G_FLOAT(OFS_RETURN) = -2; + return; + } + + if(!(VM_SEARCHLIST[handle] = FS_Search(pattern,caseinsens, quiet))) + PRVM_G_FLOAT(OFS_RETURN) = -1; + else + PRVM_G_FLOAT(OFS_RETURN) = handle; +} + +/* +========= +VM_search_end + +void search_end(float handle) +========= +*/ +void VM_search_end(void) +{ + int handle; + VM_SAFEPARMCOUNT(1, VM_search_end); + + handle = PRVM_G_FLOAT(OFS_PARM0); + + if(handle < 0 || handle >= MAX_VMSEARCHES) + { + Con_Printf("VM_search_end: invalid handle %i used in %s\n", handle, PRVM_NAME); + return; + } + if(VM_SEARCHLIST[handle] == NULL) + { + Con_Printf("VM_search_end: no such handle %i in %s\n", handle, PRVM_NAME); + return; + } + + FS_FreeSearch(VM_SEARCHLIST[handle]); + VM_SEARCHLIST[handle] = NULL; +} + +/* +========= +VM_search_getsize + +float search_getsize(float handle) +========= +*/ +void VM_search_getsize(void) +{ + int handle; + VM_SAFEPARMCOUNT(1, VM_M_search_getsize); + + handle = PRVM_G_FLOAT(OFS_PARM0); + + if(handle < 0 || handle >= MAX_VMSEARCHES) + { + Con_Printf("VM_search_getsize: invalid handle %i used in %s\n", handle, PRVM_NAME); + return; + } + if(VM_SEARCHLIST[handle] == NULL) + { + Con_Printf("VM_search_getsize: no such handle %i in %s\n", handle, PRVM_NAME); + return; + } + + PRVM_G_FLOAT(OFS_RETURN) = VM_SEARCHLIST[handle]->numfilenames; +} + +/* +========= +VM_search_getfilename + +string search_getfilename(float handle, float num) +========= +*/ +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); + + if(handle < 0 || handle >= MAX_VMSEARCHES) + { + Con_Printf("VM_search_getfilename: invalid handle %i used in %s\n", handle, PRVM_NAME); + return; + } + if(VM_SEARCHLIST[handle] == NULL) + { + Con_Printf("VM_search_getfilename: no such handle %i in %s\n", handle, PRVM_NAME); + return; + } + if(filenum < 0 || filenum >= VM_SEARCHLIST[handle]->numfilenames) + { + Con_Printf("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_SetString(tmp); +} + +/* +========= +VM_chr + +string chr(float ascii) +========= +*/ +void VM_chr(void) +{ + char *tmp; + 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_SetString(tmp); +} + //============================================================================= // Draw builtins (client & menu) @@ -2264,33 +2548,33 @@ void VM_iscachedpic(void) { VM_SAFEPARMCOUNT(1,VM_iscachedpic); - // drawq hasnt such a function, thus always return true - PRVM_G_FLOAT(OFS_RETURN) = TRUE; + // drawq hasnt such a function, thus always return true + PRVM_G_FLOAT(OFS_RETURN) = false; } /* ========= VM_precache_pic -string precache_pic(string pic) +string precache_pic(string pic) ========= */ void VM_precache_pic(void) { char *s; - + VM_SAFEPARMCOUNT(1, VM_precache_pic); - + 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); - + if(!Draw_CachePic(s)) - PRVM_G_INT(OFS_RETURN) = PRVM_SetString(""); + PRVM_G_INT(OFS_RETURN) = PRVM_SetString(""); } /* @@ -2307,12 +2591,12 @@ void VM_freepic(void) 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); } @@ -2337,21 +2621,21 @@ void VM_drawcharacter(void) PRVM_G_FLOAT(OFS_RETURN) = -1; return; } - + pos = PRVM_G_VECTOR(OFS_PARM0); scale = PRVM_G_VECTOR(OFS_PARM2); rgb = PRVM_G_VECTOR(OFS_PARM3); flag = (int)PRVM_G_FLOAT(OFS_PARM5); - + if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS) { Con_Printf("VM_drawcharacter: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag); PRVM_G_FLOAT(OFS_RETURN) = -2; return; } - + if(pos[2] || scale[2]) - Con_Printf("VM_drawcharacter: z value%c from %s discarded",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale"))); + Con_Printf("VM_drawcharacter: z value%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale"))); if(!scale[0] || !scale[1]) { @@ -2362,7 +2646,7 @@ void VM_drawcharacter(void) DrawQ_String (pos[0], pos[1], &character, 1, scale[0], scale[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag); PRVM_G_FLOAT(OFS_RETURN) = 1; -} +} /* ========= @@ -2377,7 +2661,7 @@ void VM_drawstring(void) char *string; int flag; VM_SAFEPARMCOUNT(6,VM_drawstring); - + string = PRVM_G_STRING(OFS_PARM1); if(!string) { @@ -2385,21 +2669,21 @@ void VM_drawstring(void) PRVM_G_FLOAT(OFS_RETURN) = -1; return; } - - VM_CheckEmptyString(string); - + + //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); flag = (int)PRVM_G_FLOAT(OFS_PARM5); - + 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; 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"); @@ -2408,8 +2692,8 @@ void VM_drawstring(void) } if(pos[2] || scale[2]) - Con_Printf("VM_drawstring: z value%c from %s discarded",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale"))); - + 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"))); + 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; } @@ -2433,7 +2717,7 @@ void VM_drawpic(void) if(!pic) { Con_Printf("VM_drawpic: %s passed null picture name !\n", PRVM_NAME); - PRVM_G_FLOAT(OFS_RETURN) = -1; + PRVM_G_FLOAT(OFS_RETURN) = -1; return; } @@ -2446,7 +2730,7 @@ void VM_drawpic(void) PRVM_G_FLOAT(OFS_RETURN) = -4; return; } - + pos = PRVM_G_VECTOR(OFS_PARM0); size = PRVM_G_VECTOR(OFS_PARM2); rgb = PRVM_G_VECTOR(OFS_PARM3); @@ -2460,8 +2744,8 @@ void VM_drawpic(void) } if(pos[2] || size[2]) - Con_Printf("VM_drawstring: z value%c from %s discarded",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size"))); - + 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"))); + DrawQ_Pic(pos[0], pos[1], pic, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag); PRVM_G_FLOAT(OFS_RETURN) = 1; } @@ -2477,25 +2761,25 @@ void VM_drawfill(void) { float *size, *pos, *rgb; int flag; - + VM_SAFEPARMCOUNT(5,VM_drawfill); - - + + pos = PRVM_G_VECTOR(OFS_PARM0); size = PRVM_G_VECTOR(OFS_PARM1); rgb = PRVM_G_VECTOR(OFS_PARM2); flag = (int) PRVM_G_FLOAT(OFS_PARM4); - + if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS) { Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag); PRVM_G_FLOAT(OFS_RETURN) = -2; return; } - + if(pos[2] || size[2]) - Con_Printf("VM_drawstring: z value%c from %s discarded",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size"))); - + 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"))); + DrawQ_Pic(pos[0], pos[1], 0, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag); PRVM_G_FLOAT(OFS_RETURN) = 1; } @@ -2512,12 +2796,12 @@ void VM_drawsetcliparea(void) float x,y,w,h; VM_SAFEPARMCOUNT(4,VM_drawsetcliparea); - x = bound(0,PRVM_G_FLOAT(OFS_PARM0),vid.conwidth); - y = bound(0,PRVM_G_FLOAT(OFS_PARM1),vid.conheight); - w = bound(0,PRVM_G_FLOAT(OFS_PARM2),(vid.conwidth - x)); - h = bound(0,PRVM_G_FLOAT(OFS_PARM3),(vid.conheight - y)); + x = bound(0, PRVM_G_FLOAT(OFS_PARM0), vid.conwidth); + y = bound(0, PRVM_G_FLOAT(OFS_PARM1), vid.conheight); + w = bound(0, PRVM_G_FLOAT(OFS_PARM2) + PRVM_G_FLOAT(OFS_PARM0) - x, (vid.conwidth - x)); + h = bound(0, PRVM_G_FLOAT(OFS_PARM3) + PRVM_G_FLOAT(OFS_PARM1) - y, (vid.conheight - y)); - DrawQ_SetClipArea(x,y,w,h); + DrawQ_SetClipArea(x, y, w, h); } /* @@ -2547,12 +2831,12 @@ void VM_getimagesize(void) cachepic_t *pic; 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); pic = Draw_CachePic (p); @@ -2562,66 +2846,353 @@ void VM_getimagesize(void) PRVM_G_VECTOR(OFS_RETURN)[2] = 0; } -void VM_Cmd_Init(void) -{ - // only init the stuff for the current prog - VM_STRINGS_MEMPOOL = Mem_AllocPool(va("vm_stringsmempool[%s]",PRVM_NAME)); - VM_Files_Init(); -} +// CL_Video interface functions -void VM_Cmd_Reset(void) -{ - //Mem_EmptyPool(VM_STRINGS_MEMPOOL); - Mem_FreePool(&VM_STRINGS_MEMPOOL); - VM_Files_CloseAll(); -} +/* +======================== +VM_cin_open -//============================================================================ -// Server +float cin_open(string file, string name) +======================== +*/ +void VM_cin_open( void ) +{ + char *file; + char *name; -char *vm_sv_extensions = -""; + VM_SAFEPARMCOUNT( 2, VM_cin_open ); -prvm_builtin_t vm_sv_builtins[] = { -0 // to be consistent with the old vm -}; + file = PRVM_G_STRING( OFS_PARM0 ); + name = PRVM_G_STRING( OFS_PARM1 ); -const int vm_sv_numbuiltins = sizeof(vm_sv_builtins) / sizeof(prvm_builtin_t); + VM_CheckEmptyString( file ); + VM_CheckEmptyString( name ); -void VM_SV_Cmd_Init(void) -{ + if( CL_OpenVideo( file, name, MENUOWNER ) ) + PRVM_G_FLOAT( OFS_RETURN ) = 1; + else + PRVM_G_FLOAT( OFS_RETURN ) = 0; } -void VM_SV_Cmd_Reset(void) +/* +======================== +VM_cin_close + +void cin_close(string name) +======================== +*/ +void VM_cin_close( void ) { + char *name; + + VM_SAFEPARMCOUNT( 1, VM_cin_close ); + + name = PRVM_G_STRING( OFS_PARM0 ); + VM_CheckEmptyString( name ); + + CL_CloseVideo( CL_GetVideo( name ) ); } -//============================================================================ -// Client +/* +======================== +VM_cin_setstate +void cin_setstate(string name, float type) +======================== +*/ +void VM_cin_setstate( void ) +{ + char *name; + clvideostate_t state; + clvideo_t *video; -char *vm_cl_extensions = -""; + VM_SAFEPARMCOUNT( 2, VM_cin_netstate ); -prvm_builtin_t vm_cl_builtins[] = { -0 // to be consistent with the old vm -}; + name = PRVM_G_STRING( OFS_PARM0 ); + VM_CheckEmptyString( name ); -const int vm_cl_numbuiltins = sizeof(vm_cl_builtins) / sizeof(prvm_builtin_t); + state = PRVM_G_FLOAT( OFS_PARM1 ); -void VM_CL_Cmd_Init(void) -{ + video = CL_GetVideo( name ); + if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT ) + CL_SetVideoState( video, state ); } -void VM_CL_Cmd_Reset(void) +/* +======================== +VM_cin_getstate + +float cin_getstate(string name) +======================== +*/ +void VM_cin_getstate( void ) { -} + char *name; + clvideo_t *video; -//============================================================================ -// Menu + VM_SAFEPARMCOUNT( 1, VM_cin_getstate ); -char *vm_m_extensions = + name = PRVM_G_STRING( OFS_PARM0 ); + VM_CheckEmptyString( name ); + + video = CL_GetVideo( name ); + if( video ) + PRVM_G_FLOAT( OFS_RETURN ) = (int)video->state; + else + PRVM_G_FLOAT( OFS_RETURN ) = 0; +} + +/* +======================== +VM_cin_restart + +void cin_restart(string name) +======================== +*/ +void VM_cin_restart( void ) +{ + char *name; + clvideo_t *video; + + VM_SAFEPARMCOUNT( 1, VM_cin_restart ); + + name = PRVM_G_STRING( OFS_PARM0 ); + VM_CheckEmptyString( name ); + + video = CL_GetVideo( name ); + if( video ) + CL_RestartVideo( video ); +} + +//////////////////////////////////////// +// AltString functions +//////////////////////////////////////// + +/* +======================== +VM_altstr_count + +float altstr_count(string) +======================== +*/ +void VM_altstr_count( void ) +{ + char *altstr, *pos; + int count; + + VM_SAFEPARMCOUNT( 1, VM_altstr_count ); + + altstr = PRVM_G_STRING( OFS_PARM0 ); + //VM_CheckEmptyString( altstr ); + + for( count = 0, pos = altstr ; *pos ; pos++ ) + if( *pos == '\\' && !*++pos ) + break; + else if( *pos == '\'' ) + count++; + + PRVM_G_FLOAT( OFS_RETURN ) = (float) (count / 2); +} + +/* +======================== +VM_altstr_prepare + +string altstr_prepare(string) +======================== +*/ +void VM_altstr_prepare( void ) +{ + char *outstr, *out; + char *instr, *in; + int size; + + 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++ ) + if( *in == '\'' ) { + *out++ = '\\'; + *out = '\''; + size--; + } else + *out = *in; + *out = 0; + + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( outstr ); +} + +/* +======================== +VM_altstr_get + +string altstr_get(string, float) +======================== +*/ +void VM_altstr_get( void ) +{ + char *altstr, *pos, *outstr, *out; + int count, size; + + VM_SAFEPARMCOUNT( 2, VM_altstr_get ); + + altstr = PRVM_G_STRING( OFS_PARM0 ); + //VM_CheckEmptyString( altstr ); + + count = PRVM_G_FLOAT( OFS_PARM1 ); + count = count * 2 + 1; + + for( pos = altstr ; *pos && count ; pos++ ) + if( *pos == '\\' && !*++pos ) + break; + else if( *pos == '\'' ) + count--; + + if( !*pos ) { + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( "" ); + return; + } + + outstr = VM_GetTempString(); + for( out = outstr, size = VM_STRINGTEMP_LENGTH - 1 ; size && *pos ; size--, pos++, out++ ) + if( *pos == '\\' ) { + if( !*++pos ) + break; + *out = *pos; + size--; + } else if( *pos == '\'' ) + break; + else + *out = *pos; + + *out = 0; + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( outstr ); +} + +/* +======================== +VM_altstr_set + +string altstr_set(string altstr, float num, string set) +======================== +*/ +void VM_altstr_set( void ) +{ + int num; + char *altstr, *str; + char *in; + char *outstr, *out; + + VM_SAFEPARMCOUNT( 3, VM_altstr_set ); + + altstr = PRVM_G_STRING( OFS_PARM0 ); + //VM_CheckEmptyString( altstr ); + + num = PRVM_G_FLOAT( OFS_PARM1 ); + + str = PRVM_G_STRING( OFS_PARM2 ); + //VM_CheckEmptyString( str ); + + outstr = out = VM_GetTempString(); + for( num = num * 2 + 1, in = altstr; *in && num; *out++ = *in++ ) + if( *in == '\\' && !*++in ) + break; + else if( *in == '\'' ) + num--; + + if( !in ) { + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( "" ); + return; + } + // copy set in + for( ; *str; *out++ = *str++ ); + // now jump over the old contents + for( ; *in ; in++ ) + if( *in == '\'' || (*in == '\\' && !*++in) ) + break; + + if( !in ) { + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( "" ); + return; + } + + strcpy( out, in ); + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( outstr ); +} + +void VM_Cmd_Init(void) +{ + // only init the stuff for the current prog + VM_STRINGS_MEMPOOL = Mem_AllocPool(va("vm_stringsmempool[%s]",PRVM_NAME), 0, NULL); + VM_Files_Init(); + VM_Search_Init(); +} + +void VM_Cmd_Reset(void) +{ + //Mem_EmptyPool(VM_STRINGS_MEMPOOL); + if( developer.integer >= 2 && VM_STRINGS_MEMPOOL ) { + memheader_t *header; + int i; + + for( i = 0, header = VM_STRINGS_MEMPOOL->chain ; header ; header = header->next, i++ ) + Con_DPrintf( "Leaked string %i (size: %i): %.*s\n", i, header->size, header->size, ((char*)header) + sizeof( memheader_t ) ); + } + + Mem_FreePool(&VM_STRINGS_MEMPOOL); + CL_PurgeOwner( MENUOWNER ); + VM_Search_Reset(); + VM_Files_CloseAll(); +} + +//============================================================================ +// Server + +char *vm_sv_extensions = ""; +prvm_builtin_t vm_sv_builtins[] = { +0 // to be consistent with the old vm +}; + +const int vm_sv_numbuiltins = sizeof(vm_sv_builtins) / sizeof(prvm_builtin_t); + +void VM_SV_Cmd_Init(void) +{ +} + +void VM_SV_Cmd_Reset(void) +{ +} + +//============================================================================ +// Client + +char *vm_cl_extensions = +""; + +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) +{ +} + +void VM_CL_Cmd_Reset(void) +{ +} + +//============================================================================ +// Menu + +char *vm_m_extensions = +"DP_CINEMATIC_DPV"; + /* ========= VM_M_setmousetarget @@ -2662,7 +3233,7 @@ void VM_M_getmousetarget(void) else PRVM_G_FLOAT(OFS_RETURN) = 1; } - + /* @@ -2729,6 +3300,7 @@ void VM_M_getkeydest(void) VM_M_callfunction callfunction(...,string function_name) +Extension: pass ========= */ mfunction_t *PRVM_ED_FindFunction (const char *name); @@ -2745,7 +3317,7 @@ void VM_M_callfunction(void) if(!s) PRVM_ERROR("VM_M_callfunction: null string !\n"); - VM_CheckEmptyString(s); + VM_CheckEmptyString(s); func = PRVM_ED_FindFunction(s); @@ -2767,7 +3339,7 @@ void VM_M_callfunction(void) PRVM_ExecuteProgram(func - prog->functions,""); prog->argc++; } -} +} /* ========= @@ -2781,16 +3353,16 @@ void VM_M_isfunction(void) { mfunction_t *func; 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); - + + VM_CheckEmptyString(s); + func = PRVM_ED_FindFunction(s); if(!func) @@ -2825,8 +3397,8 @@ void VM_M_writetofile(void) return; } - ent = PRVM_G_EDICT(OFS_PARM1); - if(ent->e->free) + ent = PRVM_G_EDICT(OFS_PARM1); + if(ent->p.e->free) { Con_Printf("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1)); return; @@ -2835,6 +3407,464 @@ void VM_M_writetofile(void) 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); + + + 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; +} + +/* +========= +VM_M_keynumtostring + +string keynumtostring(float keynum) +========= +*/ +void VM_M_keynumtostring(void) +{ + int keynum; + char *tmp; + VM_SAFEPARMCOUNT(1, VM_M_keynumtostring); + + keynum = PRVM_G_FLOAT(OFS_PARM0); + + tmp = VM_GetTempString(); + + strcpy(tmp, Key_KeynumToString(keynum)); + + PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tmp); +} + +/* +========= +VM_M_stringtokeynum + +float stringtokeynum(string key) +========= +*/ +void VM_M_stringtokeynum( void ) +{ + char *str; + VM_SAFEPARMCOUNT( 1, VM_M_keynumtostring ); + + str = PRVM_G_STRING( OFS_PARM0 ); + + PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str ); +} + +/* +========= +VM_M_findkeysforcommand + +string findkeysforcommand(string command) + +the returned string is an altstring +========= +*/ +#define NUMKEYS 5 // TODO: merge the constant in keys.c with this one somewhen + +void M_FindKeysForCommand(char *command, int *keys); +void VM_M_findkeysforcommand(void) +{ + char *cmd, *ret; + int keys[NUMKEYS]; + int i; + + VM_SAFEPARMCOUNT(1, VM_M_findkeysforcommand); + + cmd = PRVM_G_STRING(OFS_PARM0); + + 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_SetString(ret); +} + +/* +========= +VM_M_gethostcachestat + +float gethostcachestat(float type) +========= +*/ +/* + type: +0 hostcache_viewcount +1 hostcache_totalcount +2 masterquerycount +3 masterreplycount +4 serverquerycount +5 serverreplycount +6 sortfield +7 sortdescending +*/ +void VM_M_gethostcachestat( void ) +{ + int type; + VM_SAFEPARMCOUNT ( 1, VM_M_gethostcachestat ); + + PRVM_G_FLOAT( OFS_RETURN ) = 0; + + type = PRVM_G_FLOAT( OFS_PARM0 ); + switch(type) + { + case 0: + PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_viewcount; + return; + case 1: + PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_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; + return; + case 5: + PRVM_G_FLOAT ( OFS_RETURN ) = serverreplycount; + return; + case 6: + PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_sortbyfield; + return; + case 7: + PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_sortdescending; + return; + default: + Con_Printf( "VM_M_gethostcachestat: bad type %i!\n", type ); + } +} + +/* +======================== +VM_M_resethostcachemasks + +resethostcachemasks() +======================== +*/ +void VM_M_resethostcachemasks( void ) +{ + HostCache_ResetMasks(); +} + + +/* +======================== +VM_M_sethostcachemaskstring + +sethostcachemaskstring(float mask, float fld, string str, float op) +0-511 and +512 - 1024 or +======================== +*/ +void VM_M_sethostcachemaskstring( void ) +{ + char *str; + int masknr; + hostcache_mask_t *mask; + int field; + + VM_SAFEPARMCOUNT( 4, VM_M_sethostcachemaskstring ); + str = PRVM_G_STRING( OFS_PARM1 ); + if( !str ) + PRVM_ERROR( "VM_M_sethostcachemaskstring: null string passed!" ); + + masknr = PRVM_G_FLOAT( OFS_PARM0 ); + if( masknr >= 0 && masknr <= HOSTCACHE_ANDMASKCOUNT ) + mask = &hostcache_andmasks[masknr]; + else if( masknr >= 512 && masknr - 512 <= HOSTCACHE_ORMASKCOUNT ) + mask = &hostcache_ormasks[masknr - 512 ]; + else { + Con_Printf( "VM_M_sethostcachemaskstring: invalid mask number %i\n", masknr ); + return; + } + + field = (int) PRVM_G_FLOAT( OFS_PARM1 ); + + switch( field ) { + case HCIF_CNAME: + strncpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) ); + break; + case HCIF_NAME: + strncpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name) ); + break; + case HCIF_MAP: + strncpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map) ); + break; + case HCIF_MOD: + strncpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod) ); + break; + case HCIF_GAME: + strncpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game) ); + break; + default: + Con_Printf( "VM_M_sethostcachemaskstring: Bad field number %i passed!\n", field ); + return; + } + + mask->active = true; + mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 ); +} + +/* +======================== +VM_M_sethostcachemasknumber + +sethostcachemasknumber(float mask, float fld, float num, float op) + +0-511 and +512 - 1024 or +======================== +*/ +void VM_M_sethostcachemasknumber( void ) +{ + int number; + hostcache_mask_t *mask; + int masknr; + int field; + VM_SAFEPARMCOUNT( 4, VM_M_sethostcachemasknumber ); + + masknr = PRVM_G_FLOAT( OFS_PARM0 ); + if( masknr >= 0 && masknr <= HOSTCACHE_ANDMASKCOUNT ) + mask = &hostcache_andmasks[masknr]; + else if( masknr >= 512 && masknr - 512 <= HOSTCACHE_ORMASKCOUNT ) + mask = &hostcache_ormasks[masknr - 512 ]; + else { + Con_Printf( "VM_M_sethostcachemasknumber: invalid mask number %i\n", masknr ); + return; + } + + number = PRVM_G_FLOAT( OFS_PARM2 ); + field = (int) PRVM_G_FLOAT( OFS_PARM1 ); + + switch( field ) { + case HCIF_MAXPLAYERS: + mask->info.maxplayers = number; + break; + case HCIF_NUMPLAYERS: + mask->info.numplayers = number; + break; + case HCIF_PING: + mask->info.ping = number; + break; + case HCIF_PROTOCOL: + mask->info.protocol = number; + break; + default: + Con_Printf( "VM_M_sethostcachemasknumber: Bad field number %i passed!\n", field ); + return; + } + + mask->active = true; + mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 ); +} + + +/* +======================== +VM_M_resorthostcache + +resorthostcache +======================== +*/ +void VM_M_resorthostcache( void ) +{ + HostCache_RebuildViewSet(); +} + +/* +========= +VM_M_gethostcachestring + +string gethostcachestring(float field, float hostnr) +========= +*/ +void VM_M_gethostcachestring(void) +{ + hostcache_t *cache; + int hostnr; + + VM_SAFEPARMCOUNT(2, VM_M_gethostcachestring); + + PRVM_G_INT(OFS_RETURN) = 0; + + hostnr = PRVM_G_FLOAT(OFS_PARM1); + + if(hostnr < 0 || hostnr >= hostcache_viewcount) + { + Con_Print("VM_M_gethostcachestring: bad hostnr passed!\n"); + return; + } + cache = hostcache_viewset[hostnr]; + switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) { + case HCIF_CNAME: + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.cname ); + break; + case HCIF_NAME: + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.name ); + break; + case HCIF_GAME: + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.game ); + break; + case HCIF_MOD: + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.mod ); + break; + case HCIF_MAP: + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.map ); + break; + // TODO remove this again + case 1024: + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->line1 ); + break; + case 1025: + PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->line2 ); + break; + default: + Con_Print("VM_M_gethostcachestring: bad field number passed!\n"); + } +} + +/* +========= +VM_M_gethostcachenumber + +float gethostcachenumber(float field, float hostnr) +========= +*/ +void VM_M_gethostcachenumber(void) +{ + hostcache_t *cache; + int hostnr; + + VM_SAFEPARMCOUNT(2, VM_M_gethostcachestring); + + PRVM_G_INT(OFS_RETURN) = 0; + + hostnr = PRVM_G_FLOAT(OFS_PARM1); + + if(hostnr < 0 || hostnr >= hostcache_viewcount) + { + Con_Print("VM_M_gethostcachestring: bad hostnr passed!\n"); + return; + } + cache = hostcache_viewset[hostnr]; + switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) { + case HCIF_MAXPLAYERS: + PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers; + break; + case HCIF_NUMPLAYERS: + PRVM_G_FLOAT( OFS_RETURN ) = cache->info.numplayers; + break; + case HCIF_PING: + PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping; + break; + case HCIF_PROTOCOL: + PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol; + break; + default: + Con_Print("VM_M_gethostcachenumber: bad field number passed!\n"); + } +} + +/* +======================== +VM_M_sethostcachesort + +sethostcachesort(float field, float descending) +======================== +*/ +void VM_M_sethostcachesort( void ) +{ + VM_SAFEPARMCOUNT( 2, VM_M_sethostcachesort ); + + hostcache_sortbyfield = (int) PRVM_G_FLOAT( OFS_PARM0 ); + hostcache_sortdescending = (qboolean) PRVM_G_FLOAT( OFS_PARM1 ); +} + +/* +======================== +VM_M_refreshhostcache + +refreshhostcache() +======================== +*/ +void VM_M_refreshhostcache( void ) +{ + VM_SAFEPARMCOUNT( 0, VM_M_refreshhostcache ); + HostCache_QueryList(); +} + +/* +======================== +VM_M_gethostcacheindexforkey + +float gethostcacheindexforkey(string key) +======================== +*/ +void VM_M_gethostcacheindexforkey( void ) +{ + char *key; + VM_SAFEPARMCOUNT( 1, VM_M_gethostcacheindexforkey ); + + key = PRVM_G_STRING( OFS_PARM0 ); + VM_CheckEmptyString( key ); + + if( !strcmp( key, "cname" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_CNAME; + else if( !strcmp( key, "ping" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_PING; + else if( !strcmp( key, "game" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_GAME; + else if( !strcmp( key, "mod" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_MOD; + else if( !strcmp( key, "map" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_MAP; + else if( !strcmp( key, "name" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_NAME; + else if( !strcmp( key, "maxplayers" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_MAXPLAYERS; + else if( !strcmp( key, "numplayers" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_NUMPLAYERS; + else if( !strcmp( key, "protocol" ) ) + PRVM_G_FLOAT( OFS_RETURN ) = HCIF_PROTOCOL; + else + PRVM_G_FLOAT( OFS_RETURN ) = -1; +} + +/* +======================== +VM_M_addwantedhostcachekey + +addwantedhostcachekey(string key) +======================== +*/ +void VM_M_addwantedhostcachekey( void ) +{ + VM_SAFEPARMCOUNT( 1, VM_M_addwantedhostcachekey ); +} + prvm_builtin_t vm_m_builtins[] = { 0, // to be consistent with the old vm // common builtings (mostly) @@ -2898,20 +3928,32 @@ prvm_builtin_t vm_m_builtins[] = { VM_tokenize, VM_argv, VM_isserver, // 60 - VM_clientcount, - VM_clientstate, + VM_clientcount, + VM_clientstate, VM_clcommand, VM_changelevel, - VM_localsound, + VM_localsound, VM_getmousepos, VM_gettime, VM_loadfromdata, VM_loadfromfile, VM_modulo, // 70 - VM_str_cvar, - VM_crash, // 72 - 0,0,0,0,0,0,0,0,// 80 - e10, // 90 + 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, // 85 + 0,0,0,0,0, // 90 e10, // 100 e100, // 200 e100, // 300 @@ -2938,11 +3980,16 @@ prvm_builtin_t vm_m_builtins[] = { VM_drawcharacter, VM_drawstring, VM_drawpic, - VM_drawfill, + VM_drawfill, VM_drawsetcliparea, VM_drawresetcliparea, VM_getimagesize,// 460 - e10, // 470 + 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 @@ -2954,7 +4001,23 @@ prvm_builtin_t vm_m_builtins[] = { VM_M_getmousetarget, VM_M_callfunction, VM_M_writetofile, - VM_M_isfunction // 607 + VM_M_isfunction, + VM_M_getresolution, + VM_M_keynumtostring, + VM_M_findkeysforcommand,// 610 + VM_M_gethostcachestat, + VM_M_gethostcachestring, + VM_M_parseentitydata, + VM_M_stringtokeynum, + VM_M_resethostcachemasks, + VM_M_sethostcachemaskstring, + VM_M_sethostcachemasknumber, + VM_M_resorthostcache, + VM_M_sethostcachesort, + VM_M_refreshhostcache, + VM_M_gethostcachenumber, + VM_M_gethostcacheindexforkey, + VM_M_addwantedhostcachekey // 623 }; const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t); @@ -2969,4 +4032,3 @@ void VM_M_Cmd_Reset(void) //VM_Cmd_Init(); VM_Cmd_Reset(); } -