From f04a964627d469e6de4227ebe6301ba18757b9de Mon Sep 17 00:00:00 2001 From: kleonc <9283098+kleonc@users.noreply.github.com> Date: Mon, 3 May 2021 21:16:29 +0200 Subject: [PATCH] Make posmod use int64_t instead of int --- core/math/math_funcs.h | 4 ++-- modules/gdscript/gdscript_functions.cpp | 2 +- modules/visual_script/visual_script_builtin_funcs.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index f4259e80908..332e3d34485 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -199,8 +199,8 @@ public: value += 0.0; return value; } - static _ALWAYS_INLINE_ int posmod(int p_x, int p_y) { - int value = p_x % p_y; + static _ALWAYS_INLINE_ int64_t posmod(int64_t p_x, int64_t p_y) { + int64_t value = p_x % p_y; if ((value < 0 && p_y > 0) || (value > 0 && p_y < 0)) { value += p_y; } diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index 50a4ecea1bd..06f361070d3 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -250,7 +250,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_ VALIDATE_ARG_COUNT(2); VALIDATE_ARG_NUM(0); VALIDATE_ARG_NUM(1); - r_ret = Math::posmod((int)*p_args[0], (int)*p_args[1]); + r_ret = Math::posmod((int64_t)*p_args[0], (int64_t)*p_args[1]); } break; case MATH_FLOOR: { VALIDATE_ARG_COUNT(1); diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp index 3cdd62368c3..cb868a9a15f 100644 --- a/modules/visual_script/visual_script_builtin_funcs.cpp +++ b/modules/visual_script/visual_script_builtin_funcs.cpp @@ -760,7 +760,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in VALIDATE_ARG_NUM(0); VALIDATE_ARG_NUM(1); - *r_return = Math::posmod((int)*p_inputs[0], (int)*p_inputs[1]); + *r_return = Math::posmod((int64_t)*p_inputs[0], (int64_t)*p_inputs[1]); } break; case VisualScriptBuiltinFunc::MATH_FLOOR: {