The macros don't need to be broken up anymore ^_^ (Note: For now, this makes the...

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index aa0b1afc3c5d748842f11e5ae7cb6cbce23fc61c..f0e582688c241bb6dc0c5496a3fa237cace6d677 100644 (file)
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -842,9 +842,8 @@ void ClientCommand_(float request)
 //  Macro system for commands
 // ===========================
 
-// For now, the list has to be split up due to the suckage called fteqcc which limits macros to only 1024 characters
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-#define CLIENT_COMMANDS_1(request,arguments,command) \
+#define CLIENT_COMMANDS(request,arguments,command) \
        CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \
        CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
        CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
@@ -853,9 +852,6 @@ void ClientCommand_(float request)
        CLIENT_COMMAND("info", ClientCommand_info(request, arguments), "Request for unique server information set up by admin") \
        CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
        CLIENT_COMMAND("ladder", ClientCommand_ladder(request), "Get information about top players if supported") \
-       /* nothing */
-
-#define CLIENT_COMMANDS_2(request,arguments,command) \
        CLIENT_COMMAND("lsmaps", ClientCommand_lsmaps(request), "List maps which can be used with the current game mode") \
        CLIENT_COMMAND("lsnewmaps", ClientCommand_lsnewmaps(request), "List maps which TODO") \
        CLIENT_COMMAND("maplist", ClientCommand_maplist(request), "Full server maplist reply") \
@@ -864,9 +860,6 @@ void ClientCommand_(float request)
        CLIENT_COMMAND("records", ClientCommand_records(request), "List top 10 records for the current map") \
        CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \
        CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \
-       /* nothing */
-       
-#define CLIENT_COMMANDS_3(request,arguments,command) \
        CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \
        CLIENT_COMMAND("selectteam", ClientCommand_selectteam(request, arguments), "Attempt to choose a team to join into") \
        CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(request, arguments, command), "New system for sending a client cvar to the server") \
@@ -875,9 +868,6 @@ void ClientCommand_(float request)
        CLIENT_COMMAND("teamstatus", ClientCommand_teamstatus(request), "Print detailed score information for all players") \
        CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \
        CLIENT_COMMAND("timein", ClientCommand_timein(request), "Resume the game from being paused with a timeout") \
