Remove some leftovers from merge

[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 37f6ebd78255cd6bd76c5490ab351ea97532f405..6aa93a024ed209475f9a4b5d673e4654b46312a5 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,29 +1,27 @@
-#if defined(CSQC)
-       #include "../../dpdefs/csprogsdefs.qc"
-       #include "../constants.qh"
-       #include "../util.qh"
-       #include "../mapinfo.qh"
-       #include "generic.qh"
-       #include "shared_defs.qh"
-       #include "../../client/command/cl_cmd.qh"
+#include "command.qh"
+#include "generic.qh"
+
+#include "markup.qh"
+#include "rpn.qh"
+
+#include "../mapinfo.qh"
+#include "../test.qh"
+
+#ifndef MENUQC
        #include "../notifications.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
-    #include "../../server/sys-post.qh"
-    #include "../constants.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "generic.qh"
-    #include "shared_defs.qh"
-    #include "../weapons/config.qh"
-    #include "../notifications.qh"
-    #include "../mapinfo.qh"
-    #include "../../server/command/common.qh"
-    #include "../../server/command/banning.qh"
-    #include "../../server/command/cmd.qh"
-    #include "../../server/command/sv_cmd.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
 
 // =========================================================
@@ -243,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)
@@ -303,7 +320,7 @@ 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";
@@ -315,7 +332,7 @@ void GenericCommand_dumpweapons(float request) // WEAPONTODO: make this work wit
                                wep_config_alsoprint = true;
                        }
                        wep_config_file = fopen(filename, FILE_WRITE);
-                       
+
                        if(wep_config_file >= 0)
                        {
                                Dump_Weapon_Settings();
@@ -333,7 +350,7 @@ void GenericCommand_dumpweapons(float request) // WEAPONTODO: make this work wit
                        #endif
                        return;
                }
-                       
+
                default:
                case CMD_REQUEST_USAGE:
                {
@@ -653,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") \