simple video subtitles support, defined in external text files, added a couple of...

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 07424f80e26d24f6b72cb2c7da119d48c8c5bc92..9f6f608018c1a05cd3305c55b87e0cca93377ee2 100644 (file)
--- 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;
@@ -304,25 +305,25 @@ void VM_M_setserverlistmaskstring( void )
 
        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 );
@@ -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