move two #defined to quakedef.h, and always include quakedef.h first before any other...

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index dddf5a184663940c1b10a8e8086655013d5d28a8..e3aea4b48a226e0e5edb2eb3e1c2ee5724fcbf47 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -1,4 +1,7 @@
+#include "quakedef.h"
+
 #include "prvm_cmds.h"
+#include "menu.h"
 
 //============================================================================
 // Menu
@@ -195,7 +198,6 @@ VM_M_getresolution
 vector getresolution(float number)
 =========
 */
-extern unsigned short video_resolutions[][2];
 void VM_M_getresolution(void)
 {
        int nr;
@@ -203,9 +205,9 @@ void VM_M_getresolution(void)
 
        nr = (int)PRVM_G_FLOAT(OFS_PARM0);
 
-
-       PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr][0];
-       PRVM_G_VECTOR(OFS_RETURN)[1] = video_resolutions[nr][1];
+       // FIXME bounds check
+       PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr].width;
+       PRVM_G_VECTOR(OFS_RETURN)[1] = video_resolutions[nr].height;
        PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
 }
 
@@ -421,6 +423,9 @@ void VM_M_setserverlistmasknumber( void )
                case SLIF_PROTOCOL:
                        mask->info.protocol = number;
                        break;
+               case SLIF_FREESLOTS:
+                       mask->info.freeslots = number;
+                       break;
                default:
                        VM_Warning( "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
                        return;
@@ -533,6 +538,9 @@ void VM_M_getserverlistnumber(void)
                case SLIF_NUMHUMANS:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.numhumans;
                        break;
+               case SLIF_FREESLOTS:
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.freeslots;
+                       break;
                case SLIF_PING:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping;
                        break;
@@ -569,7 +577,7 @@ refreshserverlist()
 void VM_M_refreshserverlist( void )
 {
        VM_SAFEPARMCOUNT( 0, VM_M_refreshserverlist );
-       ServerList_QueryList(true, false);
+       ServerList_QueryList(false, true, false, false);
 }
 
 /*
@@ -607,6 +615,8 @@ void VM_M_getserverlistindexforkey( void )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NUMBOTS;
        else if( !strcmp( key, "numhumans" ) )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NUMHUMANS;
+       else if( !strcmp( key, "freeslots" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = SLIF_FREESLOTS;
        else if( !strcmp( key, "protocol" ) )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_PROTOCOL;
        else
@@ -1229,7 +1239,7 @@ VM_cin_restart,                   // #465
 VM_drawline,                           // #466
 VM_drawcolorcodedstring,       // #467
 VM_stringwidth,                                // #468
-NULL,                                          // #469
+VM_drawsubpic,                 // #469
 NULL,                                          // #470
 VM_asin,                                       // #471 float(float s) VM_asin (DP_QC_ASINACOSATANATAN2TAN)
 VM_acos,                                       // #472 float(float c) VM_acos (DP_QC_ASINACOSATANATAN2TAN)