New grow and skid sounds from remaxim

[supertux.git] / src / squirrel / squirrel / sqarray.h

diff --git a/src/squirrel/squirrel/sqarray.h b/src/squirrel/squirrel/sqarray.h
index 7aadbd7..5c26352 100644 (file)
--- a/src/squirrel/squirrel/sqarray.h
+++ b/src/squirrel/squirrel/sqarray.h
@@ -5,13 +5,13 @@
 struct SQArray : public CHAINABLE_OBJ
 {
 private:
-       SQArray(SQSharedState *ss,int nsize){_values.resize(nsize);_uiRef=0;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);}
+       SQArray(SQSharedState *ss,SQInteger nsize){_values.resize(nsize); INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);}
        ~SQArray()
        {
                REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this);
        }
 public:
-       static SQArray* Create(SQSharedState *ss,int nInitialSize){
+       static SQArray* Create(SQSharedState *ss,SQInteger nInitialSize){
                SQArray *newarray=(SQArray*)SQ_MALLOC(sizeof(SQArray));
                new (newarray) SQArray(ss,nInitialSize);
                return newarray;
@@ -22,29 +22,31 @@ public:
        void Finalize(){
                _values.resize(0);
        }
-       bool Get(const int nidx,SQObjectPtr &val)
+       bool Get(const SQInteger nidx,SQObjectPtr &val)
        {
-               if(nidx>=0 && nidx<(int)_values.size()){
-                       val=_values[nidx];
+               if(nidx>=0 && nidx<(SQInteger)_values.size()){
+                       SQObjectPtr &o = _values[nidx];
+                       val = _realval(o);
                        return true;
                }
                else return false;
        }
-       bool Set(const int nidx,const SQObjectPtr &val)
+       bool Set(const SQInteger nidx,const SQObjectPtr &val)
        {
-               if(nidx>=0 && nidx<(int)_values.size()){
+               if(nidx>=0 && nidx<(SQInteger)_values.size()){
                        _values[nidx]=val;
                        return true;
                }
                else return false;
        }
-       int Next(const SQObjectPtr &refpos,SQObjectPtr &outkey,SQObjectPtr &outval)
+       SQInteger Next(const SQObjectPtr &refpos,SQObjectPtr &outkey,SQObjectPtr &outval)
        {
-               unsigned int idx=TranslateIndex(refpos);
+               SQUnsignedInteger idx=TranslateIndex(refpos);
                while(idx<_values.size()){
                        //first found
                        outkey=(SQInteger)idx;
-                       outval=_values[idx];
+                       SQObjectPtr &o = _values[idx];
+                       outval = _realval(o);
                        //return idx for the next iteration
                        return ++idx;
                }
@@ -52,21 +54,29 @@ public:
                return -1;
        }
        SQArray *Clone(){SQArray *anew=Create(_opt_ss(this),Size()); anew->_values.copy(_values); return anew; }
-       int Size() const {return _values.size();}
-       void Resize(int size,SQObjectPtr &fill = _null_) { _values.resize(size,fill); ShrinkIfNeeded(); }
-       void Reserve(int size) { _values.reserve(size); }
+       SQInteger Size() const {return _values.size();}
+       void Resize(SQInteger size,SQObjectPtr &fill = _null_) { _values.resize(size,fill); ShrinkIfNeeded(); }
+       void Reserve(SQInteger size) { _values.reserve(size); }
        void Append(const SQObject &o){_values.push_back(o);}
        void Extend(const SQArray *a);
        SQObjectPtr &Top(){return _values.top();}
        void Pop(){_values.pop_back(); ShrinkIfNeeded(); }
-       void Insert(const SQObject& idx,const SQObject &val){_values.insert((unsigned int)tointeger(idx),val);}
+       bool Insert(SQInteger idx,const SQObject &val){
+               if(idx < 0 || idx > (SQInteger)_values.size())
+                       return false;
+               _values.insert(idx,val);
+               return true;
+       }
        void ShrinkIfNeeded() {
                if(_values.size() <= _values.capacity()>>2) //shrink the array
                        _values.shrinktofit();
        }
-       void Remove(unsigned int idx){
+       bool Remove(SQInteger idx){
+               if(idx < 0 || idx >= (SQInteger)_values.size())
+                       return false;
                _values.remove(idx);
                ShrinkIfNeeded();
+               return true;
        }
        void Release()
        {