projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8afb8e6)
Simplify normal_or_gentle macro
authorterencehill <piuntn@gmail.com>
Sun, 1 Sep 2019 08:38:22 +0000 (10:38 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 1 Sep 2019 08:38:22 +0000 (10:38 +0200)
qcsrc/common/util.qh patch | blob | history

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 2033aa94b7eeeaa7a226ac516757cfbac84cd0cd..756e02cf51ffeb8aa85970233bfe7007d60818b9 100644 (file)
--- 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