From: Samual <samual@xonotic.org>
Date: Sun, 6 Nov 2011 18:20:11 +0000 (-0500)
Subject: Begin new initialization system for commands, plus some tweaks to the macros
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~246
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=edad22567fd358d320ea2e82d7f5751c2eb629f8;p=xonotic%2Fxonotic-data.pk3dir.git

Begin new initialization system for commands, plus some tweaks to the macros
---

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index 4d421ff20..48eae2464 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -1044,7 +1044,9 @@ void ClientCommand_(float request)
 	
 void ClientCommand_macro_help()
 {
-	#define CLIENT_COMMAND(name,function) function;
+	#define CLIENT_COMMAND(name,function) \
+		{ function; }
+		
 	CLIENT_COMMANDS_1(CC_REQUEST_HELP, 0, "")
 	CLIENT_COMMANDS_2(CC_REQUEST_HELP, 0, "")
 	CLIENT_COMMANDS_3(CC_REQUEST_HELP, 0, "")
@@ -1055,7 +1057,9 @@ void ClientCommand_macro_help()
 
 float ClientCommand_macro_command(float argc, string command)
 {
-	#define CLIENT_COMMAND(name,function) if(name == strtolower(argv(0))) { function; return TRUE; } 
+	#define CLIENT_COMMAND(name,function) \
+		{ 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)
@@ -1066,7 +1070,9 @@ float ClientCommand_macro_command(float argc, string command)
 
 float ClientCommand_macro_usage(float argc, string command)
 {
-	#define CLIENT_COMMAND(name,function) if(name == strtolower(argv(1))) { function; return TRUE; }
+	#define CLIENT_COMMAND(name,function) \
+		{ 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)
diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc
index c0dd934fa..be5cc0140 100644
--- a/qcsrc/server/gamecommand.qc
+++ b/qcsrc/server/gamecommand.qc
@@ -2047,9 +2047,24 @@ void GameCommand_(float request)
 	SERVER_COMMAND("warp", GameCommand_warp(request, arguments)) \
 	/* nothing */
 	
+/*void GameCommand_macro_init()
+{
+	#define SERVER_COMMAND(name,function) \
+		{ registercmd(name); print("Initializing ", name, " game command..."); }
+		
+	SERVER_COMMANDS_1(GC_REQUEST_HELP, 0)
+	SERVER_COMMANDS_2(GC_REQUEST_HELP, 0)
+	SERVER_COMMANDS_3(GC_REQUEST_HELP, 0)
+	#undef SERVER_COMMAND
+	
+	return;
+}*/
+
 void GameCommand_macro_help()
 {
-	#define SERVER_COMMAND(name,function) function;
+	#define SERVER_COMMAND(name,function) \
+		{ function; }
+		
 	SERVER_COMMANDS_1(GC_REQUEST_HELP, 0)
 	SERVER_COMMANDS_2(GC_REQUEST_HELP, 0)
 	SERVER_COMMANDS_3(GC_REQUEST_HELP, 0)
@@ -2060,7 +2075,9 @@ void GameCommand_macro_help()
 
 float GameCommand_macro_command(float argc)
 {
-	#define SERVER_COMMAND(name,function) if(name == strtolower(argv(0))) { function; return TRUE; } 
+	#define SERVER_COMMAND(name,function) \
+		{ 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)
@@ -2071,7 +2088,9 @@ float GameCommand_macro_command(float argc)
 
 float GameCommand_macro_usage(float argc)
 {
-	#define SERVER_COMMAND(name,function) if(name == strtolower(argv(1))) { function; return TRUE; }
+	#define SERVER_COMMAND(name,function) \
+		{ 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)