const char *vm_m_extensions =
"BX_WAL_SUPPORT "
"DP_CINEMATIC_DPV "
-"DP_CSQC_BINDMAPS "
+"DP_COVERAGE "
"DP_CRYPTO "
+"DP_CSQC_BINDMAPS "
"DP_GFX_FONTS "
"DP_GFX_FONTS_FREETYPE "
"DP_UTF8 "
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_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
{
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;
*/
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( prog, cache->info.cname );
*/
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;
*/
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);
}
/*
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
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))
+ 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;
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))
+ 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)
{
lhnetaddress_t addr;
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))
+ 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;
VM_vectoyaw, // #10
VM_vectoangles, // #11
VM_random, // #12
-VM_localcmd, // #13
+VM_localcmd_client, // #13
VM_cvar, // #14
VM_cvar_set, // #15
VM_dprint, // #16
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
};
r_refdef_scene_t *scene;
VM_Cmd_Init(prog);
- VM_Polygons_Reset(prog);
+ prog->polygonbegin_model = NULL;
+ prog->polygonbegin_guess2d = 0;
scene = R_GetScenePointer( RST_MENU );
scene->maxentities = MAX_EDICTS + 256 + 512;
scene->entities = (entity_render_t **)Mem_Alloc(prog->progs_mempool, sizeof(entity_render_t *) * scene->maxentities);
- scene->ambient = 32.0f;
+ // LadyHavoc: what is this for?
+ scene->ambientintensity = 32.0f;
}
void MVM_reset_cmd(prvm_prog_t *prog)
//VM_Cmd_Init();
VM_Cmd_Reset(prog);
- VM_Polygons_Reset(prog);
+ prog->polygonbegin_model = NULL;
+ prog->polygonbegin_guess2d = 0;
}