Просмотр исходного кода

few bugs fixed thanks to explicit bool constructor and clang.
explicit bool constructor has thus now been removed, as it served it's mission!

Juan Linietsky 8 лет назад
Родитель
Сommit
37adf936ab
3 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      core/variant.h
  2. 1 1
      modules/visual_script/visual_script_nodes.cpp
  3. 1 0
      scene/2d/visibility_notifier_2d.cpp

+ 1 - 1
core/variant.h

@@ -239,7 +239,7 @@ public:
 
 
 	operator IP_Address() const;
 	operator IP_Address() const;
 
 
-	explicit Variant(bool p_bool);
+	Variant(bool p_bool);
 	Variant(signed int p_int); // real one
 	Variant(signed int p_int); // real one
 	Variant(unsigned int p_int);
 	Variant(unsigned int p_int);
 #ifdef NEED_LONG_INT
 #ifdef NEED_LONG_INT

+ 1 - 1
modules/visual_script/visual_script_nodes.cpp

@@ -2798,7 +2798,7 @@ public:
 			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
 			return 0;
 			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;
 		return 0;
 	}
 	}
 };
 };

+ 1 - 0
scene/2d/visibility_notifier_2d.cpp

@@ -33,6 +33,7 @@
 #include "scene/2d/animated_sprite.h"
 #include "scene/2d/animated_sprite.h"
 #include "scene/2d/physics_body_2d.h"
 #include "scene/2d/physics_body_2d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/animation_player.h"
+#include "scene/main/viewport.h"
 #include "scene/scene_string_names.h"
 #include "scene/scene_string_names.h"
 #include "scene/scene_string_names.h"
 #include "scene/scene_string_names.h"