Browse Source

String operator_plus fix

Ramesh Ravone 8 years ago
parent
commit
36561b5853
2 changed files with 3 additions and 4 deletions
  1. 1 2
      include/core/Godot.hpp
  2. 2 2
      src/core/String.cpp

+ 1 - 2
include/core/Godot.hpp

@@ -50,7 +50,6 @@ public:
 #define GODOT_NATIVE_TERMINATE(arg) extern "C" void GD_EXPORT godot_native_terminate(arg)
 
 
-
 #define GODOT_CLASS(Name) \
 	public: inline static char *___get_type_name() { return (char *) #Name; } \
 	private:
@@ -58,7 +57,7 @@ public:
 #define GODOT_SUBCLASS(Name, Base) \
 	public: inline static char *___get_type_name() { return (char *) #Name; } \
 	inline static char *___get_base_type_name() { return (char *) #Base; } \
-	inline Name(godot_object *o) : Base(o) {} \
+	//inline Name(godot_object *o) : Base(o) {} \
 	private:
 
 

+ 2 - 2
src/core/String.cpp

@@ -84,14 +84,14 @@ bool String::operator !=(const String &s)
 String String::operator +(const String &s)
 {
 	String new_string = *this;
-	godot_string_operator_plus(&new_string._godot_string, &s._godot_string);
+	new_string._godot_string = godot_string_operator_plus(&new_string._godot_string, &s._godot_string);
 
 	return new_string;
 }
 
 void String::operator +=(const String &s)
 {
-	godot_string_operator_plus(&_godot_string, &s._godot_string);
+	_godot_string = godot_string_operator_plus(&_godot_string, &s._godot_string);
 }
 
 void String::operator +=(const wchar_t c)