2
0
Эх сурвалжийг харах

Merge pull request #47406 from mashumafi/master-Array-insert-rc

Array::insert consistent with Pool*Array::insert
Max Hilbrunner 4 жил өмнө
parent
commit
04c64b59a1

+ 3 - 3
core/variant/array.cpp

@@ -203,9 +203,9 @@ Error Array::resize(int p_new_size) {
 	return _p->array.resize(p_new_size);
 }
 
-void Array::insert(int p_pos, const Variant &p_value) {
-	ERR_FAIL_COND(!_p->typed.validate(p_value, "insert"));
-	_p->array.insert(p_pos, p_value);
+Error Array::insert(int p_pos, const Variant &p_value) {
+	ERR_FAIL_COND_V(!_p->typed.validate(p_value, "insert"), ERR_INVALID_PARAMETER);
+	return _p->array.insert(p_pos, p_value);
 }
 
 void Array::fill(const Variant &p_value) {

+ 1 - 1
core/variant/array.h

@@ -72,7 +72,7 @@ public:
 	void append_array(const Array &p_array);
 	Error resize(int p_new_size);
 
-	void insert(int p_pos, const Variant &p_value);
+	Error insert(int p_pos, const Variant &p_value);
 	void remove(int p_pos);
 	void fill(const Variant &p_value);