//============================================================================
// Menu
-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_MENU_EXTRESPONSEPACKET "
-"DP_QC_ASINACOSATANATAN2TAN "
-"DP_QC_AUTOCVARS "
-"DP_QC_CMD "
-"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_TOKENIZEBYSEPARATOR "
-"DP_QC_TOKENIZE_CONSOLE "
-"DP_QC_UNLIMITEDTEMPSTRINGS "
-"DP_QC_URI_ESCAPE "
-"DP_QC_URI_GET "
-"DP_QC_URI_POST "
-"DP_QC_WHICHPACK "
-"FTE_STRINGS "
-;
+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_MENU_EXTRESPONSEPACKET",
+"DP_QC_ASINACOSATANATAN2TAN",
+"DP_QC_AUTOCVARS",
+"DP_QC_CMD",
+"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_TOKENIZEBYSEPARATOR",
+"DP_QC_TOKENIZE_CONSOLE",
+"DP_QC_UNLIMITEDTEMPSTRINGS",
+"DP_QC_URI_ESCAPE",
+"DP_QC_URI_GET",
+"DP_QC_URI_POST",
+"DP_QC_WHICHPACK",
+"FTE_STRINGS",
+"DP_QC_FS_SEARCH_PACKFILE",
+NULL
+};
+
+qbool MP_ConsoleCommand(const char *text)
+{
+ prvm_prog_t *prog = MVM_prog;
+ return PRVM_ConsoleCommand(prog, text, &prog->funcoffsets.GameCommand, false, -1, 0, prog->loaded, "QC function GameCommand is missing");
+}
/*
=========
}
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;
- }
+ vid_mode_t m = VID_GetDesktopMode();
+ 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
{
static void VM_M_resortserverlist(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_M_resortserverlist);
- ServerList_RebuildViewList();
+ ServerList_RebuildViewList(NULL);
}
/*
}
else
{
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
{
Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
return;
}
else
{
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
{
Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
return;
PRVM_G_FLOAT( OFS_RETURN ) = cache->info.freeslots;
break;
case SLIF_PING:
- PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping;
+ // display inf when a listed server times out and net_slist_pause blocks its removal
+ PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping ?: INFINITY;
break;
case SLIF_PROTOCOL:
PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol;
*/
static void VM_M_refreshserverlist(prvm_prog_t *prog)
{
- qboolean do_reset = false;
+ qbool do_reset = false;
VM_SAFEPARMCOUNTRANGE( 0, 1, VM_M_refreshserverlist );
if (prog->argc >= 1 && PRVM_G_FLOAT(OFS_PARM0))
do_reset = true;
{
lhnetaddress_t addr;
const char *s;
- qboolean issigned;
+ qbool issigned;
VM_SAFEPARMCOUNT(1,VM_M_crypto_getidstatus);
static void VM_M_crypto_getmyidstatus(prvm_prog_t *prog)
{
int i;
- qboolean issigned;
+ qbool issigned;
VM_SAFEPARMCOUNT(1, VM_M_crypto_getmyidstatus);
}
}
+// CL_Video interface functions
+
+/*
+========================
+VM_cin_open
+
+float cin_open(string file, string name)
+========================
+*/
+void VM_cin_open(prvm_prog_t *prog)
+{
+ const char *file;
+ const char *name;
+
+ VM_SAFEPARMCOUNT( 2, VM_cin_open );
+
+ file = PRVM_G_STRING( OFS_PARM0 );
+ name = PRVM_G_STRING( OFS_PARM1 );
+
+ VM_CheckEmptyString(prog, file );
+ VM_CheckEmptyString(prog, name );
+
+ if( CL_OpenVideo( file, name, MENUOWNER, "" ) )
+ PRVM_G_FLOAT( OFS_RETURN ) = 1;
+ else
+ PRVM_G_FLOAT( OFS_RETURN ) = 0;
+}
+
+/*
+========================
+VM_cin_close
+
+void cin_close(string name)
+========================
+*/
+void VM_cin_close(prvm_prog_t *prog)
+{
+ const char *name;
+
+ VM_SAFEPARMCOUNT( 1, VM_cin_close );
+
+ name = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString(prog, name );
+
+ CL_CloseVideo( CL_GetVideoByName( name ) );
+}
+
+/*
+========================
+VM_cin_setstate
+void cin_setstate(string name, float type)
+========================
+*/
+void VM_cin_setstate(prvm_prog_t *prog)
+{
+ const char *name;
+ clvideostate_t state;
+ clvideo_t *video;
+
+ VM_SAFEPARMCOUNT( 2, VM_cin_setstate );
+
+ name = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString(prog, name );
+
+ state = (clvideostate_t)((int)PRVM_G_FLOAT( OFS_PARM1 ));
+
+ video = CL_GetVideoByName( name );
+ if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT )
+ CL_SetVideoState( video, state );
+}
+
+/*
+========================
+VM_cin_getstate
+
+float cin_getstate(string name)
+========================
+*/
+void VM_cin_getstate(prvm_prog_t *prog)
+{
+ const char *name;
+ clvideo_t *video;
+
+ VM_SAFEPARMCOUNT( 1, VM_cin_getstate );
+
+ name = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString(prog, name );
+
+ video = CL_GetVideoByName( 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(prvm_prog_t *prog)
+{
+ const char *name;
+ clvideo_t *video;
+
+ VM_SAFEPARMCOUNT( 1, VM_cin_restart );
+
+ name = PRVM_G_STRING( OFS_PARM0 );
+ VM_CheckEmptyString(prog, name );
+
+ video = CL_GetVideoByName( name );
+ if( video )
+ CL_RestartVideo( video );
+}
+
+static void VM_M_registercommand(prvm_prog_t *prog)
+{
+ VM_SAFEPARMCOUNT(1, VM_M_registercommand);
+ Cmd_AddCommand(CF_CLIENT, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC");
+}
+
prvm_builtin_t vm_m_builtins[] = {
NULL, // #0 NULL function (not callable)
VM_checkextension, // #1
VM_vectoyaw, // #10
VM_vectoangles, // #11
VM_random, // #12
-VM_localcmd_client, // #13
+VM_localcmd_local, // #13
VM_cvar, // #14
VM_cvar_set, // #15
VM_dprint, // #16
VM_isserver, // #60
VM_clientcount, // #61
VM_clientstate, // #62
-VM_clcommand, // #63
+NULL, // #63 FIXME
VM_changelevel, // #64
VM_localsound, // #65
VM_M_getmousepos, // #66
VM_CL_isdemo, // #349
NULL, // #350
NULL, // #351
-NULL, // #352
+VM_M_registercommand, // #352 void(string cmdname)
VM_wasfreed, // #353 float(entity ent) wasfreed
NULL, // #354
VM_CL_videoplaying, // #355
projects / xonotic / darkplaces.git / blobdiff