refactor timing, so that timing code is in sys_shared.c.

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 208ac895bc68d0f1b4e61b49fde10a953203382a..bc43c092af2d417427191e2461ec1d287ae15f55 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -304,25 +304,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 );
@@ -436,7 +436,7 @@ void VM_M_getserverliststring(void)
                Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
                return;
        }
-       cache = serverlist_viewlist[hostnr];
+       cache = ServerList_GetViewEntry(hostnr);
        switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
                case SLIF_CNAME:
                        PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( cache->info.cname );
@@ -494,7 +494,7 @@ void VM_M_getserverlistnumber(void)
                Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
                return;
        }
-       cache = serverlist_viewlist[hostnr];
+       cache = ServerList_GetViewEntry(hostnr);
        switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
                case SLIF_MAXPLAYERS:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers;