char *vm_m_extensions =
"BX_WAL_SUPPORT "
"DP_CINEMATIC_DPV "
+"DP_GFX_FONTS "
+"DP_GFX_FONTS_FREETYPE "
+"DP_UTF8 "
"DP_FONT_VARIABLEWIDTH "
"DP_GECKO_SUPPORT "
"DP_MENU_EXTRESPONSEPACKET "
"DP_QC_ASINACOSATANATAN2TAN "
+"DP_QC_AUTOCVARS "
"DP_QC_CMD "
"DP_QC_CRC16 "
"DP_QC_CVAR_TYPE "
"DP_QC_CVAR_DESCRIPTION "
"DP_QC_FINDCHAIN_TOFIELD "
+"DP_QC_LOG "
"DP_QC_RENDER_SCENE "
+"DP_QC_SPRINTF "
"DP_QC_STRFTIME "
"DP_QC_STRINGBUFFERS "
"DP_QC_STRINGBUFFERS_CVARLIST "
}
}
-/*
-=========
-VM_M_callfunction
-
- callfunction(...,string function_name)
-Extension: pass
-=========
-*/
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_M_callfunction(void)
-{
- mfunction_t *func;
- const char *s;
-
- VM_SAFEPARMCOUNTRANGE(1, 8, VM_M_callfunction);
-
- s = PRVM_G_STRING(OFS_PARM0+(prog->argc - 1)*3);
-
- VM_CheckEmptyString(s);
-
- func = PRVM_ED_FindFunction(s);
-
- if(!func)
- PRVM_ERROR("VM_M_callfunciton: function %s not found !", s);
- else if (func->first_statement < 0)
- {
- // negative statements are built in functions
- int builtinnumber = -func->first_statement;
- prog->xfunction->builtinsprofile++;
- if (builtinnumber < prog->numbuiltins && prog->builtins[builtinnumber])
- prog->builtins[builtinnumber]();
- else
- PRVM_ERROR("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, PRVM_NAME);
- }
- else if(func - prog->functions > 0)
- {
- prog->argc--;
- PRVM_ExecuteProgram(func - prog->functions,"");
- prog->argc++;
- }
-}
-
-/*
-=========
-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);
-
- VM_CheckEmptyString(s);
-
- func = PRVM_ED_FindFunction(s);
-
- if(!func)
- PRVM_G_FLOAT(OFS_RETURN) = false;
- else
- PRVM_G_FLOAT(OFS_RETURN) = true;
-}
/*
=========
*/
void VM_M_getresolution(void)
{
- int nr;
- VM_SAFEPARMCOUNT(1, VM_getresolution);
+ int nr, fs;
+ VM_SAFEPARMCOUNTRANGE(1, 2, VM_getresolution);
nr = (int)PRVM_G_FLOAT(OFS_PARM0);
- if(nr < 0 || nr >= video_resolutions_count)
+ fs = ((prog->argc <= 1) || ((int)PRVM_G_FLOAT(OFS_PARM1)));
+
+ if(nr < 0 || nr >= (fs ? video_resolutions_count : video_resolutions_hardcoded_count))
{
PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
}
else
{
- PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr].width;
- PRVM_G_VECTOR(OFS_RETURN)[1] = video_resolutions[nr].height;
- PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
+ video_resolution_t *r = &((fs ? video_resolutions : video_resolutions_hardcoded)[nr]);
+ PRVM_G_VECTOR(OFS_RETURN)[0] = r->width;
+ PRVM_G_VECTOR(OFS_RETURN)[1] = r->height;
+ PRVM_G_VECTOR(OFS_RETURN)[2] = r->pixelheight;
}
}
if(nr >= 0 && nr < fs_all_gamedirs_count)
{
if(item == 0)
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( fs_all_gamedirs[nr].name );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( fs_all_gamedirs[nr].name );
else if(item == 1)
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( fs_all_gamedirs[nr].description );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( fs_all_gamedirs[nr].description );
}
}
return;
case 1:
PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_cachecount;
+ return;
case 2:
PRVM_G_FLOAT ( OFS_RETURN ) = masterquerycount;
return;
switch( field ) {
case SLIF_CNAME:
- strlcpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) );
+ strlcpy( mask->info.cname, str, sizeof(mask->info.cname) );
break;
case SLIF_NAME:
- strlcpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name) );
+ strlcpy( mask->info.name, str, sizeof(mask->info.name) );
break;
case SLIF_QCSTATUS:
- strlcpy( mask->info.qcstatus, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.qcstatus) );
+ strlcpy( mask->info.qcstatus, str, sizeof(mask->info.qcstatus) );
break;
case SLIF_PLAYERS:
- strlcpy( mask->info.players, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.players) );
+ strlcpy( mask->info.players, str, sizeof(mask->info.players) );
break;
case SLIF_MAP:
- strlcpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map) );
+ strlcpy( mask->info.map, str, sizeof(mask->info.map) );
break;
case SLIF_MOD:
- strlcpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod) );
+ strlcpy( mask->info.mod, str, sizeof(mask->info.mod) );
break;
case SLIF_GAME:
- strlcpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game) );
+ strlcpy( mask->info.game, str, sizeof(mask->info.game) );
break;
default:
VM_Warning( "VM_M_setserverlistmaskstring: Bad field number %i passed!\n", field );
mask->info.freeslots = number;
break;
case SLIF_ISFAVORITE:
- mask->info.isfavorite = number;
+ mask->info.isfavorite = number != 0;
break;
default:
VM_Warning( "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
return;
}
- cache = serverlist_viewlist[hostnr];
+ cache = ServerList_GetViewEntry(hostnr);
switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
case SLIF_CNAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.cname );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.cname );
break;
case SLIF_NAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.name );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.name );
break;
case SLIF_QCSTATUS:
- PRVM_G_INT (OFS_RETURN ) = PRVM_SetEngineString (cache->info.qcstatus );
+ PRVM_G_INT (OFS_RETURN ) = PRVM_SetTempString (cache->info.qcstatus );
break;
case SLIF_PLAYERS:
- PRVM_G_INT (OFS_RETURN ) = PRVM_SetEngineString (cache->info.players );
+ PRVM_G_INT (OFS_RETURN ) = PRVM_SetTempString (cache->info.players );
break;
case SLIF_GAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.game );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.game );
break;
case SLIF_MOD:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.mod );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.mod );
break;
case SLIF_MAP:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.map );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.map );
break;
// TODO remove this again
case 1024:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->line1 );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->line1 );
break;
case 1025:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->line2 );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->line2 );
break;
default:
Con_Print("VM_M_getserverliststring: bad field number passed!\n");
Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
return;
}
- cache = serverlist_viewlist[hostnr];
+ cache = ServerList_GetViewEntry(hostnr);
switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
case SLIF_MAXPLAYERS:
PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers;
VectorSet(PRVM_G_VECTOR(OFS_RETURN), in_mouse_x * vid_conwidth.integer / vid.width, in_mouse_y * vid_conheight.integer / vid.height, 0);
}
-//#349 float() isdemo (EXT_CSQC)
-static void VM_M_isdemo (void)
-{
- VM_SAFEPARMCOUNT(0, VM_M_isdemo);
- PRVM_G_FLOAT(OFS_RETURN) = cls.demoplayback;
-}
-
prvm_builtin_t vm_m_builtins[] = {
NULL, // #0 NULL function (not callable)
VM_checkextension, // #1
NULL, // #339
NULL, // #340
NULL, // #341
-NULL, // #342
+VM_getkeybind, // #342 string(float keynum) getkeybind (EXT_CSQC)
NULL, // #343
NULL, // #344
NULL, // #345
NULL, // #346
NULL, // #347
NULL, // #348
-VM_M_isdemo, // #349
+VM_CL_isdemo, // #349
NULL, // #350
NULL, // #351
NULL, // #352
NULL, // #353
NULL, // #354
-NULL, // #355
-NULL, // #356
-NULL, // #357
+VM_CL_videoplaying, // #355
+VM_findfont, // #356 float(string fontname) loadfont (DP_GFX_FONTS)
+VM_loadfont, // #357 float(string fontname, string fontmaps, string sizes, float slot) loadfont (DP_GFX_FONTS)
NULL, // #358
NULL, // #359
NULL, // #360
NULL, // #529
NULL, // #530
NULL, // #531
-NULL, // #532
-NULL, // #533
-NULL, // #534
+VM_log, // #532
+VM_getsoundtime, // #533 float(entity e, float channel) getsoundtime = #533; (DP_SND_GETSOUNDTIME)
+VM_soundlength, // #534 float(string sample) soundlength = #534; (DP_SND_GETSOUNDTIME)
NULL, // #535
NULL, // #536
NULL, // #537
VM_M_getkeydest, // #602 float getkeydest(void)
VM_M_setmousetarget, // #603 void setmousetarget(float trg)
VM_M_getmousetarget, // #604 float getmousetarget(void)
-VM_M_callfunction, // #605 void callfunction(...)
+VM_callfunction, // #605 void callfunction(...)
VM_writetofile, // #606 void writetofile(float fhandle, entity ent)
-VM_M_isfunction, // #607 float isfunction(string function_name)
-VM_M_getresolution, // #608 vector getresolution(float number)
+VM_isfunction, // #607 float isfunction(string function_name)
+VM_M_getresolution, // #608 vector getresolution(float number, [float forfullscreen])
VM_keynumtostring, // #609 string keynumtostring(float keynum)
VM_findkeysforcommand, // #610 string findkeysforcommand(string command)
VM_M_getserverliststat, // #611 float gethostcachevalue(float type)
VM_M_getserverlistnumber, // #621 float gethostcachenumber(float fld, float hostnr)
VM_M_getserverlistindexforkey,// #622 float gethostcacheindexforkey(string key)
VM_M_addwantedserverlistkey, // #623 void addwantedhostcachekey(string key)
-VM_getextresponse, // #624 string getextresponse(void)
+VM_CL_getextresponse, // #624 string getextresponse(void)
VM_netaddress_resolve, // #625 string netaddress_resolve(string, float)
VM_M_getgamedirinfo, // #626 string getgamedirinfo(float n, float prop)
+VM_sprintf, // #627 string sprintf(string format, ...)
NULL
};
projects / xonotic / darkplaces.git / blobdiff