fix bug in last patch - must set trace.endpos AFTER calling TracePoint

[xonotic/darkplaces.git] / prvm_execprogram.h

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index f29299d21a599619f2436e0061a97a726a346abf..3f597763224dcf350bf478658de136eb554530a6 100644 (file)
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -82,13 +82,13 @@
                                OPC->_float = OPA->_float < OPB->_float;
                                break;
                        case OP_AND:
-                               OPC->_float = OPA->_float && OPB->_float;
+                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) && FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add AND_I to be used by fteqcc for anything not a float
                                break;
                        case OP_OR:
-                               OPC->_float = OPA->_float || OPB->_float;
+                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) || FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add OR_I to be used by fteqcc for anything not a float
                                break;
                        case OP_NOT_F:
-                               OPC->_float = !OPA->_float;
+                               OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int);
                                break;
                        case OP_NOT_V:
                                OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
@@ -259,7 +259,7 @@
                //==================
 
                        case OP_IFNOT:
-                               if (!(OPA->_int & 0x7FFFFFFF)) // also match "negative zero" floats of value 0x80000000
+                               if(!FLOAT_IS_TRUE_FOR_INT(OPA->_int))
                                // TODO add an "int-if", and change this one to OPA->_float
                                // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
                                // and entity, string, field values can never have that value
@@ -272,7 +272,7 @@
                                        if (++jumpcount == 10000000)
                                        {
                                                prog->xstatement = st - prog->statements;
-                                               PRVM_Profile(1<<30, 1000000);
+                                               PRVM_Profile(1<<30, 1000000, 0);
                                                PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
                                        }
 #endif
@@ -280,8 +280,8 @@
                                break;
 
                        case OP_IF:
-                               if (!(OPA->_int & 0x7FFFFFFF)) // also match "negative zero" floats of value 0x80000000
-                               // TODO add an "int-if", and change this one to OPA->_float
+                               if(FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+                               // TODO add an "int-if", and change this one, as well as the FLOAT_IS_TRUE_FOR_INT usages, to OPA->_float
                                // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
                                // and entity, string, field values can never have that value
                                {
@@ -293,7 +293,7 @@
                                        if (++jumpcount == 10000000)
                                        {
                                                prog->xstatement = st - prog->statements;
-                                               PRVM_Profile(1<<30, 1000000);
+                                               PRVM_Profile(1<<30, 1000000, 0);
                                                PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
                                        }
 #endif
@@ -309,7 +309,7 @@
                                if (++jumpcount == 10000000)
                                {
                                        prog->xstatement = st - prog->statements;
-                                       PRVM_Profile(1<<30, 1000000);
+                                       PRVM_Profile(1<<30, 1000000, 0);
                                        PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
                                }
 #endif