From 2fd38f47e04430b8684502e625f87a04dd968def Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 31 Aug 2012 18:25:24 +0200 Subject: WINTERMUTE: Replace col_templ's getSize with Common::Array::size() --- engines/wintermute/base/scriptables/script_stack.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/wintermute/base/scriptables/script_stack.cpp') diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 7e81cdaf17..d27748abe6 100644 --- a/engines/wintermute/base/scriptables/script_stack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -44,10 +44,10 @@ ScStack::ScStack(BaseGame *inGame) : BaseClass(inGame) { ScStack::~ScStack() { #if _DEBUG - //_gameRef->LOG(0, "STAT: Stack size: %d, SP=%d", _values.getSize(), _sP); + //_gameRef->LOG(0, "STAT: Stack size: %d, SP=%d", _values.size(), _sP); #endif - for (int i = 0; i < _values.getSize(); i++) { + for (uint32 i = 0; i < _values.size(); i++) { delete _values[i]; } _values.clear(); @@ -69,7 +69,7 @@ ScValue *ScStack::pop() { void ScStack::push(ScValue *val) { _sP++; - if (_sP < _values.getSize()) { + if (_sP < (int32)_values.size()) { _values[_sP]->cleanup(); _values[_sP]->copy(val); } else { @@ -84,7 +84,7 @@ void ScStack::push(ScValue *val) { ScValue *ScStack::getPushValue() { _sP++; - if (_sP >= _values.getSize()) { + if (_sP >= (int32)_values.size()) { ScValue *val = new ScValue(_gameRef); _values.add(val); } @@ -96,7 +96,7 @@ ScValue *ScStack::getPushValue() { ////////////////////////////////////////////////////////////////////////// ScValue *ScStack::getTop() { - if (_sP < 0 || _sP >= _values.getSize()) { + if (_sP < 0 || _sP >= (int32)_values.size()) { return NULL; } else { return _values[_sP]; @@ -107,7 +107,7 @@ ScValue *ScStack::getTop() { ////////////////////////////////////////////////////////////////////////// ScValue *ScStack::getAt(int index) { index = _sP - index; - if (index < 0 || index >= _values.getSize()) { + if (index < 0 || index >= (int32)_values.size()) { return NULL; } else { return _values[index]; @@ -136,9 +136,9 @@ void ScStack::correctParams(uint32 expectedParams) { nuParams++; _sP++; - if (_values.getSize() > _sP + 1) { - delete _values[_values.getSize() - 1]; - _values.remove_at(_values.getSize() - 1); + if ((int32)_values.size() > _sP + 1) { + delete _values[_values.size() - 1]; + _values.remove_at(_values.size() - 1); } } } -- cgit v1.2.3