#include "prvm_cmds.h"
#include "clvm_cmds.h"
#include "menu.h"
+#include "csprogs.h"
// TODO check which strings really should be engine strings
//============================================================================
// Menu
-char *vm_m_extensions =
+const char *vm_m_extensions =
"BX_WAL_SUPPORT "
"DP_CINEMATIC_DPV "
+"DP_COVERAGE "
+"DP_CRYPTO "
+"DP_CSQC_BINDMAPS "
+"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_CRC16 "
"DP_QC_CVAR_TYPE "
"DP_QC_CVAR_DESCRIPTION "
+"DP_QC_DIGEST "
+"DP_QC_DIGEST_SHA256 "
"DP_QC_FINDCHAIN_TOFIELD "
+"DP_QC_I18N "
"DP_QC_LOG "
"DP_QC_RENDER_SCENE "
"DP_QC_SPRINTF "
"DP_QC_STRFTIME "
"DP_QC_STRINGBUFFERS "
"DP_QC_STRINGBUFFERS_CVARLIST "
+"DP_QC_STRINGBUFFERS_EXT_WIP "
"DP_QC_STRINGCOLORFUNCTIONS "
"DP_QC_STRING_CASE_FUNCTIONS "
"DP_QC_STRREPLACE "
"DP_QC_UNLIMITEDTEMPSTRINGS "
"DP_QC_URI_ESCAPE "
"DP_QC_URI_GET "
+"DP_QC_URI_POST "
"DP_QC_WHICHPACK "
"FTE_STRINGS "
;
setmousetarget(float target)
=========
*/
-void VM_M_setmousetarget(void)
+static void VM_M_setmousetarget(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_setmousetarget);
in_client_mouse = true;
break;
default:
- PRVM_ERROR("VM_M_setmousetarget: wrong destination %f !",PRVM_G_FLOAT(OFS_PARM0));
+ prog->error_cmd("VM_M_setmousetarget: wrong destination %f !",PRVM_G_FLOAT(OFS_PARM0));
}
}
float getmousetarget
=========
*/
-void VM_M_getmousetarget(void)
+static void VM_M_getmousetarget(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_M_getmousetarget);
setkeydest(float dest)
=========
*/
-void VM_M_setkeydest(void)
+static void VM_M_setkeydest(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1,VM_M_setkeydest);
// key_dest = key_message
// break;
default:
- PRVM_ERROR("VM_M_setkeydest: wrong destination %f !", PRVM_G_FLOAT(OFS_PARM0));
+ prog->error_cmd("VM_M_setkeydest: wrong destination %f !", PRVM_G_FLOAT(OFS_PARM0));
}
}
float getkeydest
=========
*/
-void VM_M_getkeydest(void)
+static void VM_M_getkeydest(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_M_getkeydest);
vector getresolution(float number)
=========
*/
-void VM_M_getresolution(void)
+static void VM_M_getresolution(prvm_prog_t *prog)
{
int nr, fs;
VM_SAFEPARMCOUNTRANGE(1, 2, VM_getresolution);
fs = ((prog->argc <= 1) || ((int)PRVM_G_FLOAT(OFS_PARM1)));
- if(nr < 0 || nr >= (fs ? video_resolutions_count : video_resolutions_hardcoded_count))
+ if(nr < -1 || nr >= (fs ? video_resolutions_count : video_resolutions_hardcoded_count))
{
PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
}
+ else if(nr == -1)
+ {
+ vid_mode_t *m = VID_GetDesktopMode();
+ if (m)
+ {
+ PRVM_G_VECTOR(OFS_RETURN)[0] = m->width;
+ PRVM_G_VECTOR(OFS_RETURN)[1] = m->height;
+ PRVM_G_VECTOR(OFS_RETURN)[2] = m->pixelheight_num / (prvm_vec_t) m->pixelheight_denom;
+ }
+ else
+ {
+ PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
+ PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
+ PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
+ }
+ }
else
{
video_resolution_t *r = &((fs ? video_resolutions : video_resolutions_hardcoded)[nr]);
}
}
-void VM_M_getgamedirinfo(void)
+static void VM_M_getgamedirinfo(prvm_prog_t *prog)
{
int nr, item;
VM_SAFEPARMCOUNT(2, VM_getgamedirinfo);
if(nr >= 0 && nr < fs_all_gamedirs_count)
{
if(item == 0)
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( fs_all_gamedirs[nr].name );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, fs_all_gamedirs[nr].name );
else if(item == 1)
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( fs_all_gamedirs[nr].description );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, fs_all_gamedirs[nr].description );
}
}
6 sortfield
7 sortflags
*/
-void VM_M_getserverliststat( void )
+static void VM_M_getserverliststat(prvm_prog_t *prog)
{
int type;
VM_SAFEPARMCOUNT ( 1, VM_M_getserverliststat );
return;
case 1:
PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_cachecount;
+ return;
case 2:
PRVM_G_FLOAT ( OFS_RETURN ) = masterquerycount;
return;
PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_sortflags;
return;
default:
- VM_Warning( "VM_M_getserverliststat: bad type %i!\n", type );
+ VM_Warning(prog, "VM_M_getserverliststat: bad type %i!\n", type );
}
}
resetserverlistmasks()
========================
*/
-void VM_M_resetserverlistmasks( void )
+static void VM_M_resetserverlistmasks(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_M_resetserverlistmasks);
ServerList_ResetMasks();
512 - 1024 or
========================
*/
-void VM_M_setserverlistmaskstring( void )
+static void VM_M_setserverlistmaskstring(prvm_prog_t *prog)
{
const char *str;
int masknr;
str = PRVM_G_STRING( OFS_PARM2 );
masknr = (int)PRVM_G_FLOAT( OFS_PARM0 );
- if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
+ if( masknr >= 0 && masknr < SERVERLIST_ANDMASKCOUNT )
mask = &serverlist_andmasks[masknr];
- else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
+ else if( masknr >= 512 && masknr - 512 < SERVERLIST_ORMASKCOUNT )
mask = &serverlist_ormasks[masknr - 512 ];
else
{
- VM_Warning( "VM_M_setserverlistmaskstring: invalid mask number %i\n", masknr );
+ VM_Warning(prog, "VM_M_setserverlistmaskstring: invalid mask number %i\n", masknr );
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 );
+ VM_Warning(prog, "VM_M_setserverlistmaskstring: Bad field number %i passed!\n", field );
return;
}
512 - 1024 or
========================
*/
-void VM_M_setserverlistmasknumber( void )
+static void VM_M_setserverlistmasknumber(prvm_prog_t *prog)
{
int number;
serverlist_mask_t *mask;
VM_SAFEPARMCOUNT( 4, VM_M_setserverlistmasknumber );
masknr = (int)PRVM_G_FLOAT( OFS_PARM0 );
- if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
+ if( masknr >= 0 && masknr < SERVERLIST_ANDMASKCOUNT )
mask = &serverlist_andmasks[masknr];
- else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
+ else if( masknr >= 512 && masknr - 512 < SERVERLIST_ORMASKCOUNT )
mask = &serverlist_ormasks[masknr - 512 ];
else
{
- VM_Warning( "VM_M_setserverlistmasknumber: invalid mask number %i\n", masknr );
+ VM_Warning(prog, "VM_M_setserverlistmasknumber: invalid mask number %i\n", masknr );
return;
}
case SLIF_FREESLOTS:
mask->info.freeslots = number;
break;
+ case SLIF_CATEGORY:
+ mask->info.category = number;
+ break;
case SLIF_ISFAVORITE:
mask->info.isfavorite = number != 0;
break;
default:
- VM_Warning( "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
+ VM_Warning(prog, "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
return;
}
resortserverlist
========================
*/
-void VM_M_resortserverlist( void )
+static void VM_M_resortserverlist(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_M_resortserverlist);
ServerList_RebuildViewList();
string getserverliststring(float field, float hostnr)
=========
*/
-void VM_M_getserverliststring(void)
+static void VM_M_getserverliststring(prvm_prog_t *prog)
{
- serverlist_entry_t *cache;
+ const serverlist_entry_t *cache;
int hostnr;
VM_SAFEPARMCOUNT(2, VM_M_getserverliststring);
hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ if(hostnr == -1 && serverlist_callbackentry)
{
- Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
- return;
+ cache = serverlist_callbackentry;
+ }
+ else
+ {
+ if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ {
+ Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
+ return;
+ }
+ cache = ServerList_GetViewEntry(hostnr);
}
- cache = ServerList_GetViewEntry(hostnr);
switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
case SLIF_CNAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.cname );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, cache->info.cname );
break;
case SLIF_NAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.name );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, cache->info.name );
break;
case SLIF_QCSTATUS:
- PRVM_G_INT (OFS_RETURN ) = PRVM_SetTempString (cache->info.qcstatus );
+ PRVM_G_INT (OFS_RETURN ) = PRVM_SetTempString( prog, cache->info.qcstatus );
break;
case SLIF_PLAYERS:
- PRVM_G_INT (OFS_RETURN ) = PRVM_SetTempString (cache->info.players );
+ PRVM_G_INT (OFS_RETURN ) = PRVM_SetTempString( prog, cache->info.players );
break;
case SLIF_GAME:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.game );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, cache->info.game );
break;
case SLIF_MOD:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.mod );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, cache->info.mod );
break;
case SLIF_MAP:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.map );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, cache->info.map );
break;
// TODO remove this again
case 1024:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->line1 );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, cache->line1 );
break;
case 1025:
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->line2 );
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, cache->line2 );
break;
default:
Con_Print("VM_M_getserverliststring: bad field number passed!\n");
float getserverlistnumber(float field, float hostnr)
=========
*/
-void VM_M_getserverlistnumber(void)
+static void VM_M_getserverlistnumber(prvm_prog_t *prog)
{
- serverlist_entry_t *cache;
+ const serverlist_entry_t *cache;
int hostnr;
VM_SAFEPARMCOUNT(2, VM_M_getserverliststring);
hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ if(hostnr == -1 && serverlist_callbackentry)
{
- Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
- return;
+ cache = serverlist_callbackentry;
+ }
+ else
+ {
+ if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ {
+ Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
+ return;
+ }
+ cache = ServerList_GetViewEntry(hostnr);
}
- cache = ServerList_GetViewEntry(hostnr);
switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
case SLIF_MAXPLAYERS:
PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers;
case SLIF_PROTOCOL:
PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol;
break;
+ case SLIF_CATEGORY:
+ PRVM_G_FLOAT( OFS_RETURN ) = cache->info.category;
+ break;
case SLIF_ISFAVORITE:
PRVM_G_FLOAT( OFS_RETURN ) = cache->info.isfavorite;
break;
setserverlistsort(float field, float flags)
========================
*/
-void VM_M_setserverlistsort( void )
+static void VM_M_setserverlistsort(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT( 2, VM_M_setserverlistsort );
refreshserverlist()
========================
*/
-void VM_M_refreshserverlist( void )
+static void VM_M_refreshserverlist(prvm_prog_t *prog)
{
- VM_SAFEPARMCOUNT( 0, VM_M_refreshserverlist );
- ServerList_QueryList(false, true, false, false);
+ qboolean do_reset = false;
+ VM_SAFEPARMCOUNTRANGE( 0, 1, VM_M_refreshserverlist );
+ if (prog->argc >= 1 && PRVM_G_FLOAT(OFS_PARM0))
+ do_reset = true;
+ ServerList_QueryList(do_reset, true, false, false);
}
/*
float getserverlistindexforkey(string key)
========================
*/
-void VM_M_getserverlistindexforkey( void )
+static void VM_M_getserverlistindexforkey(prvm_prog_t *prog)
{
const char *key;
VM_SAFEPARMCOUNT( 1, VM_M_getserverlistindexforkey );
key = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString( key );
+ VM_CheckEmptyString( prog, key );
if( !strcmp( key, "cname" ) )
PRVM_G_FLOAT( OFS_RETURN ) = SLIF_CNAME;
PRVM_G_FLOAT( OFS_RETURN ) = SLIF_FREESLOTS;
else if( !strcmp( key, "protocol" ) )
PRVM_G_FLOAT( OFS_RETURN ) = SLIF_PROTOCOL;
+ else if( !strcmp( key, "category" ) )
+ PRVM_G_FLOAT( OFS_RETURN ) = SLIF_CATEGORY;
else if( !strcmp( key, "isfavorite" ) )
PRVM_G_FLOAT( OFS_RETURN ) = SLIF_ISFAVORITE;
else
addwantedserverlistkey(string key)
========================
*/
-void VM_M_addwantedserverlistkey( void )
+static void VM_M_addwantedserverlistkey(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT( 1, VM_M_addwantedserverlistkey );
}
#define MSG_ALL 2 // reliable to all
#define MSG_INIT 3 // write to the init string
-sizebuf_t *VM_M_WriteDest (void)
+static sizebuf_t *VM_M_WriteDest (prvm_prog_t *prog)
{
int dest;
int destclient;
if(!sv.active)
- PRVM_ERROR("VM_M_WriteDest: game is not server (%s)", PRVM_NAME);
+ prog->error_cmd("VM_M_WriteDest: game is not server (%s)", prog->name);
dest = (int)PRVM_G_FLOAT(OFS_PARM1);
switch (dest)
case MSG_ONE:
destclient = (int) PRVM_G_FLOAT(OFS_PARM2);
if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active || !svs.clients[destclient].netconnection)
- PRVM_ERROR("VM_clientcommand: %s: invalid client !", PRVM_NAME);
+ prog->error_cmd("VM_clientcommand: %s: invalid client !", prog->name);
return &svs.clients[destclient].netconnection->message;
return &sv.signon;
default:
- PRVM_ERROR ("WriteDest: bad destination");
+ prog->error_cmd("WriteDest: bad destination");
break;
}
return NULL;
}
-void VM_M_WriteByte (void)
+static void VM_M_WriteByte (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteByte);
- MSG_WriteByte (VM_M_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteByte (VM_M_WriteDest(prog), (int)PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_M_WriteChar (void)
+static void VM_M_WriteChar (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteChar);
- MSG_WriteChar (VM_M_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteChar (VM_M_WriteDest(prog), (int)PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_M_WriteShort (void)
+static void VM_M_WriteShort (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteShort);
- MSG_WriteShort (VM_M_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteShort (VM_M_WriteDest(prog), (int)PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_M_WriteLong (void)
+static void VM_M_WriteLong (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteLong);
- MSG_WriteLong (VM_M_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteLong (VM_M_WriteDest(prog), (int)PRVM_G_FLOAT(OFS_PARM0));
}
-void VM_M_WriteAngle (void)
+static void VM_M_WriteAngle (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteAngle);
- MSG_WriteAngle (VM_M_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
+ MSG_WriteAngle (VM_M_WriteDest(prog), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
}
-void VM_M_WriteCoord (void)
+static void VM_M_WriteCoord (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteCoord);
- MSG_WriteCoord (VM_M_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
+ MSG_WriteCoord (VM_M_WriteDest(prog), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
}
-void VM_M_WriteString (void)
+static void VM_M_WriteString (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteString);
- MSG_WriteString (VM_M_WriteDest(), PRVM_G_STRING(OFS_PARM0));
+ MSG_WriteString (VM_M_WriteDest(prog), PRVM_G_STRING(OFS_PARM0));
}
-void VM_M_WriteEntity (void)
+static void VM_M_WriteEntity (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_M_WriteEntity);
- MSG_WriteShort (VM_M_WriteDest(), PRVM_G_EDICTNUM(OFS_PARM0));
+ MSG_WriteShort (VM_M_WriteDest(prog), PRVM_G_EDICTNUM(OFS_PARM0));
}
/*
copyentity(entity src, entity dst)
=================
*/
-static void VM_M_copyentity (void)
+static void VM_M_copyentity (prvm_prog_t *prog)
{
prvm_edict_t *in, *out;
VM_SAFEPARMCOUNT(2,VM_M_copyentity);
in = PRVM_G_EDICT(OFS_PARM0);
out = PRVM_G_EDICT(OFS_PARM1);
- memcpy(out->fields.vp, in->fields.vp, prog->progs->entityfields * 4);
+ memcpy(out->fields.fp, in->fields.fp, prog->entityfields * sizeof(prvm_vec_t));
}
//#66 vector() getmousepos (EXT_CSQC)
-static void VM_M_getmousepos(void)
+static void VM_M_getmousepos(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0,VM_M_getmousepos);
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)
+static void VM_M_crypto_getkeyfp(prvm_prog_t *prog)
+{
+ lhnetaddress_t addr;
+ const char *s;
+ char keyfp[FP64_SIZE + 1];
+
+ VM_SAFEPARMCOUNT(1,VM_M_crypto_getkeyfp);
+
+ s = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString( prog, s );
+
+ if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, keyfp, sizeof(keyfp), NULL, 0, NULL, NULL))
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, keyfp );
+ else
+ PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
+}
+static void VM_M_crypto_getidfp(prvm_prog_t *prog)
+{
+ lhnetaddress_t addr;
+ const char *s;
+ char idfp[FP64_SIZE + 1];
+
+ VM_SAFEPARMCOUNT(1,VM_M_crypto_getidfp);
+
+ s = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString( prog, s );
+
+ if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, idfp, sizeof(idfp), NULL, NULL))
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, idfp );
+ else
+ PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
+}
+static void VM_M_crypto_getidstatus(prvm_prog_t *prog)
+{
+ lhnetaddress_t addr;
+ const char *s;
+ qboolean issigned;
+
+ VM_SAFEPARMCOUNT(1,VM_M_crypto_getidstatus);
+
+ s = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString( prog, s );
+
+ if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, NULL, 0, NULL, &issigned))
+ PRVM_G_FLOAT( OFS_RETURN ) = issigned ? 2 : 1;
+ else
+ PRVM_G_FLOAT( OFS_RETURN ) = 0;
+}
+static void VM_M_crypto_getencryptlevel(prvm_prog_t *prog)
{
- VM_SAFEPARMCOUNT(0, VM_M_isdemo);
- PRVM_G_FLOAT(OFS_RETURN) = cls.demoplayback;
+ lhnetaddress_t addr;
+ const char *s;
+ int aeslevel;
+ char vabuf[1024];
+
+ VM_SAFEPARMCOUNT(1,VM_M_crypto_getencryptlevel);
+
+ s = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString( prog, s );
+
+ if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, NULL, 0, &aeslevel, NULL))
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, aeslevel ? va(vabuf, sizeof(vabuf), "%d AES128", aeslevel) : "0");
+ else
+ PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
+}
+static void VM_M_crypto_getmykeyfp(prvm_prog_t *prog)
+{
+ int i;
+ char keyfp[FP64_SIZE + 1];
+
+ VM_SAFEPARMCOUNT(1,VM_M_crypto_getmykey);
+
+ i = PRVM_G_FLOAT( OFS_PARM0 );
+ switch(Crypto_RetrieveLocalKey(i, keyfp, sizeof(keyfp), NULL, 0, NULL))
+ {
+ case -1:
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, "");
+ break;
+ case 0:
+ PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
+ break;
+ default:
+ case 1:
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, keyfp);
+ break;
+ }
+}
+static void VM_M_crypto_getmyidfp(prvm_prog_t *prog)
+{
+ int i;
+ char idfp[FP64_SIZE + 1];
+
+ VM_SAFEPARMCOUNT(1,VM_M_crypto_getmykey);
+
+ i = PRVM_G_FLOAT( OFS_PARM0 );
+ switch(Crypto_RetrieveLocalKey(i, NULL, 0, idfp, sizeof(idfp), NULL))
+ {
+ case -1:
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, "");
+ break;
+ case 0:
+ PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
+ break;
+ default:
+ case 1:
+ PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, idfp);
+ break;
+ }
+}
+static void VM_M_crypto_getmyidstatus(prvm_prog_t *prog)
+{
+ int i;
+ qboolean issigned;
+
+ VM_SAFEPARMCOUNT(1,VM_M_crypto_getmykey);
+
+ i = PRVM_G_FLOAT( OFS_PARM0 );
+ switch(Crypto_RetrieveLocalKey(i, NULL, 0, NULL, 0, &issigned))
+ {
+ case -1:
+ PRVM_G_FLOAT( OFS_RETURN ) = 0; // have no ID there
+ break;
+ case 0:
+ PRVM_G_FLOAT( OFS_RETURN ) = -1; // out of range
+ break;
+ default:
+ case 1:
+ PRVM_G_FLOAT( OFS_RETURN ) = issigned ? 2 : 1;
+ break;
+ }
}
prvm_builtin_t vm_m_builtins[] = {
NULL, // #337
NULL, // #338
NULL, // #339
-NULL, // #340
-NULL, // #341
-NULL, // #342
+VM_keynumtostring, // #340 string keynumtostring(float keynum)
+VM_stringtokeynum, // #341 float stringtokeynum(string key)
+VM_getkeybind, // #342 string(float keynum[, float bindmap]) 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
+VM_wasfreed, // #353 float(entity ent) wasfreed
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
VM_gecko_get_texture_extent, // #493 vector gecko_get_texture_extent( string name )
VM_crc16, // #494 float(float caseinsensitive, string s, ...) crc16 = #494 (DP_QC_CRC16)
VM_cvar_type, // #495 float(string name) cvar_type = #495; (DP_QC_CVAR_TYPE)
-NULL, // #496
-NULL, // #497
-NULL, // #498
-NULL, // #499
-NULL, // #500
+VM_numentityfields, // #496 float() numentityfields = #496; (QP_QC_ENTITYDATA)
+VM_entityfieldname, // #497 string(float fieldnum) entityfieldname = #497; (DP_QC_ENTITYDATA)
+VM_entityfieldtype, // #498 float(float fieldnum) entityfieldtype = #498; (DP_QC_ENTITYDATA)
+VM_getentityfieldstring, // #499 string(float fieldnum, entity ent) getentityfieldstring = #499; (DP_QC_ENTITYDATA)
+VM_putentityfieldstring, // #500 float(float fieldnum, entity ent, string s) putentityfieldstring = #500; (DP_QC_ENTITYDATA)
NULL, // #501
NULL, // #502
VM_whichpack, // #503 string(string) whichpack = #503;
VM_uri_escape, // #510 string(string in) uri_escape = #510;
VM_uri_unescape, // #511 string(string in) uri_unescape = #511;
VM_etof, // #512 float(entity ent) num_for_edict = #512 (DP_QC_NUM_FOR_EDICT)
-VM_uri_get, // #513 float(string uril, float id) uri_get = #513; (DP_QC_URI_GET)
+VM_uri_get, // #513 float(string uri, float id, [string post_contenttype, string post_delim, [float buf]]) uri_get = #513; (DP_QC_URI_GET, DP_QC_URI_POST)
VM_tokenize_console, // #514 float(string str) tokenize_console = #514; (DP_QC_TOKENIZE_CONSOLE)
VM_argv_start_index, // #515 float(float idx) argv_start_index = #515; (DP_QC_TOKENIZE_CONSOLE)
VM_argv_end_index, // #516 float(float idx) argv_end_index = #516; (DP_QC_TOKENIZE_CONSOLE)
NULL, // #530
NULL, // #531
VM_log, // #532
-NULL, // #533
-NULL, // #534
-NULL, // #535
-NULL, // #536
-NULL, // #537
-NULL, // #538
+VM_getsoundtime, // #533 float(entity e, float channel) getsoundtime = #533; (DP_SND_GETSOUNDTIME)
+VM_soundlength, // #534 float(string sample) soundlength = #534; (DP_SND_GETSOUNDTIME)
+VM_buf_loadfile, // #535 float(string filename, float bufhandle) buf_loadfile (DP_QC_STRINGBUFFERS_EXT_WIP)
+VM_buf_writefile, // #536 float(float filehandle, float bufhandle, float startpos, float numstrings) buf_writefile (DP_QC_STRINGBUFFERS_EXT_WIP)
+VM_bufstr_find, // #537 float(float bufhandle, string match, float matchrule, float startpos) bufstr_find (DP_QC_STRINGBUFFERS_EXT_WIP)
+VM_matchpattern, // #538 float(string s, string pattern, float matchrule) matchpattern (DP_QC_STRINGBUFFERS_EXT_WIP)
NULL, // #539
NULL, // #540
NULL, // #541
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_findkeysforcommand, // #610 string findkeysforcommand(string command[, float bindmap])
VM_M_getserverliststat, // #611 float gethostcachevalue(float type)
VM_M_getserverliststring, // #612 string gethostcachestring(float type, float hostnr)
VM_parseentitydata, // #613 void parseentitydata(entity ent, string data)
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, // #628
+NULL, // #629
+VM_setkeybind, // #630 float(float key, string bind[, float bindmap]) setkeybind
+VM_getbindmaps, // #631 vector(void) getbindmap
+VM_setbindmaps, // #632 float(vector bm) setbindmap
+VM_M_crypto_getkeyfp, // #633 string(string addr) crypto_getkeyfp
+VM_M_crypto_getidfp, // #634 string(string addr) crypto_getidfp
+VM_M_crypto_getencryptlevel, // #635 string(string addr) crypto_getencryptlevel
+VM_M_crypto_getmykeyfp, // #636 string(float addr) crypto_getmykeyfp
+VM_M_crypto_getmyidfp, // #637 string(float addr) crypto_getmyidfp
+NULL, // #638
+VM_digest_hex, // #639
+NULL, // #640
+VM_M_crypto_getmyidstatus, // #641 float(float i) crypto_getmyidstatus
+VM_coverage, // #642
+VM_M_crypto_getidstatus, // #643 float(string addr) crypto_getidstatus
NULL
};
const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);
-void VM_M_Cmd_Init(void)
+void MVM_init_cmd(prvm_prog_t *prog)
{
r_refdef_scene_t *scene;
- VM_Cmd_Init();
- VM_Polygons_Reset();
+ VM_Cmd_Init(prog);
+ VM_Polygons_Reset(prog);
scene = R_GetScenePointer( RST_MENU );
scene->ambient = 32.0f;
}
-void VM_M_Cmd_Reset(void)
+void MVM_reset_cmd(prvm_prog_t *prog)
{
// note: the menu's render entities are automatically freed when the prog's pool is freed
//VM_Cmd_Init();
- VM_Cmd_Reset();
- VM_Polygons_Reset();
+ VM_Cmd_Reset(prog);
+ VM_Polygons_Reset(prog);
}
projects / xonotic / darkplaces.git / blobdiff