fix reflections not working when just reflective stuff, but no water, is on the map

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index abd29d4bc9185c53ce366aadfff33ab5c0f5b2e6..cef5830c09b207828a12b211d30cc10ca07763c8 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -9,8 +9,12 @@ char *vm_m_extensions =
 "DP_MENU_EXTRESPONSEPACKET "
 "DP_QC_ASINACOSATANATAN2TAN "
 "DP_QC_STRFTIME "
+"DP_QC_STRING_CASE_FUNCTIONS "
 "DP_QC_STRINGCOLORFUNCTIONS "
-"DP_QC_UNLIMITEDTEMPSTRINGS";
+"DP_QC_TOKENIZEBYSEPARATOR "
+"DP_QC_UNLIMITEDTEMPSTRINGS "
+"DP_QC_CMD "
+;
 
 /*
 =========
@@ -130,7 +134,7 @@ void VM_M_callfunction(void)
 
        VM_SAFEPARMCOUNTRANGE(1, 8, VM_M_callfunction);
 
-       s = PRVM_G_STRING(OFS_PARM0 + (prog->argc - 1));
+       s = PRVM_G_STRING(OFS_PARM0+(prog->argc - 1)*3);
 
        VM_CheckEmptyString(s);
 
@@ -404,6 +408,12 @@ void VM_M_setserverlistmasknumber( void )
                case SLIF_NUMPLAYERS:
                        mask->info.numplayers = number;
                        break;
+               case SLIF_NUMBOTS:
+                       mask->info.numbots = number;
+                       break;
+               case SLIF_NUMHUMANS:
+                       mask->info.numhumans = number;
+                       break;
                case SLIF_PING:
                        mask->info.ping = number;
                        break;
@@ -516,6 +526,12 @@ void VM_M_getserverlistnumber(void)
                case SLIF_NUMPLAYERS:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.numplayers;
                        break;
+               case SLIF_NUMBOTS:
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.numbots;
+                       break;
+               case SLIF_NUMHUMANS:
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.numhumans;
+                       break;
                case SLIF_PING:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping;
                        break;
@@ -586,6 +602,10 @@ void VM_M_getserverlistindexforkey( void )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_MAXPLAYERS;
        else if( !strcmp( key, "numplayers" ) )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NUMPLAYERS;
+       else if( !strcmp( key, "numbots" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NUMBOTS;
+       else if( !strcmp( key, "numhumans" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = SLIF_NUMHUMANS;
        else if( !strcmp( key, "protocol" ) )
                PRVM_G_FLOAT( OFS_RETURN ) = SLIF_PROTOCOL;
        else
@@ -1206,7 +1226,7 @@ VM_cin_setstate,                  // #463
 VM_cin_getstate,                       // #464
 VM_cin_restart,                        // #465
 VM_drawline,                           // #466
-NULL,                                          // #467
+VM_drawcolorcodedstring,       // #467
 NULL,                                          // #468
 NULL,                                          // #469
 NULL,                                          // #470
@@ -1218,9 +1238,9 @@ VM_tan,                                           // #475 float(float a) VM_tan (DP_QC_ASINACOSATANATAN2TAN)
 VM_strlennocol,                                // #476 float(string s) : DRESK - String Length (not counting color codes) (DP_QC_STRINGCOLORFUNCTIONS)
 VM_strdecolorize,                      // #477 string(string s) : DRESK - Decolorized String (DP_QC_STRINGCOLORFUNCTIONS)
 VM_strftime,                           // #478 string(float uselocaltime, string format, ...) (DP_QC_STRFTIME)
-NULL,                                          // #479
-NULL,                                          // #480
-NULL,                                          // #481
+VM_tokenizebyseparator,                // #479 float(string s) tokenizebyseparator (DP_QC_TOKENIZEBYSEPARATOR)
+VM_strtolower,                         // #480 string(string s) VM_strtolower : DRESK - Return string as lowercase
+VM_strtoupper,                         // #481 string(string s) VM_strtoupper : DRESK - Return string as uppercase
 NULL,                                          // #482
 NULL,                                          // #483
 NULL,                                          // #484