bound by 0.1 again (this bounding had its reason) AND by sv_clmovement_waitforinput...

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 91bb20074002c7417c3b87d8914a4dbcebe1dfb6..0581a1c8446ea25c17696016c0e98c530472b2fe 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -26,6 +26,7 @@ char *vm_m_extensions =
 "DP_QC_TOKENIZEBYSEPARATOR "
 "DP_QC_UNLIMITEDTEMPSTRINGS "
 "DP_QC_URI_ESCAPE "
+"DP_QC_WHICHPACK "
 "FTE_STRINGS "
 ;
 
@@ -370,6 +371,12 @@ void VM_M_setserverlistmaskstring( void )
                case SLIF_NAME:
                        strlcpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name)  );
                        break;
+               case SLIF_QCSTATUS:
+                       strlcpy( mask->info.qcstatus, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.qcstatus)  );
+                       break;
+               case SLIF_PLAYERS:
+                       strlcpy( mask->info.players, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.players)  );
+                       break;
                case SLIF_MAP:
                        strlcpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map)  );
                        break;
@@ -496,6 +503,12 @@ void VM_M_getserverliststring(void)
                case SLIF_NAME:
                        PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.name );
                        break;
+               case SLIF_QCSTATUS:
+                       PRVM_G_INT (OFS_RETURN ) = PRVM_SetEngineString (cache->info.qcstatus );
+                       break;
+               case SLIF_PLAYERS:
+                       PRVM_G_INT (OFS_RETURN ) = PRVM_SetEngineString (cache->info.players );
+                       break;
                case SLIF_GAME:
                        PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( cache->info.game );
                        break;
@@ -623,6 +636,10 @@ void VM_M_getserverlistindexforkey( void )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_MAP;
        else if( !strcmp( key, "name" ) )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NAME;
+       else if( !strcmp( key, "qcstatus" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = SLIF_QCSTATUS;
+       else if( !strcmp( key, "players" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = SLIF_PLAYERS;
        else if( !strcmp( key, "maxplayers" ) )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_MAXPLAYERS;
        else if( !strcmp( key, "numplayers" ) )
@@ -1329,7 +1346,7 @@ NULL,                                                                     // #499
 NULL,                                                                  // #500
 NULL,                                                                  // #501
 NULL,                                                                  // #502
-NULL,                                                                  // #503
+VM_whichpack,                                  // #503 string(string) whichpack = #503;
 NULL,                                                                  // #504
 NULL,                                                                  // #505
 NULL,                                                                  // #506