]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Fix fold_op_cmp
authorDale Weiler <killfieldengine@gmail.com>
Fri, 29 Nov 2013 18:48:03 +0000 (13:48 -0500)
committerDale Weiler <killfieldengine@gmail.com>
Fri, 29 Nov 2013 18:48:03 +0000 (13:48 -0500)
fold.c

diff --git a/fold.c b/fold.c
index 40580e45a168216482d39b2f15cbbc0b34a9652c..84b01c772e707c2b8e86fc5633b99120e0c678a4 100644 (file)
--- a/fold.c
+++ b/fold.c
@@ -606,10 +606,15 @@ static GMQCC_INLINE ast_expression *fold_op_lteqgt(fold_t *fold, ast_value *a, a
 
 static GMQCC_INLINE ast_expression *fold_op_cmp(fold_t *fold, ast_value *a, ast_value *b, bool ne) {
     if (fold_can_2(a, b)) {
-        if (isfloat(a) && isfloat(b))
-            return fold_constgen_float(fold, ne != (fold_immvalue_float(a) == fold_immvalue_float(b)));
-        if (isvector(a) && isvector(b))
-            return fold_constgen_float(fold, ne != vec3_cmp(fold_immvalue_vector(a), fold_immvalue_vector(b)));
+        if (isfloat(a) && isfloat(b)) {
+            float la = fold_immvalue_float(a);
+            float lb = fold_immvalue_float(b);
+            return (ast_expression*)fold->imm_float[!!(ne ? la != lb : la == lb)];
+        } if (isvector(a) && isvector(b)) {
+            vec3_t la = fold_immvalue_vector(a);
+            vec3_t lb = fold_immvalue_vector(b);
+            return (ast_expression*)fold->imm_float[!!(ne ? vec3_cmp(la, lb) : !vec3_cmp(la, lb))];
+        }
     }
     return NULL;
 }