ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

WINTERMUTE: Replace col_templ's getSize with Common::Array::size()

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen
2012-08-31 19:23:41 +02:00
parent 969f4d5947
commit 2fd38f47e0
36 changed files with 420 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/wintermute/base/scriptables/script_stack.cpp
+9 -9
View File
@@ -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);
}
}
}