summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-05-01 10:44:08 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-05-01 10:44:08 -0300
commit4804462ee06c1b3e2d1b50b857ce8693d3c0936d (patch)
tree5d1d06399c5ce28f27253943f35ef4a11d3ac633 /core
parentaf42e244e0c41c92b6eeab379f7ba68869dbd0a9 (diff)
-Fixes from source code analyzizer, closes #1768
Diffstat (limited to 'core')
-rw-r--r--core/math/math_funcs.cpp4
-rw-r--r--core/variant_op.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp
index 490e529d82..6ad5c7499b 100644
--- a/core/math/math_funcs.cpp
+++ b/core/math/math_funcs.cpp
@@ -48,8 +48,8 @@ uint32_t Math::rand_from_seed(uint32_t *seed) {
s = 0x12345987;
k = s / 127773;
s = 16807 * (s - k * 127773) - 2836 * k;
- if (s < 0)
- s += 2147483647;
+// if (s < 0)
+// s += 2147483647;
(*seed) = s;
return (s & Math::RANDOM_MAX);
#else
diff --git a/core/variant_op.cpp b/core/variant_op.cpp
index dafe3bd02d..f68652b8cc 100644
--- a/core/variant_op.cpp
+++ b/core/variant_op.cpp
@@ -2433,7 +2433,7 @@ Variant Variant::get(const Variant& p_index, bool *r_valid) const {
}
else if (str == "pressed") {
valid=true;
- ie.action.pressed;
+ return ie.action.pressed;
}
}