1 files changed, 18 insertions, 17 deletions

diff --git a/modules/mono/mono_gd/gd_mono_field.h b/modules/mono/mono_gd/gd_mono_field.h
index a5559df059..4458404a30 100644
--- a/modules/mono/mono_gd/gd_mono_field.h
+++ b/modules/mono/mono_gd/gd_mono_field.h
@@ -31,43 +31,44 @@
 #define GDMONOFIELD_H
 
 #include "gd_mono.h"
+#include "gd_mono_class_member.h"
 #include "gd_mono_header.h"
 
-class GDMonoField {
+class GDMonoField : public GDMonoClassMember {
+
 	GDMonoClass *owner;
 	MonoClassField *mono_field;
 
-	String name;
+	StringName name;
 	ManagedType type;
 
 	bool attrs_fetched;
 	MonoCustomAttrInfo *attributes;
 
 public:
-	_FORCE_INLINE_ String get_name() const { return name; }
-	_FORCE_INLINE_ ManagedType get_type() const { return type; }
+	virtual MemberType get_member_type() { return MEMBER_TYPE_FIELD; }
+
+	virtual StringName get_name() { return name; }
+
+	virtual bool is_static();
+	virtual Visibility get_visibility();
+
+	virtual bool has_attribute(GDMonoClass *p_attr_class);
+	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class);
+	void fetch_attributes();
 
-	_FORCE_INLINE_ MonoClassField *get_raw() const { return mono_field; }
+	_FORCE_INLINE_ ManagedType get_type() const { return type; }
 
 	void set_value_raw(MonoObject *p_object, void *p_ptr);
-	void set_value(MonoObject *p_object, const Variant &p_value);
+	void set_value_from_variant(MonoObject *p_object, const Variant &p_value);
 
-	_FORCE_INLINE_ MonoObject *get_value(MonoObject *p_object) {
-		return mono_field_get_value_object(mono_domain_get(), mono_field, p_object);
-	}
+	_FORCE_INLINE_ MonoObject *get_value(MonoObject *p_object);
 
 	bool get_bool_value(MonoObject *p_object);
 	int get_int_value(MonoObject *p_object);
 	String get_string_value(MonoObject *p_object);
 
-	bool has_attribute(GDMonoClass *p_attr_class);
-	MonoObject *get_attribute(GDMonoClass *p_attr_class);
-	void fetch_attributes();
-
-	bool is_static();
-	GDMono::MemberVisibility get_visibility();
-
-	GDMonoField(MonoClassField *p_raw_field, GDMonoClass *p_owner);
+	GDMonoField(MonoClassField *p_mono_field, GDMonoClass *p_owner);
 	~GDMonoField();
 };