added BX_WAL_SUPPORT to extensions list and documented it (.wal texture support has...

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 43919655a50c77cb0f21a3b734a4b95c7e3d637a..33412190dd0beb817b9934cb832afdbe5ea976c9 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -4,8 +4,12 @@
 // Menu
 
 char *vm_m_extensions =
+"BX_WAL_SUPPORT "
 "DP_CINEMATIC_DPV "
-"DP_QC_ASINACOSATANATAN2TAN";
+"DP_MENU_EXTRESPONSEPACKET "
+"DP_QC_ASINACOSATANATAN2TAN "
+"DP_QC_STRINGCOLORFUNCTIONS "
+"DP_QC_UNLIMITEDTEMPSTRINGS";
 
 /*
 =========
@@ -179,9 +183,6 @@ void VM_M_callfunction(void)
 
        s = PRVM_G_STRING(OFS_PARM0 + (prog->argc - 1));
 
-       if(!s)
-               PRVM_ERROR("VM_M_callfunction: null string !");
-
        VM_CheckEmptyString(s);
 
        func = PRVM_ED_FindFunction(s);
@@ -223,9 +224,6 @@ void VM_M_isfunction(void)
 
        s = PRVM_G_STRING(OFS_PARM0);
 
-       if(!s)
-               PRVM_ERROR("VM_M_isfunction: null string !");
-
        VM_CheckEmptyString(s);
 
        func = PRVM_ED_FindFunction(s);
@@ -260,7 +258,7 @@ void VM_M_writetofile(void)
        ent = PRVM_G_EDICT(OFS_PARM1);
        if(ent->priv.required->free)
        {
-               VM_Warning("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1));
+               VM_Warning("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
                return;
        }
 
@@ -303,7 +301,7 @@ void M_FindKeysForCommand(const char *command, int *keys);
 void VM_M_findkeysforcommand(void)
 {
        const char *cmd;
-       char *ret;
+       char ret[VM_STRINGTEMP_LENGTH];
        int keys[NUMKEYS];
        int i;
 
@@ -313,14 +311,13 @@ void VM_M_findkeysforcommand(void)
 
        VM_CheckEmptyString(cmd);
 
-       (ret = VM_GetTempString())[0] = 0;
-
        M_FindKeysForCommand(cmd, keys);
 
+       ret[0] = 0;
        for(i = 0; i < NUMKEYS; i++)
-               strlcat(ret, va(" \'%i\'", keys[i]), VM_STRINGTEMP_LENGTH);
+               strlcat(ret, va(" \'%i\'", keys[i]), sizeof(ret));
 
-       PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(ret);
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(ret);
 }
 
 /*
@@ -410,8 +407,6 @@ void VM_M_setserverlistmaskstring( void )
 
        VM_SAFEPARMCOUNT( 4, VM_M_setserverlistmaskstring );
        str = PRVM_G_STRING( OFS_PARM2 );
-       if( !str )
-               PRVM_ERROR( "VM_M_setserverlistmaskstring: null string passed!" );
 
        masknr = (int)PRVM_G_FLOAT( OFS_PARM0 );
        if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
@@ -532,7 +527,7 @@ void VM_M_getserverliststring(void)
 
        VM_SAFEPARMCOUNT(2, VM_M_getserverliststring);
 
-       PRVM_G_INT(OFS_RETURN) = 0;
+       PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 
        hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
 
@@ -584,7 +579,7 @@ void VM_M_getserverlistnumber(void)
 
        VM_SAFEPARMCOUNT(2, VM_M_getserverliststring);
 
-       PRVM_G_INT(OFS_RETURN) = 0;
+       PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 
        hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
 
@@ -781,6 +776,22 @@ void VM_M_WriteEntity (void)
        MSG_WriteShort (VM_WriteDest(), PRVM_G_EDICTNUM(OFS_PARM0));
 }
 
+//string(void) getextresponse = #624; // returns the next extResponse packet that was sent to this client
+void VM_M_getextresponse (void)
+{
+       VM_SAFEPARMCOUNT(0,VM_argv);
+
+       if (net_extresponse_count <= 0)
+               PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+       else
+       {
+               int first;
+               --net_extresponse_count;
+               first = (net_extresponse_last + NET_EXTRESPONSE_MAX - net_extresponse_count) % NET_EXTRESPONSE_MAX;
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(net_extresponse[first]);
+       }
+}
+
 prvm_builtin_t vm_m_builtins[] = {
        0, // to be consistent with the old vm
        // common builtings (mostly)
@@ -916,7 +927,9 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_atan,                                        // #473 float(float t) VM_atan (DP_QC_ASINACOSATANATAN2TAN)
        VM_atan2,                                       // #474 float(float c, float s) VM_atan2 (DP_QC_ASINACOSATANATAN2TAN)
        VM_tan,                                         // #475 float(float a) VM_tan (DP_QC_ASINACOSATANATAN2TAN)
-       0,0,0,0,0,                      // 480
+       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)
+       0,0,0,                  // 480
        e10,                    // 490
        e10,                    // 500
        e100,                   // 600
@@ -943,7 +956,8 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_M_refreshserverlist,
        VM_M_getserverlistnumber,
        VM_M_getserverlistindexforkey,
-       VM_M_addwantedserverlistkey // 623
+       VM_M_addwantedserverlistkey, // 623
+       VM_M_getextresponse
 };
 
 const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);