-       /* nothing */
-
-#define CLIENT_COMMANDS_4(request,arguments,command) \
        CLIENT_COMMAND("timeout", ClientCommand_timeout(request), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
        CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \
        /* nothing */
@@ -887,10 +877,7 @@ void ClientCommand_macro_help()
        #define CLIENT_COMMAND(name,function,description) \
                { print("  ^2", name, "^7: ", description, "\n"); }
                
-       CLIENT_COMMANDS_1(0, 0, "")
-       CLIENT_COMMANDS_2(0, 0, "")
-       CLIENT_COMMANDS_3(0, 0, "")
-       CLIENT_COMMANDS_4(0, 0, "")
+       CLIENT_COMMANDS(0, 0, "")
        #undef CLIENT_COMMAND
        
        return;
@@ -901,10 +888,7 @@ float ClientCommand_macro_command(float argc, string command)
        #define CLIENT_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return TRUE; } }
                
-       CLIENT_COMMANDS_1(CC_REQUEST_COMMAND, argc, command)
-       CLIENT_COMMANDS_2(CC_REQUEST_COMMAND, argc, command)
-       CLIENT_COMMANDS_3(CC_REQUEST_COMMAND, argc, command)
-       CLIENT_COMMANDS_4(CC_REQUEST_COMMAND, argc, command)
+       CLIENT_COMMANDS(CC_REQUEST_COMMAND, argc, command)
        #undef CLIENT_COMMAND
        
        return FALSE;
@@ -915,10 +899,7 @@ float ClientCommand_macro_usage(float argc, string command)
        #define CLIENT_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return TRUE; } }
                
-       CLIENT_COMMANDS_1(CC_REQUEST_USAGE, argc, command)
-       CLIENT_COMMANDS_2(CC_REQUEST_USAGE, argc, command)
-       CLIENT_COMMANDS_3(CC_REQUEST_USAGE, argc, command)
-       CLIENT_COMMANDS_4(CC_REQUEST_USAGE, argc, command)
+       CLIENT_COMMANDS(CC_REQUEST_USAGE, argc, command)
        #undef CLIENT_COMMAND
        
        return FALSE;

diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc
index eb15e3df456c05f95842517e08630dc4473db733..281eb66a6e2205eebd88aa55cc0d86185bc14498 100644 (file)
--- a/qcsrc/server/gamecommand.qc
+++ b/qcsrc/server/gamecommand.qc
@@ -1866,9 +1866,8 @@ void GameCommand_(float request)
 //  Macro system for commands
 // ===========================
 
-// For now, the list has to be split up due to the suckage called fteqcc which limits macros to only 1024 characters
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-#define SERVER_COMMANDS_1(request,arguments) \
+#define SERVER_COMMANDS(request,arguments) \
        SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \
        SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \
        SERVER_COMMAND("allspec", GameCommand_allspec(request, arguments), "Force all players to spectate") \
@@ -1877,9 +1876,6 @@ void GameCommand_(float request)
        SERVER_COMMAND("bot_cmd", GameCommand_bot_cmd(request, arguments), "Control and send commands to bots") \
        SERVER_COMMAND("cointoss", GameCommand_cointoss(request, arguments), "Flip a virtual coin and give random result") \
        SERVER_COMMAND("cvar_changes", GameCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
-       /* nothing */
-       
-#define SERVER_COMMANDS_2(request,arguments) \
        SERVER_COMMAND("cvar_purechanges", GameCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \
        SERVER_COMMAND("database", GameCommand_database(request, arguments), "Extra controls of the serverprogs database") \
        SERVER_COMMAND("defer_clear", GameCommand_defer_clear(request, arguments), "Clear all queued defer commands for a specific client") \
@@ -1887,9 +1883,6 @@ void GameCommand_(float request)
        SERVER_COMMAND("delrec", GameCommand_delrec(request, arguments), "Delete race time record for a map") \
        SERVER_COMMAND("effectindexdump", GameCommand_effectindexdump(request), "Dump list of effects from code and effectinfo.txt") \
        SERVER_COMMAND("extendmatchtime", GameCommand_extendmatchtime(request), "Increase the timelimit value incrementally") \
-               /* nothing */
-
-#define SERVER_COMMANDS_3(request,arguments) \
        SERVER_COMMAND("find", GameCommand_find(request, arguments), "Search through entities for matching classname") \
        SERVER_COMMAND("gametype", GameCommand_gametype(request, arguments), "Simple command to change the active gametype") \
        SERVER_COMMAND("gettaginfo", GameCommand_gettaginfo(request, arguments), "Get specific information about a weapon model") \
@@ -1898,9 +1891,6 @@ void GameCommand_(float request)
        SERVER_COMMAND("lockteams", GameCommand_lockteams(request), "Disable the ability for players to switch or enter teams") \
        SERVER_COMMAND("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \
        SERVER_COMMAND("modelbug", GameCommand_modelbug(request), "TODO foobar") \
-       /* nothing */
-
-#define SERVER_COMMANDS_4(request,arguments) \
        SERVER_COMMAND("moveplayer", GameCommand_moveplayer(request, arguments), "Change the team/status of a player") \
        SERVER_COMMAND("nospectators", GameCommand_nospectators(request), "Automatically remove spectators from a match") \
        SERVER_COMMAND("onslaught_updatelinks", GameCommand_onslaught_updatelinks(request), "Refresh link status for onslaught") \
@@ -1909,9 +1899,6 @@ void GameCommand_(float request)
        SERVER_COMMAND("radarmap", GameCommand_radarmap(request, arguments), "Generate a radar image of the map") \
        SERVER_COMMAND("rankings", GameCommand_rankings(request), "Print information about rankings") \
        SERVER_COMMAND("records", GameCommand_records(request), "List top 10 records for the current map") \
-       /* nothing */
-
-#define SERVER_COMMANDS_5(request,arguments) \
        SERVER_COMMAND("reducematchtime", GameCommand_reducematchtime(request), "Decrease the timelimit value incrementally") \
        SERVER_COMMAND("setbots", GameCommand_setbots(request, arguments), "Adjust how many bots are in the match") \
        SERVER_COMMAND("shuffleteams", GameCommand_shuffleteams(request), "Randomly move players to different teams") \
@@ -1920,9 +1907,6 @@ void GameCommand_(float request)
        SERVER_COMMAND("time", GameCommand_time(request), "Print different formats/readouts of time") \
        SERVER_COMMAND("trace", GameCommand_trace(request, arguments), "Various debugging tools with tracing") \
        SERVER_COMMAND("unlockteams", GameCommand_unlockteams(request), "Enable the ability for players to switch or enter teams") \
-       /* nothing */
-       
-#define SERVER_COMMANDS_6(request,arguments) \
        SERVER_COMMAND("warp", GameCommand_warp(request, arguments), "Choose different level in campaign") \
        /* nothing */
 
@@ -1931,12 +1915,7 @@ void GameCommand_macro_help()
        #define SERVER_COMMAND(name,function,description) \
                { print("  ^2", name, "^7: ", description, "\n"); }
                
-       SERVER_COMMANDS_1(0, 0)
-       SERVER_COMMANDS_2(0, 0)
-       SERVER_COMMANDS_3(0, 0)
-       SERVER_COMMANDS_4(0, 0)
-       SERVER_COMMANDS_5(0, 0)
-       SERVER_COMMANDS_6(0, 0)
+       SERVER_COMMANDS(0, 0)
        #undef SERVER_COMMAND
        
        return;
@@ -1947,12 +1926,7 @@ float GameCommand_macro_command(float argc)
        #define SERVER_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return TRUE; } }
                
-       SERVER_COMMANDS_1(GC_REQUEST_COMMAND, argc)
-       SERVER_COMMANDS_2(GC_REQUEST_COMMAND, argc)
-       SERVER_COMMANDS_3(GC_REQUEST_COMMAND, argc)
-       SERVER_COMMANDS_4(GC_REQUEST_COMMAND, argc)
-       SERVER_COMMANDS_5(GC_REQUEST_COMMAND, argc)
-       SERVER_COMMANDS_6(GC_REQUEST_COMMAND, argc)
+       SERVER_COMMANDS(GC_REQUEST_COMMAND, argc)
        #undef SERVER_COMMAND
        
        return FALSE;
@@ -1963,12 +1937,7 @@ float GameCommand_macro_usage(float argc)
        #define SERVER_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return TRUE; } }
                
-       SERVER_COMMANDS_1(GC_REQUEST_USAGE, argc)
-       SERVER_COMMANDS_2(GC_REQUEST_USAGE, argc)
-       SERVER_COMMANDS_3(GC_REQUEST_USAGE, argc)
-       SERVER_COMMANDS_4(GC_REQUEST_USAGE, argc)
-       SERVER_COMMANDS_5(GC_REQUEST_USAGE, argc)
-       SERVER_COMMANDS_6(GC_REQUEST_USAGE, argc)
+       SERVER_COMMANDS(GC_REQUEST_USAGE, argc)
        #undef SERVER_COMMAND
        
        return FALSE;