godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

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

Browse Source 
Array::insert consistent with Pool*Array::insert
This commit is contained in:
Max Hilbrunner
2021-08-28 21:18:39 +02:00
committed by GitHub
parent 5d2c4faa89 c2d1c1c3ee
commit 04c64b59a1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/variant/array.cpp
View File

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

2
core/variant/array.h
View File

@@ -72,7 +72,7 @@ public:
void append_array(const Array &p_array); void append_array(const Array &p_array);
Error resize(int p_new_size); 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 remove(int p_pos);
void fill(const Variant &p_value); void fill(const Variant &p_value);