X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=mvm_cmds.c;h=9f6f608018c1a05cd3305c55b87e0cca93377ee2;hp=bc43c092af2d417427191e2461ec1d287ae15f55;hb=406539417c894954ef88ecc2fc28c26ad01bbba6;hpb=ca7516e9baee30d5240f7e8fee2e3e724bcbf451 diff --git a/mvm_cmds.c b/mvm_cmds.c index bc43c092..9f6f6080 100644 --- a/mvm_cmds.c +++ b/mvm_cmds.c @@ -233,6 +233,7 @@ void VM_M_getserverliststat( void ) return; case 1: PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_cachecount; + return; case 2: PRVM_G_FLOAT ( OFS_RETURN ) = masterquerycount; return; @@ -745,13 +746,6 @@ static void VM_M_getmousepos(void) 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 @@ -1129,13 +1123,13 @@ 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 +VM_CL_videoplaying, // #355 NULL, // #356 NULL, // #357 NULL, // #358 @@ -1313,8 +1307,8 @@ NULL, // #529 NULL, // #530 NULL, // #531 VM_log, // #532 -NULL, // #533 -NULL, // #534 +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