pow(a, b) -> a ** b

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / command / rpn.qc

diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc
index 1ca075bbbdf1f614652985039cf575182f13a149..828fbdf7dd7850004caa793a342896077a5530e4 100644 (file)
--- a/qcsrc/common/command/rpn.qc
+++ b/qcsrc/common/command/rpn.qc
@@ -1,5 +1,5 @@
-#include "command.qh"
 #include "rpn.qh"
+#include "command.qh"
 
 
 // ========================================
@@ -164,7 +164,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                rpn_setf(f2 - f * floor(f2 / f));
                                        } else if(rpncmd == "pow" || rpncmd == "**") {
                                                f = rpn_popf();
-                                               rpn_setf(pow(rpn_getf(), f));
+                                               rpn_setf(rpn_getf() ** f);
                                        } else if(rpncmd == "bitand" || rpncmd == "&") {
                                                f = rpn_popf();
                                                rpn_setf(rpn_getf() & f);
@@ -437,7 +437,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                                if(argv(i) == argv(j))
                                                                        goto skip_union;
                                                        s = strcat(s, " ", argv(i));
-                                                       :skip_union
+LABEL(skip_union)
                                                }
                                                if(substring(s, 0, 1) == " ")
                                                        s = substring(s, 1, 99999);
@@ -480,7 +480,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                                if(argv(i) == argv(j))
                                                                        goto skip_difference;
                                                        s = strcat(s, " ", argv(i));
-                                                       :skip_difference
+LABEL(skip_difference)
                                                }
                                                if(substring(s, 0, 1) == " ")
                                                        s = substring(s, 1, 99999);