Merge pull request #17 from RameshRavone/master

String operator_plus fix

Author: karroffel

include/core/Godot.hpp

@@ -50,15 +50,14 @@ class GodotScript {
 #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:
 
 #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:
 
 

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)