Restore Mono support

goostengine · Mar 7, 2021 · 6c93c9b · 6c93c9b
1 parent 200d7c0
commit 6c93c9b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/core/math/2d/random_2d.h b/core/math/2d/random_2d.h
@@ -14,7 +14,7 @@ class Random2D : public Random {
 
 public:
 	static Random2D *get_singleton() { return singleton; }
-	virtual Ref<Random> new_instance() const { return memnew(Random2D); }
+	virtual Ref<Reference> new_instance() const { return memnew(Random2D); }
 
 	real_t get_rotation();
 	Vector2 get_direction(); // Unit vector.

diff --git a/core/math/random.h b/core/math/random.h
@@ -14,7 +14,7 @@ class Random : public RandomNumberGenerator {
 
 public:
 	static Random *get_singleton() { return singleton; }
-	virtual Ref<Random> new_instance() const { return memnew(Random); }
+	virtual Ref<Reference> new_instance() const { return memnew(Random); }
 
 	uint32_t get_number();
 	real_t get_value();

diff --git a/core/types/variant_resource.cpp b/core/types/variant_resource.cpp
@@ -1,8 +1,8 @@
 #include "variant_resource.h"
 
-void VariantResource::set_type(Variant::Type p_type) {
+void VariantResource::set_type(int p_type) {
 	const Variant::Type prev_type = type;
-	type = p_type;
+	type = static_cast<Variant::Type>(p_type);
 	// Convert previous value to a new type, if possible.
 	if (prev_type != Variant::NIL) {
 		value = convert(value, type);

diff --git a/core/types/variant_resource.h b/core/types/variant_resource.h
@@ -18,7 +18,7 @@ class VariantResource : public Resource {
 	PropertyInfo pi;
 
 public:
-	void set_type(Variant::Type p_type);
+	void set_type(int p_type);
 	int get_type() const { return type; }
 
 	void set_value(const Variant &p_value) { set(pi.name, p_value); }

diff --git a/doc/LinkedList.xml b/doc/LinkedList.xml
@@ -212,7 +212,7 @@
 			<return type="void">
 			</return>
 			<description>
-				Sorts the list in alphabetical order if the list contains [String]s. If the list contains nodes with different types of values, these are sorted according to the order of [enum @GlobalScope.Variant.Type].
+				Sorts the list in alphabetical order if the list contains [String]s. If the list contains nodes with different types of values, these are sorted according to the order of type in [Variant].
 			</description>
 		</method>
 		<method name="swap">