Merge branch 'TimePath/waypointsprites' into 'master'

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

diff --git a/qcsrc/common/command/generic.qh b/qcsrc/common/command/generic.qh
index 7b4b82fe7f65b8c115014524c84621f02ac98e57..e419824ec8eb8d0aadf82735805bf1193c5bc713 100644 (file)
--- a/qcsrc/common/command/generic.qh
+++ b/qcsrc/common/command/generic.qh
@@ -1,78 +1,21 @@
-#ifndef GENERIC_H
-#define GENERIC_H
+#ifndef COMMAND_GENERIC_H
+#define COMMAND_GENERIC_H
+
+#include "../constants.qh"
 
-#if defined(CSQC)
-    #include "../util-pre.qh"
-    #include "../../client/sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../../client/sys-post.qh"
-    #include "../../client/defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../weapons/weapons.qh"
-    #include "../mapinfo.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-#elif defined(MENUQC)
-    #include "../util-pre.qh"
-    #include "../../menu/sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../menu/sys-post.qh"
-    #include "../../menu/config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "../../menu/oo/base.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../constants.qh"
-    #include "../mapinfo.qh"
-    #include "../campaign_common.qh"
-    #include "../weapons/weapons.qh"
-    #include "../counting.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-#elif defined(SVQC)
-    #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-#endif
 // =========================================================
 //  Declarations for common command code, written by Samual
 //  Last updated: December 28th, 2011
 // =========================================================
 
+void GenericCommand_macro_help();
+
+float GenericCommand_macro_command(float argc, string command);
+
+float GenericCommand_macro_usage(float argc);
+
+void GenericCommand_macro_write_aliases(float fh);
+
 // Used by other game command systems for common commands,
 // and it returns true if handled, false if not.
 // Note: It tokenizes its input, so be careful!
@@ -90,4 +33,4 @@ void Curl_URI_Get_Callback(int id, float status, string data);
 int curl_uri_get_pos;
 float curl_uri_get_exec[URI_GET_CURL_END - URI_GET_CURL + 1];
 string curl_uri_get_cvar[URI_GET_CURL_END - URI_GET_CURL + 1];
-#endif
\ No newline at end of file
+#endif