aboutsummaryrefslogtreecommitdiff
path: root/core/array.cpp
diff options
context:
space:
mode:
authorRăzvan Cosmin Rădulescu2016-08-27 17:33:45 +0200
committerRăzvan Cosmin Rădulescu2016-09-11 17:37:21 +0200
commit1a7aae7443194f7d6137901af369c843b3911b4f (patch)
treee9ccf4f9a80590d6e27966536770f59fddb76628 /core/array.cpp
parentc40ab446c9bcd5b28a073fea4113794bb701937b (diff)
downloadgodot-1a7aae7443194f7d6137901af369c843b3911b4f.tar.gz
godot-1a7aae7443194f7d6137901af369c843b3911b4f.tar.zst
godot-1a7aae7443194f7d6137901af369c843b3911b4f.zip
Diffstat (limited to 'core/array.cpp')
-rw-r--r--core/array.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/core/array.cpp b/core/array.cpp
index 23792f90f..683a43e3d 100644
--- a/core/array.cpp
+++ b/core/array.cpp
@@ -276,16 +276,26 @@ void Array::push_front(const Variant& p_value) {
_p->array.insert(0,p_value);
}
-void Array::pop_back(){
+Variant Array::pop_back(){
- if (!_p->array.empty())
- _p->array.resize( _p->array.size() -1 );
+ if (!_p->array.empty()) {
+ int n = _p->array.size() - 1;
+ Variant ret = _p->array.get(n);
+ _p->array.resize(n);
+ return ret;
+ }
+ return Variant();
}
-void Array::pop_front(){
- if (!_p->array.empty())
+Variant Array::pop_front(){
+
+ if (!_p->array.empty()) {
+ Variant ret = _p->array.get(0);
_p->array.remove(0);
+ return ret;
+ }
+ return Variant();
}