Merge pull request #1034 from Bromeon/qol/array-set-typed

akien-mga · web-flow · commit f9ccf28374af · 2023-02-09T11:29:45.000+01:00
`array_set_typed()` now called with `GDExtensionVariantType` instead of `uint32_t`
diff --git a/src/variant/packed_arrays.cpp b/src/variant/packed_arrays.cpp
@@ -209,7 +209,8 @@ Variant &Array::operator[](int p_index) {
 }
 
 void Array::set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script) {
-	internal::gde_interface->array_set_typed((GDExtensionTypePtr *)this, p_type, (GDExtensionConstStringNamePtr)&p_class_name, (GDExtensionConstVariantPtr)&p_script);
+	// p_type is not Variant::Type so that header doesn't depend on <variant.hpp>.
+	internal::gde_interface->array_set_typed((GDExtensionTypePtr *)this, (GDExtensionVariantType)p_type, (GDExtensionConstStringNamePtr)&p_class_name, (GDExtensionConstVariantPtr)&p_script);
 }
 
 void Array::_ref(const Array &p_from) const {

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,8 @@ Variant &Array::operator[](int p_index) {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`void Array::set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script) {`
`212`		`- internal::gde_interface->array_set_typed((GDExtensionTypePtr *)this, p_type, (GDExtensionConstStringNamePtr)&p_class_name, (GDExtensionConstVariantPtr)&p_script);`
	`212`	`+ // p_type is not Variant::Type so that header doesn't depend on <variant.hpp>.`
	`213`	`+ internal::gde_interface->array_set_typed((GDExtensionTypePtr *)this, (GDExtensionVariantType)p_type, (GDExtensionConstStringNamePtr)&p_class_name, (GDExtensionConstVariantPtr)&p_script);`
`213`	`214`	`}`
`214`	`215`
`215`	`216`	`void Array::_ref(const Array &p_from) const {`