From: terencehill <piuntn@gmail.com>
Date: Wed, 6 Feb 2019 22:13:34 +0000 (+0100)
Subject: Remove a few useless brackets inside macros
X-Git-Tag: xonotic-v0.8.5~1604^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=306d846b2583c3d4346c120725f8506a79af47f8;p=xonotic%2Fxonotic-data.pk3dir.git

Remove a few useless brackets inside macros
---

diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index 6a4cf8147..438ff5d22 100644
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -247,11 +247,11 @@ string Process_Notif_Args(
 
 				switch(strtolower(selected))
 				{
-					#define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: { ++sel_num; break; }
-					#define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: { ++sel_num; break; }
-					#define ARG_CASE_ARG_CS_SV(selected,result)    case selected: { ++sel_num; break; }
-					#define ARG_CASE_ARG_CS(selected,result)       case selected: { ++sel_num; break; }
-					#define ARG_CASE_ARG_SV(selected,result)       case selected: { ++sel_num; break; }
+					#define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: ++sel_num; break;
+					#define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: ++sel_num; break;
+					#define ARG_CASE_ARG_CS_SV(selected,result)    case selected: ++sel_num; break;
+					#define ARG_CASE_ARG_CS(selected,result)       case selected: ++sel_num; break;
+					#define ARG_CASE_ARG_SV(selected,result)       case selected: ++sel_num; break;
 					#define ARG_CASE_ARG_DC(selected,result)
 					#define ARG_CASE(prog,selected,result)         ARG_CASE_##prog(selected,result)
 					NOTIF_ARGUMENT_LIST
@@ -298,7 +298,7 @@ string Process_Notif_Args(
 
 				switch(strtolower(selected))
 				{
-					#define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: { ++sel_num; break; }
+					#define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: ++sel_num; break;
 					#define ARG_CASE_ARG_CS_SV_DC(selected,result)
 					#define ARG_CASE_ARG_CS_SV(selected,result)
 					#define ARG_CASE_ARG_CS(selected,result)
@@ -350,11 +350,11 @@ string Process_Notif_Args(
 				switch(strtolower(selected))
 				{
 					#define ARG_CASE_ARG_CS_SV_HA(selected,result)
-					#define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: { ++sel_num; break; }
+					#define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: ++sel_num; break;
 					#define ARG_CASE_ARG_CS_SV(selected,result)
 					#define ARG_CASE_ARG_CS(selected,result)
 					#define ARG_CASE_ARG_SV(selected,result)
-					#define ARG_CASE_ARG_DC(selected,result)       case selected: { ++sel_num; break; }
+					#define ARG_CASE_ARG_DC(selected,result)       case selected: ++sel_num; break;
 					#define ARG_CASE(prog,selected,result)         ARG_CASE_##prog(selected,result)
 					NOTIF_ARGUMENT_LIST
 					#undef ARG_CASE
@@ -1011,15 +1011,15 @@ string Local_Notification_sprintf(
 		string tmp_s; // used by NOTIF_ARGUMENT_LIST
 		switch (strtolower(selected))
 		{
-			#define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: { arg_slot[sel_num++] = result; break; }
-			#define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: { arg_slot[sel_num++] = result; break; }
-			#define ARG_CASE_ARG_CS_SV(selected, result)    case selected: { arg_slot[sel_num++] = result; break; }
+			#define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: arg_slot[sel_num++] = result; break;
+			#define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: arg_slot[sel_num++] = result; break;
+			#define ARG_CASE_ARG_CS_SV(selected, result)    case selected: arg_slot[sel_num++] = result; break;
 #ifdef CSQC
-			#define ARG_CASE_ARG_CS(selected, result)       case selected: { arg_slot[sel_num++] = result; break; }
+			#define ARG_CASE_ARG_CS(selected, result)       case selected: arg_slot[sel_num++] = result; break;
 			#define ARG_CASE_ARG_SV(selected, result)
 #else
 			#define ARG_CASE_ARG_CS(selected, result)
-			#define ARG_CASE_ARG_SV(selected, result)       case selected: { arg_slot[sel_num++] = result; break; }
+			#define ARG_CASE_ARG_SV(selected, result)       case selected: arg_slot[sel_num++] = result; break;
 #endif
 			#define ARG_CASE_ARG_DC(selected, result)
 			#define ARG_CASE(prog, selected, result)        ARG_CASE_##prog(selected, result)
@@ -1099,7 +1099,7 @@ void Local_Notification_HUD_Notify_Push(
 		NOTIF_HIT_MAX(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push");
 		switch (strtolower(selected))
 		{
-			#define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: { arg_slot[sel_num++] = result; break; }
+			#define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: arg_slot[sel_num++] = result; break;
 			#define ARG_CASE_ARG_CS_SV_DC(selected, result)
 			#define ARG_CASE_ARG_CS_SV(selected, result)
 			#define ARG_CASE_ARG_CS(selected, result)
@@ -1143,11 +1143,11 @@ void Local_Notification_centerprint_generic(
 		switch (strtolower(selected))
 		{
 			#define ARG_CASE_ARG_CS_SV_HA(selected, result)
-			#define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: { arg_slot[sel_num++] = result; break; }
+			#define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: arg_slot[sel_num++] = result; break;
 			#define ARG_CASE_ARG_CS_SV(selected, result)
 			#define ARG_CASE_ARG_CS(selected, result)
 			#define ARG_CASE_ARG_SV(selected, result)
-			#define ARG_CASE_ARG_DC(selected, result)       case selected: { arg_slot[sel_num++] = result; break; }
+			#define ARG_CASE_ARG_DC(selected, result)       case selected: arg_slot[sel_num++] = result; break;
 			#define ARG_CASE(prog, selected, result)        ARG_CASE_##prog(selected,result)
 			NOTIF_ARGUMENT_LIST
 			#undef ARG_CASE
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index e99449112..69f506e6e 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -702,7 +702,7 @@ float updateCompression()
 Gametype GameType_GetID(int cnt)
 {
 	int i = 0;
-	#define GAMETYPE(it) { if (i++ == cnt) return it; }
+	#define GAMETYPE(it) if (i++ == cnt) return it;
 	GAMETYPES
 	HIDDEN_GAMETYPES
 	#undef GAMETYPE
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 01b4926ec..464d54f0e 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -321,14 +321,11 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .en
 			// these 2 macros are spread over multiple files
 			#define SPREE_ITEM(counta,countb,center,normal,gentle) \
 				case counta: \
-				{ \
 					Send_Notification(NOTIF_ONE, attacker, MSG_ANNCE, ANNCE_KILLSTREAK_##countb); \
-					if (!warmup_stage)\
-					{\
+					if (!warmup_stage) \
 						PlayerStats_GameReport_Event_Player(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \
-					}\
-					break; \
-				}
+					break;
+
 			switch(CS(attacker).killcount)
 			{
 				KILL_SPREE_LIST
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index a92a4ea12..9be3c18f6 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -278,12 +278,11 @@ bool expr_evaluate(string s)
         string k, v;
         s = argv(i);
         #define X(expr) \
-            if (expr) { \
+            if (expr) \
                 continue; \
-            } else { \
-                expr_fail = true; \
-                break; \
-            }
+            expr_fail = true; \
+            break;
+
         #define BINOP(op, len, expr) \
             if ((o = strstrofs(s, op, 0)) >= 0) { \
                 k = substring(s, 0, o); \