From: terencehill <piuntn@gmail.com>
Date: Sun, 1 Sep 2019 08:38:22 +0000 (+0200)
Subject: Simplify normal_or_gentle macro
X-Git-Tag: xonotic-v0.8.5~1334
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d0affc73e554ca1a56f480d8dd5180fbd1d7d1f;p=xonotic%2Fxonotic-data.pk3dir.git

Simplify normal_or_gentle macro
---

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 2033aa94b..756e02cf5 100644
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -201,7 +201,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 	#else
 		#define GENTLE autocvar_sv_gentle
 	#endif
-	#define normal_or_gentle(normal, gentle) (GENTLE ? ((gentle != "") ? gentle : normal) : normal)
+	#define normal_or_gentle(normal, gentle) ((GENTLE && (gentle != "")) ? gentle : normal)
 #endif
 
 #ifdef GAMEQC