Merge branch 'master' into Mario/physics

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / command / generic.qc

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index eae512af596bf7748f3f7d5212fa2f8ec5fabd8c..6aa93a024ed209475f9a4b5d673e4654b46312a5 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,3 +1,29 @@
+#include "command.qh"
+#include "generic.qh"
+
+#include "markup.qh"
+#include "rpn.qh"
+
+#include "../mapinfo.qh"
+#include "../test.qh"
+
+#ifndef MENUQC
+       #include "../notifications.qh"
+#endif
+
+#ifdef CSQC
+       #include "../../client/command/cl_cmd.qh"
+#endif
+
+#ifdef SVQC
+       #include "../../server/command/banning.qh"
+       #include "../../server/command/cmd.qh"
+       #include "../../server/command/common.qh"
+       #include "../../server/command/sv_cmd.qh"
+
+       #include "../../common/weapons/config.qh"
+#endif
+
 // =========================================================
 //  Generic program common command code, written by Samual
 //  Last updated: February 19th, 2012
@@ -18,7 +44,7 @@ string GetProgramCommandPrefix(void)
 }
 
 // used by curl command
-void Curl_URI_Get_Callback(float id, float status, string data)
+void Curl_URI_Get_Callback(int id, float status, string data)
 {
        int i = id - URI_GET_CURL;
        float do_exec = curl_uri_get_exec[i];
@@ -94,7 +120,7 @@ void GenericCommand_qc_curl(float request, float argc)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       bool do_exec = FALSE;
+                       bool do_exec = false;
                        string do_cvar = string_null;
                        float key = -1;
                        int i;
@@ -108,7 +134,7 @@ void GenericCommand_qc_curl(float request, float argc)
                                }
                                if(argv(i) == "--exec")
                                {
-                                       do_exec = TRUE;
+                                       do_exec = true;
                                        continue;
                                }
                                if(argv(i) == "--key" && i+2 < argc)
@@ -215,6 +241,25 @@ void GenericCommand_dumpcommands(float request)
        }
 }
 
