summaryrefslogtreecommitdiff
path: root/core/variant
diff options
context:
space:
mode:
authorTomasz Chabora <kobewi4e@gmail.com>2020-11-08 21:09:45 +0100
committerTomasz Chabora <kobewi4e@gmail.com>2020-11-08 21:09:45 +0100
commit9f23a94b8adbdae83648080a73f9201c03ba4e0d (patch)
treefb17f582acea54407a31a32ea5d419c9ddef848e /core/variant
parent4206dc6ac95bed86d8f8d040a0e1b73431cdb750 (diff)
Add append_array() method to Array class
Diffstat (limited to 'core/variant')
-rw-r--r--core/variant/array.cpp5
-rw-r--r--core/variant/array.h1
-rw-r--r--core/variant/variant_call.cpp1
3 files changed, 7 insertions, 0 deletions
diff --git a/core/variant/array.cpp b/core/variant/array.cpp
index 64e31189de..f602fdcbc7 100644
--- a/core/variant/array.cpp
+++ b/core/variant/array.cpp
@@ -192,6 +192,11 @@ void Array::push_back(const Variant &p_value) {
_p->array.push_back(p_value);
}
+void Array::append_array(const Array &p_array) {
+ ERR_FAIL_COND(!_p->typed.validate(p_array, "append_array"));
+ _p->array.append_array(p_array._p->array);
+}
+
Error Array::resize(int p_new_size) {
return _p->array.resize(p_new_size);
}
diff --git a/core/variant/array.h b/core/variant/array.h
index b37d600abd..e01ac13168 100644
--- a/core/variant/array.h
+++ b/core/variant/array.h
@@ -68,6 +68,7 @@ public:
void push_back(const Variant &p_value);
_FORCE_INLINE_ void append(const Variant &p_value) { push_back(p_value); } //for python compatibility
+ void append_array(const Array &p_array);
Error resize(int p_new_size);
void insert(int p_pos, const Variant &p_value);
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp
index 37424f5ff9..dd722c2e68 100644
--- a/core/variant/variant_call.cpp
+++ b/core/variant/variant_call.cpp
@@ -1762,6 +1762,7 @@ void register_variant_methods() {
bind_method(Array, push_back, sarray("value"), varray());
bind_method(Array, push_front, sarray("value"), varray());
bind_method(Array, append, sarray("value"), varray());
+ bind_method(Array, append_array, sarray("array"), varray());
bind_method(Array, resize, sarray("size"), varray());
bind_method(Array, insert, sarray("position", "value"), varray());
bind_method(Array, remove, sarray("position"), varray());