From 37adf936abf018bb8b643b589c07ac0f1a036f51 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 5 Aug 2017 21:43:10 -0300 Subject: [PATCH] few bugs fixed thanks to explicit bool constructor and clang. explicit bool constructor has thus now been removed, as it served it's mission! --- core/variant.h | 2 +- modules/visual_script/visual_script_nodes.cpp | 2 +- scene/2d/visibility_notifier_2d.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/variant.h b/core/variant.h index 4d137efac21..95782d96194 100644 --- a/core/variant.h +++ b/core/variant.h @@ -239,7 +239,7 @@ public: operator IP_Address() const; - explicit Variant(bool p_bool); + Variant(bool p_bool); Variant(signed int p_int); // real one Variant(unsigned int p_int); #ifdef NEED_LONG_INT diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index 69aa10ebca6..d5d8b8fe6ec 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -2798,7 +2798,7 @@ public: r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; return 0; } - *p_outputs[0] = subcall->call(VisualScriptLanguage::singleton->_subcall, p_inputs, input_args, r_error_str); + *p_outputs[0] = subcall->call(VisualScriptLanguage::singleton->_subcall, p_inputs, input_args, r_error); return 0; } }; diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index a37c74cb073..fb71b61d450 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -33,6 +33,7 @@ #include "scene/2d/animated_sprite.h" #include "scene/2d/physics_body_2d.h" #include "scene/animation/animation_player.h" +#include "scene/main/viewport.h" #include "scene/scene_string_names.h" #include "scene/scene_string_names.h"