+void GenericCommand_dumpitems(float request)
+{
+       switch(request)
+       {
+               case CMD_REQUEST_COMMAND:
+               {
+                       Dump_Items();
+                       return;
+               }
+
+               default:
+               case CMD_REQUEST_USAGE:
+               {
+                       printf("\nUsage:^3 %s dumpitems", GetProgramCommandPrefix());
+                       return;
+               }
+       }
+}
+
 void GenericCommand_dumpnotifs(float request)
 {
        switch(request)
@@ -222,18 +267,18 @@ void GenericCommand_dumpnotifs(float request)
                case CMD_REQUEST_COMMAND:
                {
                        #ifndef MENUQC
-                       float fh, alsoprint = FALSE;
+                       float fh, alsoprint = false;
                        string filename = argv(1);
 
                        if(filename == "")
                        {
                                filename = "notifications_dump.cfg";
-                               alsoprint = FALSE;
+                               alsoprint = false;
                        }
                        else if(filename == "-")
                        {
                                filename = "notifications_dump.cfg";
-                               alsoprint = TRUE;
+                               alsoprint = true;
                        }
                        fh = fopen(filename, FILE_WRITE);
 
@@ -275,19 +320,19 @@ void GenericCommand_dumpweapons(float request) // WEAPONTODO: make this work wit
                        wep_config_file = -1;
                        wep_config_alsoprint = -1;
                        string filename = argv(1);
-                       
+
                        if(filename == "")
                        {
                                filename = "weapons_dump.cfg";
-                               wep_config_alsoprint = FALSE;
+                               wep_config_alsoprint = false;
                        }
                        else if(filename == "-")
                        {
                                filename = "weapons_dump.cfg";
-                               wep_config_alsoprint = TRUE;
+                               wep_config_alsoprint = true;
                        }
                        wep_config_file = fopen(filename, FILE_WRITE);
-                       
+
                        if(wep_config_file >= 0)
                        {
                                Dump_Weapon_Settings();
@@ -305,7 +350,7 @@ void GenericCommand_dumpweapons(float request) // WEAPONTODO: make this work wit
                        #endif
                        return;
                }
-                       
+
                default:
                case CMD_REQUEST_USAGE:
                {
@@ -625,6 +670,7 @@ void GenericCommand_(float request)
 #define GENERIC_COMMANDS(request,arguments,command) \
        GENERIC_COMMAND("addtolist", GenericCommand_addtolist(request, arguments), "Add a string to a cvar") \
        GENERIC_COMMAND("dumpcommands", GenericCommand_dumpcommands(request), "Dump all commands on the program to *_cmd_dump.txt") \
+       GENERIC_COMMAND("dumpitems", GenericCommand_dumpitems(request), "Dump all items to the console") \
        GENERIC_COMMAND("dumpnotifs", GenericCommand_dumpnotifs(request), "Dump all notifications into notifications_dump.txt") \
        GENERIC_COMMAND("dumpweapons", GenericCommand_dumpweapons(request), "Dump all weapons into weapons_dump.txt") \
        GENERIC_COMMAND("maplist", GenericCommand_maplist(request, arguments), "Automatic control of maplist") \
@@ -643,7 +689,7 @@ void GenericCommand_macro_help()
        #define GENERIC_COMMAND(name,function,description) \
                { print("  ^2", name, "^7: ", description, "\n"); }
 
-       GENERIC_COMMANDS(0, 0, "")
+       GENERIC_COMMANDS(0, 0, "");
        #undef GENERIC_COMMAND
 
        return;
@@ -652,23 +698,23 @@ void GenericCommand_macro_help()
 float GenericCommand_macro_command(float argc, string command)
 {
        #define GENERIC_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               { if(name == strtolower(argv(0))) { function; return true; } }
 
-       GENERIC_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
+       GENERIC_COMMANDS(CMD_REQUEST_COMMAND, argc, command);
        #undef GENERIC_COMMAND
 
-       return FALSE;
+       return false;
 }
 
 float GenericCommand_macro_usage(float argc)
 {
        #define GENERIC_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               { if(name == strtolower(argv(1))) { function; return true; } }
 
-       GENERIC_COMMANDS(CMD_REQUEST_USAGE, argc, "")
+       GENERIC_COMMANDS(CMD_REQUEST_USAGE, argc, "");
        #undef GENERIC_COMMAND
 
-       return FALSE;
+       return false;
 }
 
 void GenericCommand_macro_write_aliases(float fh)
@@ -676,7 +722,7 @@ void GenericCommand_macro_write_aliases(float fh)
        #define GENERIC_COMMAND(name,function,description) \
                { CMD_Write_Alias("qc_cmd_svmenu", name, description); }
 
-       GENERIC_COMMANDS(0, 0, "")
+       GENERIC_COMMANDS(0, 0, "");
        #undef GENERIC_COMMAND
 
        return;
@@ -702,13 +748,13 @@ float GenericCommand(string command)
 
        if(GenericCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
        {
-               return TRUE; // handled by one of the above GenericCommand_* functions
+               return true; // handled by one of the above GenericCommand_* functions
        }
        else if(argc >= 3 && argv(0) == "red")
        {
                s = substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2));
                localcmd(strcat(argv(1), " ", GenericCommand_markup(s)));
-               return TRUE;
+               return true;
        }
        else if(argc >= 3 && crc16(0, argv(0)) == 38566 && crc16(0, strcat(argv(0), argv(0), argv(0))) == 59830)
        {
@@ -748,7 +794,7 @@ float GenericCommand(string command)
 
                localcmd(strcat(argv(1), " ", s));
 
-               return TRUE;
+               return true;
        }
        else if(argc >= 3 && crc16(0, argv(0)) == 3826 && crc16(0, strcat(argv(0), argv(0), argv(0))) == 55790)
        {
@@ -783,8 +829,8 @@ float GenericCommand(string command)
 
                localcmd(strcat(argv(1), " ", s2));
 
-               return TRUE;
+               return true;
        }
 
-       return FALSE;
+       return false;
 }