aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/ad
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-08-31 18:25:24 +0200
committerEinar Johan Trøan Sømåen2012-08-31 19:23:41 +0200
commit2fd38f47e04430b8684502e625f87a04dd968def (patch)
treec08bc59102689714bc82de3dde924e5bacd08558 /engines/wintermute/ad
parent969f4d5947b6a36d66c12c510b8fe623e1782bbd (diff)
downloadscummvm-rg350-2fd38f47e04430b8684502e625f87a04dd968def.tar.gz
scummvm-rg350-2fd38f47e04430b8684502e625f87a04dd968def.tar.bz2
scummvm-rg350-2fd38f47e04430b8684502e625f87a04dd968def.zip
WINTERMUTE: Replace col_templ's getSize with Common::Array::size()
Diffstat (limited to 'engines/wintermute/ad')
-rw-r--r--engines/wintermute/ad/ad_actor.cpp26
-rw-r--r--engines/wintermute/ad/ad_entity.cpp4
-rw-r--r--engines/wintermute/ad/ad_game.cpp120
-rw-r--r--engines/wintermute/ad/ad_inventory.cpp6
-rw-r--r--engines/wintermute/ad/ad_inventory_box.cpp6
-rw-r--r--engines/wintermute/ad/ad_layer.cpp22
-rw-r--r--engines/wintermute/ad/ad_object.cpp44
-rw-r--r--engines/wintermute/ad/ad_path.cpp8
-rw-r--r--engines/wintermute/ad/ad_region.cpp7
-rw-r--r--engines/wintermute/ad/ad_response_box.cpp35
-rw-r--r--engines/wintermute/ad/ad_scene.cpp175
-rw-r--r--engines/wintermute/ad/ad_scene_state.cpp4
-rw-r--r--engines/wintermute/ad/ad_sentence.cpp2
-rw-r--r--engines/wintermute/ad/ad_talk_def.cpp4
-rw-r--r--engines/wintermute/ad/ad_talk_holder.cpp24
-rw-r--r--engines/wintermute/ad/ad_waypoint_group.cpp6
16 files changed, 239 insertions, 254 deletions
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index e180499ee0..dd50955b4c 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -98,17 +98,17 @@ AdActor::~AdActor() {
_animSprite2 = NULL; // ref only
- for (int i = 0; i < _talkSprites.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSprites.size(); i++) {
delete _talkSprites[i];
}
_talkSprites.clear();
- for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSpritesEx.size(); i++) {
delete _talkSpritesEx[i];
}
_talkSpritesEx.clear();
- for (int i = 0; i < _anims.getSize(); i++) {
+ for (uint32 i = 0; i < _anims.size(); i++) {
delete _anims[i];
_anims[i] = NULL;
}
@@ -1036,7 +1036,7 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
const char *animName = stack->pop()->getString();
bool found = false;
- for (int i = 0; i < _anims.getSize(); i++) {
+ for (int i = 0; i < _anims.size(); i++) {
if (scumm_stricmp(_anims[i]->getName(), animName) == 0) {
// invalidate sprites in use
if (_anims[i]->containsSprite(_tempSprite2)) {
@@ -1239,7 +1239,7 @@ BaseSprite *AdActor::getTalkStance(const char *stance) {
}
// old way
- if (_talkSprites.getSize() > 0 || _talkSpritesEx.getSize() > 0) {
+ if (_talkSprites.size() > 0 || _talkSpritesEx.size() > 0) {
return getTalkStanceOld(stance);
}
@@ -1255,14 +1255,14 @@ BaseSprite *AdActor::getTalkStance(const char *stance) {
// not - get a random talk
if (!ret) {
BaseArray<AdSpriteSet *> talkAnims;
- for (int i = 0; i < _anims.getSize(); i++) {
+ for (int i = 0; i < _anims.size(); i++) {
if (_talkAnimName.compareToIgnoreCase(_anims[i]->getName()) == 0) {
talkAnims.add(_anims[i]);
}
}
- if (talkAnims.getSize() > 0) {
- int rnd = BaseEngine::instance().randInt(0, talkAnims.getSize() - 1);
+ if (talkAnims.size() > 0) {
+ int rnd = BaseEngine::instance().randInt(0, talkAnims.size() - 1);
ret = talkAnims[rnd]->getSprite(_dir);
} else {
if (_standSprite) {
@@ -1284,7 +1284,7 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) {
if (stance != NULL) {
// search special stances
- for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
+ for (int i = 0; i < _talkSpritesEx.size(); i++) {
if (scumm_stricmp(_talkSpritesEx[i]->getName(), stance) == 0) {
ret = _talkSpritesEx[i]->getSprite(_dir);
break;
@@ -1292,7 +1292,7 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) {
}
if (ret == NULL) {
// search generic stances
- for (int i = 0; i < _talkSprites.getSize(); i++) {
+ for (int i = 0; i < _talkSprites.size(); i++) {
if (scumm_stricmp(_talkSprites[i]->getName(), stance) == 0) {
ret = _talkSprites[i]->getSprite(_dir);
break;
@@ -1303,11 +1303,11 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) {
// not a valid stance? get a random one
if (ret == NULL) {
- if (_talkSprites.getSize() < 1) {
+ if (_talkSprites.size() < 1) {
ret = _standSprite->getSprite(_dir);
} else {
// TODO: remember last
- int rnd = BaseEngine::instance().randInt(0, _talkSprites.getSize() - 1);
+ int rnd = BaseEngine::instance().randInt(0, _talkSprites.size() - 1);
ret = _talkSprites[rnd]->getSprite(_dir);
}
}
@@ -1395,7 +1395,7 @@ int AdActor::getHeight() {
//////////////////////////////////////////////////////////////////////////
AdSpriteSet *AdActor::getAnimByName(const Common::String &animName) {
- for (int i = 0; i < _anims.getSize(); i++) {
+ for (int i = 0; i < _anims.size(); i++) {
if (animName.compareToIgnoreCase(_anims[i]->getName()) == 0) {
return _anims[i];
}
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 5bf03d6062..67a919dd6b 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -993,9 +993,7 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "WALK_TO_DIR=%d\n", (int)_walkToDir);
}
- int i;
-
- for (i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 2971cdab00..f5d865d9f8 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -119,21 +119,19 @@ AdGame::~AdGame() {
//////////////////////////////////////////////////////////////////////////
bool AdGame::cleanup() {
- int i;
-
- for (i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
unregisterObject(_objects[i]);
_objects[i] = NULL;
}
_objects.clear();
- for (i = 0; i < _dlgPendingBranches.getSize(); i++) {
+ for (uint32 i = 0; i < _dlgPendingBranches.size(); i++) {
delete[] _dlgPendingBranches[i];
}
_dlgPendingBranches.clear();
- for (i = 0; i < _speechDirs.getSize(); i++) {
+ for (uint32 i = 0; i < _speechDirs.size(); i++) {
delete[] _speechDirs[i];
}
_speechDirs.clear();
@@ -143,7 +141,7 @@ bool AdGame::cleanup() {
_scene = NULL;
// remove items
- for (i = 0; i < _items.getSize(); i++) {
+ for (uint32 i = 0; i < _items.size(); i++) {
_gameRef->unregisterObject(_items[i]);
}
_items.clear();
@@ -153,7 +151,7 @@ bool AdGame::cleanup() {
delete _invObject;
_invObject = NULL;
- for (i = 0; i < _inventories.getSize(); i++) {
+ for (uint32 i = 0; i < _inventories.size(); i++) {
delete _inventories[i];
}
_inventories.clear();
@@ -184,17 +182,17 @@ bool AdGame::cleanup() {
delete _sceneViewport;
_sceneViewport = NULL;
- for (i = 0; i < _sceneStates.getSize(); i++) {
+ for (uint32 i = 0; i < _sceneStates.size(); i++) {
delete _sceneStates[i];
}
_sceneStates.clear();
- for (i = 0; i < _responsesBranch.getSize(); i++) {
+ for (uint32 i = 0; i < _responsesBranch.size(); i++) {
delete _responsesBranch[i];
}
_responsesBranch.clear();
- for (i = 0; i < _responsesGame.getSize(); i++) {
+ for (uint32 i = 0; i < _responsesGame.size(); i++) {
delete _responsesGame[i];
}
_responsesGame.clear();
@@ -247,7 +245,7 @@ bool AdGame::removeObject(AdObject *object) {
}
}
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i] == object) {
_objects.remove_at(i);
break;
@@ -276,7 +274,7 @@ bool AdGame::changeScene(const char *filename, bool fadeIn) {
if (_scene) {
// reset objects
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
_objects[i]->reset();
}
@@ -296,7 +294,7 @@ bool AdGame::changeScene(const char *filename, bool fadeIn) {
if (DID_SUCCEED(ret)) {
// invalidate references to the original scene
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
_objects[i]->invalidateCurrRegions();
_objects[i]->_stickRegion = NULL;
}
@@ -321,7 +319,7 @@ void AdGame::addSentence(AdSentence *sentence) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::displaySentences(bool frozen) {
- for (int i = 0; i < _sentences.getSize(); i++) {
+ for (uint32 i = 0; i < _sentences.size(); i++) {
if (frozen && _sentences[i]->_freezable) {
continue;
} else {
@@ -334,7 +332,7 @@ bool AdGame::displaySentences(bool frozen) {
//////////////////////////////////////////////////////////////////////////
void AdGame::finishSentences() {
- for (int i = 0; i < _sentences.getSize(); i++) {
+ for (uint32 i = 0; i < _sentences.size(); i++) {
if (_sentences[i]->canSkip()) {
_sentences[i]->_duration = 0;
if (_sentences[i]->_sound) {
@@ -489,7 +487,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
AdItem *item = NULL;
if (val->isInt()) {
int index = val->getInt();
- if (index >= 0 && index < _items.getSize()) {
+ if (index >= 0 && index < (int32)_items.size()) {
item = _items[index];
}
} else {
@@ -585,13 +583,13 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
if (_responseBox) {
_responseBox->weedResponses();
- if (_responseBox->_responses.getSize() == 0) {
+ if (_responseBox->_responses.size() == 0) {
stack->pushNULL();
return STATUS_OK;
}
- if (_responseBox->_responses.getSize() == 1 && autoSelectLast) {
+ if (_responseBox->_responses.size() == 1 && autoSelectLast) {
stack->pushInt(_responseBox->_responses[0]->_iD);
_responseBox->handleResponse(_responseBox->_responses[0]);
_responseBox->clearResponses();
@@ -618,7 +616,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
stack->correctParams(0);
if (_responseBox) {
_responseBox->weedResponses();
- stack->pushInt(_responseBox->_responses.getSize());
+ stack->pushInt(_responseBox->_responses.size());
} else {
script->runtimeError("Game.GetNumResponses: response box is not defined");
stack->pushNULL();
@@ -670,8 +668,8 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
else if (strcmp(name, "GetCurrentDlgBranch") == 0) {
stack->correctParams(0);
- if (_dlgPendingBranches.getSize() > 0) {
- stack->pushString(_dlgPendingBranches[_dlgPendingBranches.getSize() - 1]);
+ if (_dlgPendingBranches.size() > 0) {
+ stack->pushString(_dlgPendingBranches[_dlgPendingBranches.size() - 1]);
} else {
stack->pushNULL();
}
@@ -715,10 +713,10 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
ScValue *val = stack->pop();
if (!val->isNULL()) {
- for (int i = 0; i < _inventories.getSize(); i++) {
+ for (uint32 i = 0; i < _inventories.size(); i++) {
AdInventory *inv = _inventories[i];
- for (int j = 0; j < inv->_takenItems.getSize(); j++) {
+ for (uint32 j = 0; j < inv->_takenItems.size(); j++) {
if (val->getNative() == inv->_takenItems[j]) {
stack->pushBool(true);
return STATUS_OK;
@@ -1021,7 +1019,7 @@ ScValue *AdGame::scGetProperty(const char *name) {
// TotalNumItems
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "TotalNumItems") == 0) {
- _scValue->setInt(_items.getSize());
+ _scValue->setInt(_items.size());
return _scValue;
}
@@ -1071,7 +1069,7 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) {
} else {
if (value->isNative()) {
_selectedItem = NULL;
- for (int i = 0; i < _items.getSize(); i++) {
+ for (uint32 i = 0; i < _items.size(); i++) {
if (_items[i] == value->getNative()) {
_selectedItem = (AdItem *)value->getNative();
break;
@@ -1548,7 +1546,7 @@ bool AdGame::loadItemsBuffer(byte *buffer, bool merge) {
BaseParser parser;
if (!merge) {
- while (_items.getSize() > 0) {
+ while (_items.size() > 0) {
deleteItem(_items[0]);
}
}
@@ -1599,7 +1597,7 @@ AdSceneState *AdGame::getSceneState(const char *filename, bool saving) {
}
}
- for (int i = 0; i < _sceneStates.getSize(); i++) {
+ for (uint32 i = 0; i < _sceneStates.size(); i++) {
if (scumm_stricmp(_sceneStates[i]->_filename, filenameCor) == 0) {
delete[] filenameCor;
return _sceneStates[i];
@@ -1692,8 +1690,8 @@ bool AdGame::startDlgBranch(const char *branchName, const char *scriptName, cons
bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const char *eventName) {
char *name = NULL;
bool deleteName = false;
- if (branchName == NULL && _dlgPendingBranches.getSize() > 0) {
- name = _dlgPendingBranches[_dlgPendingBranches.getSize() - 1];
+ if (branchName == NULL && _dlgPendingBranches.size() > 0) {
+ name = _dlgPendingBranches[_dlgPendingBranches.size() - 1];
} else {
if (branchName != NULL) {
name = new char[strlen(branchName) + 1 + strlen(scriptName) + 1 + strlen(eventName) + 1];
@@ -1710,24 +1708,24 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
int startIndex = -1;
- for (int i = _dlgPendingBranches.getSize() - 1; i >= 0; i--) {
+ for (int i = _dlgPendingBranches.size() - 1; i >= 0; i--) {
if (scumm_stricmp(name, _dlgPendingBranches[i]) == 0) {
startIndex = i;
break;
}
}
if (startIndex >= 0) {
- for (int i = startIndex; i < _dlgPendingBranches.getSize(); i++) {
+ for (uint32 i = startIndex; i < _dlgPendingBranches.size(); i++) {
//ClearBranchResponses(_dlgPendingBranches[i]);
delete[] _dlgPendingBranches[i];
_dlgPendingBranches[i] = NULL;
}
- _dlgPendingBranches.remove_at(startIndex, _dlgPendingBranches.getSize() - startIndex);
+ _dlgPendingBranches.remove_at(startIndex, _dlgPendingBranches.size() - startIndex);
}
// dialogue is over, forget selected responses
- if (_dlgPendingBranches.getSize() == 0) {
- for (int i = 0; i < _responsesBranch.getSize(); i++) {
+ if (_dlgPendingBranches.size() == 0) {
+ for (uint32 i = 0; i < _responsesBranch.size(); i++) {
delete _responsesBranch[i];
}
_responsesBranch.clear();
@@ -1743,7 +1741,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
//////////////////////////////////////////////////////////////////////////
bool AdGame::clearBranchResponses(char *name) {
- for (int i = 0; i < _responsesBranch.getSize(); i++) {
+ for (uint32 i = 0; i < _responsesBranch.size(); i++) {
if (scumm_stricmp(name, _responsesBranch[i]->_context) == 0) {
delete _responsesBranch[i];
_responsesBranch.remove_at(i);
@@ -1761,7 +1759,7 @@ bool AdGame::addBranchResponse(int id) {
}
AdResponseContext *r = new AdResponseContext(_gameRef);
r->_id = id;
- r->setContext(_dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL);
+ r->setContext(_dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL);
_responsesBranch.add(r);
return STATUS_OK;
}
@@ -1769,8 +1767,8 @@ bool AdGame::addBranchResponse(int id) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::branchResponseUsed(int id) {
- char *context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
- for (int i = 0; i < _responsesBranch.getSize(); i++) {
+ char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL;
+ for (uint32 i = 0; i < _responsesBranch.size(); i++) {
if (_responsesBranch[i]->_id == id) {
if ((context == NULL && _responsesBranch[i]->_context == NULL) || scumm_stricmp(context, _responsesBranch[i]->_context) == 0) {
return true;
@@ -1788,7 +1786,7 @@ bool AdGame::addGameResponse(int id) {
}
AdResponseContext *r = new AdResponseContext(_gameRef);
r->_id = id;
- r->setContext(_dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL);
+ r->setContext(_dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL);
_responsesGame.add(r);
return STATUS_OK;
}
@@ -1796,8 +1794,8 @@ bool AdGame::addGameResponse(int id) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::gameResponseUsed(int id) {
- char *context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
- for (int i = 0; i < _responsesGame.getSize(); i++) {
+ char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL;
+ for (uint32 i = 0; i < _responsesGame.size(); i++) {
AdResponseContext *respContext = _responsesGame[i];
if (respContext->_id == id) {
if ((context == NULL && respContext->_context == NULL) || ((context != NULL && respContext->_context != NULL) && scumm_stricmp(context, respContext->_context) == 0)) {
@@ -1811,9 +1809,9 @@ bool AdGame::gameResponseUsed(int id) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::resetResponse(int id) {
- char *context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
+ char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : NULL;
- for (int i = 0; i < _responsesGame.getSize(); i++) {
+ for (uint32 i = 0; i < _responsesGame.size(); i++) {
if (_responsesGame[i]->_id == id) {
if ((context == NULL && _responsesGame[i]->_context == NULL) || scumm_stricmp(context, _responsesGame[i]->_context) == 0) {
delete _responsesGame[i];
@@ -1823,7 +1821,7 @@ bool AdGame::resetResponse(int id) {
}
}
- for (int i = 0; i < _responsesBranch.getSize(); i++) {
+ for (uint32 i = 0; i < _responsesBranch.size(); i++) {
if (_responsesBranch[i]->_id == id) {
if ((context == NULL && _responsesBranch[i]->_context == NULL) || scumm_stricmp(context, _responsesBranch[i]->_context) == 0) {
delete _responsesBranch[i];
@@ -1922,7 +1920,7 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::registerInventory(AdInventory *inv) {
- for (int i = 0; i < _inventories.getSize(); i++) {
+ for (uint32 i = 0; i < _inventories.size(); i++) {
if (_inventories[i] == inv) {
return STATUS_OK;
}
@@ -1935,7 +1933,7 @@ bool AdGame::registerInventory(AdInventory *inv) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::unregisterInventory(AdInventory *inv) {
- for (int i = 0; i < _inventories.getSize(); i++) {
+ for (uint32 i = 0; i < _inventories.size(); i++) {
if (_inventories[i] == inv) {
unregisterObject(_inventories[i]);
_inventories.remove_at(i);
@@ -1947,11 +1945,11 @@ bool AdGame::unregisterInventory(AdInventory *inv) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::isItemTaken(char *itemName) {
- for (int i = 0; i < _inventories.getSize(); i++) {
- AdInventory *Inv = _inventories[i];
+ for (uint32 i = 0; i < _inventories.size(); i++) {
+ AdInventory *inv = _inventories[i];
- for (int j = 0; j < Inv->_takenItems.getSize(); j++) {
- if (scumm_stricmp(itemName, Inv->_takenItems[j]->getName()) == 0) {
+ for (uint32 j = 0; j < inv->_takenItems.size(); j++) {
+ if (scumm_stricmp(itemName, inv->_takenItems[j]->getName()) == 0) {
return true;
}
}
@@ -1961,7 +1959,7 @@ bool AdGame::isItemTaken(char *itemName) {
//////////////////////////////////////////////////////////////////////////
AdItem *AdGame::getItemByName(const char *name) {
- for (int i = 0; i < _items.getSize(); i++) {
+ for (uint32 i = 0; i < _items.size(); i++) {
if (scumm_stricmp(_items[i]->getName(), name) == 0) {
return _items[i];
}
@@ -1980,31 +1978,31 @@ bool AdGame::addItem(AdItem *item) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::resetContent() {
// clear pending dialogs
- for (int i = 0; i < _dlgPendingBranches.getSize(); i++) {
+ for (uint32 i = 0; i < _dlgPendingBranches.size(); i++) {
delete[] _dlgPendingBranches[i];
}
_dlgPendingBranches.clear();
// clear inventories
- for (int i = 0; i < _inventories.getSize(); i++) {
+ for (uint32 i = 0; i < _inventories.size(); i++) {
_inventories[i]->_takenItems.clear();
}
// clear scene states
- for (int i = 0; i < _sceneStates.getSize(); i++) {
+ for (uint32 i = 0; i < _sceneStates.size(); i++) {
delete _sceneStates[i];
}
_sceneStates.clear();
// clear once responses
- for (int i = 0; i < _responsesBranch.getSize(); i++) {
+ for (uint32 i = 0; i < _responsesBranch.size(); i++) {
delete _responsesBranch[i];
}
_responsesBranch.clear();
// clear once game responses
- for (int i = 0; i < _responsesGame.getSize(); i++) {
+ for (uint32 i = 0; i < _responsesGame.size(); i++) {
delete _responsesGame[i];
}
_responsesGame.clear();
@@ -2032,12 +2030,12 @@ bool AdGame::deleteItem(AdItem *item) {
_scene->handleItemAssociations(item->getName(), false);
// remove from all inventories
- for (int i = 0; i < _inventories.getSize(); i++) {
+ for (uint32 i = 0; i < _inventories.size(); i++) {
_inventories[i]->removeItem(item);
}
// remove object
- for (int i = 0; i < _items.getSize(); i++) {
+ for (uint32 i = 0; i < _items.size(); i++) {
if (_items[i] == item) {
unregisterObject(_items[i]);
_items.remove_at(i);
@@ -2061,7 +2059,7 @@ bool AdGame::addSpeechDir(const char *dir) {
strcat(temp, "\\");
}
- for (int i = 0; i < _speechDirs.getSize(); i++) {
+ for (uint32 i = 0; i < _speechDirs.size(); i++) {
if (scumm_stricmp(_speechDirs[i], temp) == 0) {
delete[] temp;
return STATUS_OK;
@@ -2086,7 +2084,7 @@ bool AdGame::removeSpeechDir(const char *dir) {
}
bool found = false;
- for (int i = 0; i < _speechDirs.getSize(); i++) {
+ for (uint32 i = 0; i < _speechDirs.size(); i++) {
if (scumm_stricmp(_speechDirs[i], temp) == 0) {
delete[] _speechDirs[i];
_speechDirs.remove_at(i);
@@ -2104,7 +2102,7 @@ bool AdGame::removeSpeechDir(const char *dir) {
char *AdGame::findSpeechFile(char *stringID) {
char *ret = new char[MAX_PATH_LENGTH];
- for (int i = 0; i < _speechDirs.getSize(); i++) {
+ for (uint32 i = 0; i < _speechDirs.size(); i++) {
sprintf(ret, "%s%s.ogg", _speechDirs[i], stringID);
if (BaseFileManager::getEngineInstance()->hasFile(ret)) {
return ret;
diff --git a/engines/wintermute/ad/ad_inventory.cpp b/engines/wintermute/ad/ad_inventory.cpp
index 282c37449b..44b2dc0508 100644
--- a/engines/wintermute/ad/ad_inventory.cpp
+++ b/engines/wintermute/ad/ad_inventory.cpp
@@ -60,7 +60,7 @@ bool AdInventory::insertItem(const char *name, const char *insertAfter) {
}
int insertIndex = -1;
- for (int i = 0; i < _takenItems.getSize(); i++) {
+ for (uint32 i = 0; i < _takenItems.size(); i++) {
if (scumm_stricmp(_takenItems[i]->getName(), name) == 0) {
_takenItems.remove_at(i);
i--;
@@ -88,7 +88,7 @@ bool AdInventory::removeItem(const char *name) {
return STATUS_FAILED;
}
- for (int i = 0; i < _takenItems.getSize(); i++) {
+ for (uint32 i = 0; i < _takenItems.size(); i++) {
if (scumm_stricmp(_takenItems[i]->getName(), name) == 0) {
if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i]) {
((AdGame *)_gameRef)->_selectedItem = NULL;
@@ -109,7 +109,7 @@ bool AdInventory::removeItem(AdItem *item) {
return STATUS_FAILED;
}
- for (int i = 0; i < _takenItems.getSize(); i++) {
+ for (uint32 i = 0; i < _takenItems.size(); i++) {
if (_takenItems[i] == item) {
if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i]) {
((AdGame *)_gameRef)->_selectedItem = NULL;
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index fd49860a5c..ad679007df 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -113,7 +113,7 @@ bool AdInventoryBox::display() {
if (_window) {
_window->enableWidget("prev", _scrollOffset > 0);
- _window->enableWidget("next", _scrollOffset + itemsX * itemsY < adGame->_inventoryOwner->getInventory()->_takenItems.getSize());
+ _window->enableWidget("next", _scrollOffset + itemsX * itemsY < (int32)adGame->_inventoryOwner->getInventory()->_takenItems.size());
}
@@ -142,7 +142,7 @@ bool AdInventoryBox::display() {
int xxx = rect.left;
for (int i = 0; i < itemsX; i++) {
int itemIndex = _scrollOffset + j * itemsX + i;
- if (itemIndex >= 0 && itemIndex < adGame->_inventoryOwner->getInventory()->_takenItems.getSize()) {
+ if (itemIndex >= 0 && itemIndex < (int32)adGame->_inventoryOwner->getInventory()->_takenItems.size()) {
AdItem *item = adGame->_inventoryOwner->getInventory()->_takenItems[itemIndex];
if (item != ((AdGame *)_gameRef)->_selectedItem || !_hideSelected) {
item->update();
@@ -321,7 +321,7 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) {
_visible = alwaysVisible;
if (_window) {
- for (int i = 0; i < _window->_widgets.getSize(); i++) {
+ for (uint32 i = 0; i < _window->_widgets.size(); i++) {
if (!_window->_widgets[i]->_listenerObject) {
_window->_widgets[i]->setListener(this, _window->_widgets[i], 0);
}
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 2cec37bec1..709ab50b58 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -53,7 +53,7 @@ AdLayer::AdLayer(BaseGame *inGame) : BaseObject(inGame) {
//////////////////////////////////////////////////////////////////////////
AdLayer::~AdLayer() {
- for (int i = 0; i < _nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _nodes.size(); i++) {
delete _nodes[i];
}
_nodes.clear();
@@ -243,7 +243,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
if (val->_type == VAL_INT) {
node = val->getInt();
} else { // get by name
- for (int i = 0; i < _nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _nodes.size(); i++) {
if ((_nodes[i]->_type == OBJECT_ENTITY && scumm_stricmp(_nodes[i]->_entity->getName(), val->getString()) == 0) ||
(_nodes[i]->_type == OBJECT_REGION && scumm_stricmp(_nodes[i]->_region->getName(), val->getString()) == 0)) {
node = i;
@@ -252,7 +252,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
}
}
- if (node < 0 || node >= _nodes.getSize()) {
+ if (node < 0 || node >= (int32)_nodes.size()) {
stack->pushNULL();
} else {
switch (_nodes[node]->_type) {
@@ -323,7 +323,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
if (index < 0) {
index = 0;
}
- if (index <= _nodes.getSize() - 1) {
+ if (index <= (int32)_nodes.size() - 1) {
_nodes.insert_at(index, node);
} else {
_nodes.add(node);
@@ -342,7 +342,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
AdSceneNode *toDelete = NULL;
if (val->isNative()) {
BaseScriptable *temp = val->getNative();
- for (int i = 0; i < _nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _nodes.size(); i++) {
if (_nodes[i]->_region == temp || _nodes[i]->_entity == temp) {
toDelete = _nodes[i];
break;
@@ -350,7 +350,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
}
} else {
int index = val->getInt();
- if (index >= 0 && index < _nodes.getSize()) {
+ if (index >= 0 && index < (int32)_nodes.size()) {
toDelete = _nodes[index];
}
}
@@ -359,7 +359,7 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
return STATUS_OK;
}
- for (int i = 0; i < _nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _nodes.size(); i++) {
if (_nodes[i] == toDelete) {
delete _nodes[i];
_nodes[i] = NULL;
@@ -391,7 +391,7 @@ ScValue *AdLayer::scGetProperty(const char *name) {
// NumNodes (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumNodes") == 0) {
- _scValue->setInt(_nodes.getSize());
+ _scValue->setInt(_nodes.size());
return _scValue;
}
@@ -516,9 +516,7 @@ bool AdLayer::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "CLOSE_UP=%s\n", _closeUp ? "TRUE" : "FALSE");
}
- int i;
-
- for (i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
@@ -526,7 +524,7 @@ bool AdLayer::saveAsText(BaseDynamicBuffer *buffer, int indent) {
_scProp->saveAsText(buffer, indent + 2);
}
- for (i = 0; i < _nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _nodes.size(); i++) {
switch (_nodes[i]->_type) {
case OBJECT_ENTITY:
_nodes[i]->_entity->saveAsText(buffer, indent + 2);
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 59781087a3..a02decebdb 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -143,12 +143,12 @@ AdObject::~AdObject() {
}
- for (int i = 0; i < _attachmentsPre.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPre.size(); i++) {
_gameRef->unregisterObject(_attachmentsPre[i]);
}
_attachmentsPre.clear();
- for (int i = 0; i < _attachmentsPost.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPost.size(); i++) {
_gameRef->unregisterObject(_attachmentsPost[i]);
}
_attachmentsPost.clear();
@@ -305,14 +305,14 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
AdLayer *main = ((AdGame *)_gameRef)->_scene->_mainLayer;
bool regFound = false;
- int i;
+ uint32 i;
ScValue *val = stack->pop();
if (val->isNULL() || !main) {
_stickRegion = NULL;
regFound = true;
} else if (val->isString()) {
const char *regionName = val->getString();
- for (i = 0; i < main->_nodes.getSize(); i++) {
+ for (i = 0; i < main->_nodes.size(); i++) {
if (main->_nodes[i]->_type == OBJECT_REGION && main->_nodes[i]->_region->getName() && scumm_stricmp(main->_nodes[i]->_region->getName(), regionName) == 0) {
_stickRegion = main->_nodes[i]->_region;
regFound = true;
@@ -322,7 +322,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
} else if (val->isNative()) {
BaseScriptable *obj = val->getNative();
- for (i = 0; i < main->_nodes.getSize(); i++) {
+ for (i = 0; i < main->_nodes.size(); i++) {
if (main->_nodes[i]->_type == OBJECT_REGION && main->_nodes[i]->_region == obj) {
_stickRegion = main->_nodes[i]->_region;
regFound = true;
@@ -446,7 +446,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
} else {
stack->pushNULL();
}
- } else if (val->isNULL() || val->getInt() < 0 || val->getInt() >= _inventory->_takenItems.getSize()) {
+ } else if (val->isNULL() || val->getInt() < 0 || val->getInt() >= (int32)_inventory->_takenItems.size()) {
stack->pushNULL();
} else {
stack->pushNative(_inventory->_takenItems[val->getInt()], true);
@@ -468,7 +468,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
ScValue *val = stack->pop();
if (!val->isNULL()) {
- for (int i = 0; i < _inventory->_takenItems.getSize(); i++) {
+ for (uint32 i = 0; i < _inventory->_takenItems.size(); i++) {
if (val->getNative() == _inventory->_takenItems[i]) {
stack->pushBool(true);
return STATUS_OK;
@@ -563,7 +563,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
bool found = false;
if (val->isNative()) {
BaseScriptable *obj = val->getNative();
- for (int i = 0; i < _attachmentsPre.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPre.size(); i++) {
if (_attachmentsPre[i] == obj) {
found = true;
_gameRef->unregisterObject(_attachmentsPre[i]);
@@ -571,7 +571,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
i--;
}
}
- for (int i = 0; i < _attachmentsPost.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPost.size(); i++) {
if (_attachmentsPost[i] == obj) {
found = true;
_gameRef->unregisterObject(_attachmentsPost[i]);
@@ -581,7 +581,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
}
} else {
const char *attachmentName = val->getString();
- for (int i = 0; i < _attachmentsPre.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPre.size(); i++) {
if (_attachmentsPre[i]->getName() && scumm_stricmp(_attachmentsPre[i]->getName(), attachmentName) == 0) {
found = true;
_gameRef->unregisterObject(_attachmentsPre[i]);
@@ -589,7 +589,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
i--;
}
}
- for (int i = 0; i < _attachmentsPost.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPost.size(); i++) {
if (_attachmentsPost[i]->getName() && scumm_stricmp(_attachmentsPost[i]->getName(), attachmentName) == 0) {
found = true;
_gameRef->unregisterObject(_attachmentsPost[i]);
@@ -614,13 +614,13 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
if (val->isInt()) {
int index = val->getInt();
int currIndex = 0;
- for (int i = 0; i < _attachmentsPre.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPre.size(); i++) {
if (currIndex == index) {
ret = _attachmentsPre[i];
}
currIndex++;
}
- for (int i = 0; i < _attachmentsPost.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPost.size(); i++) {
if (currIndex == index) {
ret = _attachmentsPost[i];
}
@@ -628,14 +628,14 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
}
} else {
const char *attachmentName = val->getString();
- for (int i = 0; i < _attachmentsPre.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPre.size(); i++) {
if (_attachmentsPre[i]->getName() && scumm_stricmp(_attachmentsPre[i]->getName(), attachmentName) == 0) {
ret = _attachmentsPre[i];
break;
}
}
if (!ret) {
- for (int i = 0; i < _attachmentsPost.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPost.size(); i++) {
if (_attachmentsPost[i]->getName() && scumm_stricmp(_attachmentsPost[i]->getName(), attachmentName) == 0) {
ret = _attachmentsPre[i];
break;
@@ -737,7 +737,7 @@ ScValue *AdObject::scGetProperty(const char *name) {
// NumItems (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumItems") == 0) {
- _scValue->setInt(getInventory()->_takenItems.getSize());
+ _scValue->setInt(getInventory()->_takenItems.size());
return _scValue;
}
@@ -758,7 +758,7 @@ ScValue *AdObject::scGetProperty(const char *name) {
// NumAttachments (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumAttachments") == 0) {
- _scValue->setInt(_attachmentsPre.getSize() + _attachmentsPost.getSize());
+ _scValue->setInt(_attachmentsPre.size() + _attachmentsPost.size());
return _scValue;
} else {
return BaseObject::scGetProperty(name);
@@ -865,7 +865,7 @@ int AdObject::getHeight() {
} else {
BaseFrame *frame = _currentSprite->_frames[_currentSprite->_currentFrame];
int ret = 0;
- for (int i = 0; i < frame->_subframes.getSize(); i++) {
+ for (uint32 i = 0; i < frame->_subframes.size(); i++) {
ret = MAX(ret, frame->_subframes[i]->_hotspotY);
}
@@ -1201,10 +1201,10 @@ bool AdObject::getScale(float *scaleX, float *scaleY) {
//////////////////////////////////////////////////////////////////////////
bool AdObject::updateSpriteAttachments() {
- for (int i = 0; i < _attachmentsPre.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPre.size(); i++) {
_attachmentsPre[i]->update();
}
- for (int i = 0; i < _attachmentsPost.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPost.size(); i++) {
_attachmentsPost[i]->update();
}
return STATUS_OK;
@@ -1213,11 +1213,11 @@ bool AdObject::updateSpriteAttachments() {
//////////////////////////////////////////////////////////////////////////
bool AdObject::displaySpriteAttachments(bool preDisplay) {
if (preDisplay) {
- for (int i = 0; i < _attachmentsPre.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPre.size(); i++) {
displaySpriteAttachment(_attachmentsPre[i]);
}
} else {
- for (int i = 0; i < _attachmentsPost.getSize(); i++) {
+ for (uint32 i = 0; i < _attachmentsPost.size(); i++) {
displaySpriteAttachment(_attachmentsPost[i]);
}
}
diff --git a/engines/wintermute/ad/ad_path.cpp b/engines/wintermute/ad/ad_path.cpp
index 0c0ec63e0f..21b68f4d48 100644
--- a/engines/wintermute/ad/ad_path.cpp
+++ b/engines/wintermute/ad/ad_path.cpp
@@ -48,7 +48,7 @@ AdPath::~AdPath() {
//////////////////////////////////////////////////////////////////////////
void AdPath::reset() {
- for (int i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
delete _points[i];
}
@@ -60,7 +60,7 @@ void AdPath::reset() {
//////////////////////////////////////////////////////////////////////////
BasePoint *AdPath::getFirst() {
- if (_points.getSize() > 0) {
+ if (_points.size() > 0) {
_currIndex = 0;
return _points[_currIndex];
} else {
@@ -72,7 +72,7 @@ BasePoint *AdPath::getFirst() {
//////////////////////////////////////////////////////////////////////////
BasePoint *AdPath::getNext() {
_currIndex++;
- if (_currIndex < _points.getSize()) {
+ if (_currIndex < (int32)_points.size()) {
return _points[_currIndex];
} else {
return NULL;
@@ -82,7 +82,7 @@ BasePoint *AdPath::getNext() {
//////////////////////////////////////////////////////////////////////////
BasePoint *AdPath::getCurrent() {
- if (_currIndex >= 0 && _currIndex < _points.getSize()) {
+ if (_currIndex >= 0 && _currIndex < (int32)_points.size()) {
return _points[_currIndex];
} else {
return NULL;
diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index 3b9d4fadda..3e5f91524d 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -128,7 +128,7 @@ bool AdRegion::loadBuffer(byte *buffer, bool complete) {
buffer = params;
}
- for (int i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
delete _points[i];
}
_points.clear();
@@ -362,8 +362,7 @@ bool AdRegion::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "ALPHA = %d\n", RGBCOLGetA(_alpha));
buffer->putTextIndent(indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
- int i;
- for (i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
@@ -371,7 +370,7 @@ bool AdRegion::saveAsText(BaseDynamicBuffer *buffer, int indent) {
_scProp->saveAsText(buffer, indent + 2);
}
- for (i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
buffer->putTextIndent(indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
}
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index d467509612..76510e2f3e 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -98,7 +98,7 @@ AdResponseBox::~AdResponseBox() {
//////////////////////////////////////////////////////////////////////////
void AdResponseBox::clearResponses() {
- for (int i = 0; i < _responses.getSize(); i++) {
+ for (uint32 i = 0; i < _responses.size(); i++) {
delete _responses[i];
}
_responses.clear();
@@ -107,7 +107,7 @@ void AdResponseBox::clearResponses() {
//////////////////////////////////////////////////////////////////////////
void AdResponseBox::clearButtons() {
- for (int i = 0; i < _respButtons.getSize(); i++) {
+ for (uint32 i = 0; i < _respButtons.size(); i++) {
delete _respButtons[i];
}
_respButtons.clear();
@@ -116,7 +116,7 @@ void AdResponseBox::clearButtons() {
//////////////////////////////////////////////////////////////////////////
bool AdResponseBox::invalidateButtons() {
- for (int i = 0; i < _respButtons.getSize(); i++) {
+ for (uint32 i = 0; i < _respButtons.size(); i++) {
_respButtons[i]->_image = NULL;
_respButtons[i]->_cursor = NULL;
_respButtons[i]->_font = NULL;
@@ -133,7 +133,7 @@ bool AdResponseBox::createButtons() {
clearButtons();
_scrollOffset = 0;
- for (int i = 0; i < _responses.getSize(); i++) {
+ for (uint32 i = 0; i < _responses.size(); i++) {
UIButton *btn = new UIButton(_gameRef);
if (btn) {
btn->_parent = _window;
@@ -363,7 +363,7 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) {
}
if (_window) {
- for (int i = 0; i < _window->_widgets.getSize(); i++) {
+ for (uint32 i = 0; i < _window->_widgets.size(); i++) {
if (!_window->_widgets[i]->_listenerObject) {
_window->_widgets[i]->setListener(this, _window->_widgets[i], 0);
}
@@ -447,7 +447,8 @@ bool AdResponseBox::display() {
//_window->display();
}
- int xxx, yyy, i;
+ int xxx, yyy;
+ uint32 i;
xxx = rect.left;
yyy = rect.top;
@@ -455,7 +456,7 @@ bool AdResponseBox::display() {
// shift down if needed
if (!_horizontal) {
int totalHeight = 0;
- for (i = 0; i < _respButtons.getSize(); i++) {
+ for (i = 0; i < _respButtons.size(); i++) {
totalHeight += (_respButtons[i]->_height + _spacing);
}
totalHeight -= _spacing;
@@ -481,7 +482,7 @@ bool AdResponseBox::display() {
// prepare response buttons
bool scrollNeeded = false;
- for (i = _scrollOffset; i < _respButtons.getSize(); i++) {
+ for (i = _scrollOffset; i < _respButtons.size(); i++) {
if ((_horizontal && xxx + _respButtons[i]->_width > rect.right)
|| (!_horizontal && yyy + _respButtons[i]->_height > rect.bottom)) {
@@ -523,7 +524,7 @@ bool AdResponseBox::display() {
// display response buttons
- for (i = _scrollOffset; i < _respButtons.getSize(); i++) {
+ for (i = _scrollOffset; i < _respButtons.size(); i++) {
_respButtons[i]->display();
}
@@ -593,7 +594,7 @@ bool AdResponseBox::persist(BasePersistenceManager *persistMgr) {
bool AdResponseBox::weedResponses() {
AdGame *adGame = (AdGame *)_gameRef;
- for (int i = 0; i < _responses.getSize(); i++) {
+ for (uint32 i = 0; i < _responses.size(); i++) {
switch (_responses[i]->_responseType) {
case RESPONSE_ONCE:
if (adGame->branchResponseUsed(_responses[i]->_iD)) {
@@ -653,13 +654,13 @@ BaseObject *AdResponseBox::getNextAccessObject(BaseObject *currObject) {
BaseArray<UIObject *> objects;
getObjects(objects, true);
- if (objects.getSize() == 0) {
+ if (objects.size() == 0) {
return NULL;
} else {
if (currObject != NULL) {
- for (int i = 0; i < objects.getSize(); i++) {
+ for (uint32 i = 0; i < objects.size(); i++) {
if (objects[i] == currObject) {
- if (i < objects.getSize() - 1) {
+ if (i < objects.size() - 1) {
return objects[i + 1];
} else {
break;
@@ -677,11 +678,11 @@ BaseObject *AdResponseBox::getPrevAccessObject(BaseObject *currObject) {
BaseArray<UIObject *> objects;
getObjects(objects, true);
- if (objects.getSize() == 0) {
+ if (objects.size() == 0) {
return NULL;
} else {
if (currObject != NULL) {
- for (int i = objects.getSize() - 1; i >= 0; i--) {
+ for (int i = objects.size() - 1; i >= 0; i--) {
if (objects[i] == currObject) {
if (i > 0) {
return objects[i - 1];
@@ -691,14 +692,14 @@ BaseObject *AdResponseBox::getPrevAccessObject(BaseObject *currObject) {
}
}
}
- return objects[objects.getSize() - 1];
+ return objects[objects.size() - 1];
}
return NULL;
}
//////////////////////////////////////////////////////////////////////////
bool AdResponseBox::getObjects(BaseArray<UIObject *> &objects, bool interactiveOnly) {
- for (int i = 0; i < _respButtons.getSize(); i++) {
+ for (uint32 i = 0; i < _respButtons.size(); i++) {
objects.add(_respButtons[i]);
}
if (_window) {
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index b04f48f1fc..176604b75f 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -141,43 +141,41 @@ void AdScene::cleanup() {
_mainLayer = NULL; // reference only
- int i;
-
delete _shieldWindow;
_shieldWindow = NULL;
_gameRef->unregisterObject(_fader);
_fader = NULL;
- for (i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
_gameRef->unregisterObject(_layers[i]);
}
_layers.clear();
- for (i = 0; i < _waypointGroups.getSize(); i++) {
+ for (uint32 i = 0; i < _waypointGroups.size(); i++) {
_gameRef->unregisterObject(_waypointGroups[i]);
}
_waypointGroups.clear();
- for (i = 0; i < _scaleLevels.getSize(); i++) {
+ for (uint32 i = 0; i < _scaleLevels.size(); i++) {
_gameRef->unregisterObject(_scaleLevels[i]);
}
_scaleLevels.clear();
- for (i = 0; i < _rotLevels.getSize(); i++) {
+ for (uint32 i = 0; i < _rotLevels.size(); i++) {
_gameRef->unregisterObject(_rotLevels[i]);
}
_rotLevels.clear();
- for (i = 0; i < _pfPath.getSize(); i++) {
+ for (uint32 i = 0; i < _pfPath.size(); i++) {
delete _pfPath[i];
}
_pfPath.clear();
_pfPointsNum = 0;
- for (i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
_gameRef->unregisterObject(_objects[i]);
}
_objects.clear();
@@ -203,7 +201,6 @@ bool AdScene::getPath(BasePoint source, BasePoint target, AdPath *path, BaseObje
_pfTargetPath->setReady(false);
// prepare working path
- int i;
pfPointsStart();
// first point
@@ -239,7 +236,7 @@ bool AdScene::getPath(BasePoint source, BasePoint target, AdPath *path, BaseObje
pfPointsAdd(target.x, target.y, INT_MAX);
// active waypoints
- for (i = 0; i < _waypointGroups.getSize(); i++) {
+ for (uint32 i = 0; i < _waypointGroups.size(); i++) {
if (_waypointGroups[i]->_active) {
pfAddWaypointGroup(_waypointGroups[i], requester);
}
@@ -247,13 +244,13 @@ bool AdScene::getPath(BasePoint source, BasePoint target, AdPath *path, BaseObje
// free waypoints
- for (i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentWptGroup) {
pfAddWaypointGroup(_objects[i]->_currentWptGroup, requester);
}
}
AdGame *adGame = (AdGame *)_gameRef;
- for (i = 0; i < adGame->_objects.getSize(); i++) {
+ for (uint32 i = 0; i < adGame->_objects.size(); i++) {
if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentWptGroup) {
pfAddWaypointGroup(adGame->_objects[i]->_currentWptGroup, requester);
}
@@ -270,7 +267,7 @@ void AdScene::pfAddWaypointGroup(AdWaypointGroup *wpt, BaseObject *requester) {
return;
}
- for (int i = 0; i < wpt->_points.getSize(); i++) {
+ for (uint32 i = 0; i < wpt->_points.size(); i++) {
if (isBlockedAt(wpt->_points[i]->x, wpt->_points[i]->y, true, requester)) {
continue;
}
@@ -287,7 +284,7 @@ float AdScene::getZoomAt(int x, int y) {
bool found = false;
if (_mainLayer) {
- for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
+ for (int i = _mainLayer->_nodes.size() - 1; i >= 0; i--) {
AdSceneNode *node = _mainLayer->_nodes[i];
if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_blocked && node->_region->pointInRegion(x, y)) {
if (node->_region->_zoom != 0) {
@@ -320,7 +317,7 @@ uint32 AdScene::getAlphaAt(int x, int y, bool colorCheck) {
}
if (_mainLayer) {
- for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
+ for (int i = _mainLayer->_nodes.size() - 1; i >= 0; i--) {
AdSceneNode *node = _mainLayer->_nodes[i];
if (node->_type == OBJECT_REGION && node->_region->_active && (colorCheck || !node->_region->_blocked) && node->_region->pointInRegion(x, y)) {
if (!node->_region->_blocked) {
@@ -338,9 +335,8 @@ uint32 AdScene::getAlphaAt(int x, int y, bool colorCheck) {
bool AdScene::isBlockedAt(int x, int y, bool checkFreeObjects, BaseObject *requester) {
bool ret = true;
-
if (checkFreeObjects) {
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentBlockRegion) {
if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
return true;
@@ -348,7 +344,7 @@ bool AdScene::isBlockedAt(int x, int y, bool checkFreeObjects, BaseObject *reque
}
}
AdGame *adGame = (AdGame *)_gameRef;
- for (int i = 0; i < adGame->_objects.getSize(); i++) {
+ for (uint32 i = 0; i < adGame->_objects.size(); i++) {
if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentBlockRegion) {
if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
return true;
@@ -359,7 +355,7 @@ bool AdScene::isBlockedAt(int x, int y, bool checkFreeObjects, BaseObject *reque
if (_mainLayer) {
- for (int i = 0; i < _mainLayer->_nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _mainLayer->_nodes.size(); i++) {
AdSceneNode *node = _mainLayer->_nodes[i];
/*
if (Node->_type == OBJECT_REGION && Node->_region->_active && Node->_region->_blocked && Node->_region->PointInRegion(X, Y))
@@ -387,7 +383,7 @@ bool AdScene::isWalkableAt(int x, int y, bool checkFreeObjects, BaseObject *requ
bool ret = false;
if (checkFreeObjects) {
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentBlockRegion) {
if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
return false;
@@ -395,7 +391,7 @@ bool AdScene::isWalkableAt(int x, int y, bool checkFreeObjects, BaseObject *requ
}
}
AdGame *adGame = (AdGame *)_gameRef;
- for (int i = 0; i < adGame->_objects.getSize(); i++) {
+ for (uint32 i = 0; i < adGame->_objects.size(); i++) {
if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentBlockRegion) {
if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
return false;
@@ -406,7 +402,7 @@ bool AdScene::isWalkableAt(int x, int y, bool checkFreeObjects, BaseObject *requ
if (_mainLayer) {
- for (int i = 0; i < _mainLayer->_nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _mainLayer->_nodes.size(); i++) {
AdSceneNode *node = _mainLayer->_nodes[i];
if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_decoration && node->_region->pointInRegion(x, y)) {
if (node->_region->_blocked) {
@@ -907,7 +903,6 @@ bool AdScene::traverseNodes(bool doUpdate) {
return STATUS_OK;
}
- int j, k;
AdGame *adGame = (AdGame *)_gameRef;
@@ -995,7 +990,7 @@ bool AdScene::traverseNodes(bool doUpdate) {
/* int mainOffsetX = 0; */
/* int mainOffsetY = 0; */
- for (j = 0; j < _layers.getSize(); j++) {
+ for (uint32 j = 0; j < _layers.size(); j++) {
if (!_layers[j]->_active) {
continue;
}
@@ -1033,7 +1028,7 @@ bool AdScene::traverseNodes(bool doUpdate) {
// for each node
- for (k = 0; k < _layers[j]->_nodes.getSize(); k++) {
+ for (uint32 k = 0; k < _layers[j]->_nodes.size(); k++) {
AdSceneNode *node = _layers[j]->_nodes[k];
switch (node->_type) {
case OBJECT_ENTITY:
@@ -1112,7 +1107,7 @@ bool AdScene::updateFreeObjects() {
// *** update all active objects
// is3DSet = false;
- for (int i = 0; i < adGame->_objects.getSize(); i++) {
+ for (uint32 i = 0; i < adGame->_objects.size(); i++) {
if (!adGame->_objects[i]->_active) {
continue;
}
@@ -1122,7 +1117,7 @@ bool AdScene::updateFreeObjects() {
}
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (!_objects[i]->_active) {
continue;
}
@@ -1148,7 +1143,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) {
AdObject *obj;
// global objects
- for (int i = 0; i < adGame->_objects.getSize(); i++) {
+ for (uint32 i = 0; i < adGame->_objects.size(); i++) {
obj = adGame->_objects[i];
if (obj->_active && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
objects.add(obj);
@@ -1156,7 +1151,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) {
}
// scene objects
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
obj = _objects[i];
if (obj->_active && !obj->_editorOnly && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
objects.add(obj);
@@ -1167,7 +1162,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) {
Common::sort(objects.begin(), objects.end(), AdScene::compareObjs);
// display them
- for (int i = 0; i < objects.getSize(); i++) {
+ for (uint32 i = 0; i < objects.size(); i++) {
obj = objects[i];
if (display3DOnly && !obj->_is3D) {
@@ -1186,7 +1181,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) {
// display design only objects
if (!display3DOnly) {
if (_gameRef->_editorMode && region == NULL) {
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_active && _objects[i]->_editorOnly) {
_objects[i]->display();
_objects[i]->_drawn = true;
@@ -1223,7 +1218,7 @@ bool AdScene::displayRegionContentOld(AdRegion *region) {
int minY = INT_MAX;
// global objects
- for (int i = 0; i < adGame->_objects.getSize(); i++) {
+ for (uint32 i = 0; i < adGame->_objects.size(); i++) {
if (adGame->_objects[i]->_active && !adGame->_objects[i]->_drawn && adGame->_objects[i]->_posY < minY && (adGame->_objects[i]->_stickRegion == region || region == NULL || (adGame->_objects[i]->_stickRegion == NULL && region->pointInRegion(adGame->_objects[i]->_posX, adGame->_objects[i]->_posY)))) {
obj = adGame->_objects[i];
minY = adGame->_objects[i]->_posY;
@@ -1231,7 +1226,7 @@ bool AdScene::displayRegionContentOld(AdRegion *region) {
}
// scene objects
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_active && !_objects[i]->_editorOnly && !_objects[i]->_drawn && _objects[i]->_posY < minY && (_objects[i]->_stickRegion == region || region == NULL || (_objects[i]->_stickRegion == NULL && region->pointInRegion(_objects[i]->_posX, _objects[i]->_posY)))) {
obj = _objects[i];
minY = _objects[i]->_posY;
@@ -1252,7 +1247,7 @@ bool AdScene::displayRegionContentOld(AdRegion *region) {
// design only objects
if (_gameRef->_editorMode && region == NULL) {
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_active && _objects[i]->_editorOnly) {
_objects[i]->display();
_objects[i]->_drawn = true;
@@ -1443,7 +1438,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
ScValue *val = stack->pop();
if (val->isInt()) {
int layer = val->getInt();
- if (layer < 0 || layer >= _layers.getSize()) {
+ if (layer < 0 || layer >= (int32)_layers.size()) {
stack->pushNULL();
} else {
stack->pushNative(_layers[layer], true);
@@ -1451,7 +1446,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
} else {
const char *layerName = val->getString();
bool layerFound = false;
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
if (scumm_stricmp(layerName, _layers[i]->getName()) == 0) {
stack->pushNative(_layers[i], true);
layerFound = true;
@@ -1471,7 +1466,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
else if (strcmp(name, "GetWaypointGroup") == 0) {
stack->correctParams(1);
int group = stack->pop()->getInt();
- if (group < 0 || group >= _waypointGroups.getSize()) {
+ if (group < 0 || group >= (int32)_waypointGroups.size()) {
stack->pushNULL();
} else {
stack->pushNative(_waypointGroups[group], true);
@@ -1506,12 +1501,12 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
AdObject *ret = NULL;
if (val->isInt()) {
int index = val->getInt();
- if (index >= 0 && index < _objects.getSize()) {
+ if (index >= 0 && index < (int32)_objects.size()) {
ret = _objects[index];
}
} else {
const char *nodeName = val->getString();
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i] && _objects[i]->getName() && scumm_stricmp(_objects[i]->getName(), nodeName) == 0) {
ret = _objects[i];
break;
@@ -1542,7 +1537,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
}
if (_mainLayer) {
- for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
+ for (int i = _mainLayer->_nodes.size() - 1; i >= 0; i--) {
AdSceneNode *node = _mainLayer->_nodes[i];
if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->pointInRegion(x, y)) {
if (node->_region->_decoration && !includeDecors) {
@@ -1752,7 +1747,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
if (index < 0) {
index = 0;
}
- if (index <= _layers.getSize() - 1) {
+ if (index <= (int32)_layers.size() - 1) {
_layers.insert_at(index, layer);
} else {
_layers.add(layer);
@@ -1774,7 +1769,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
AdLayer *toDelete = NULL;
if (val->isNative()) {
BaseScriptable *temp = val->getNative();
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
if (_layers[i] == temp) {
toDelete = _layers[i];
break;
@@ -1782,7 +1777,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
}
} else {
int index = val->getInt();
- if (index >= 0 && index < _layers.getSize()) {
+ if (index >= 0 && index < (int32)_layers.size()) {
toDelete = _layers[index];
}
}
@@ -1797,7 +1792,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
return STATUS_OK;
}
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
if (_layers[i] == toDelete) {
_layers.remove_at(i);
_gameRef->unregisterObject(toDelete);
@@ -1828,7 +1823,7 @@ ScValue *AdScene::scGetProperty(const char *name) {
// NumLayers (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumLayers") == 0) {
- _scValue->setInt(_layers.getSize());
+ _scValue->setInt(_layers.size());
return _scValue;
}
@@ -1836,7 +1831,7 @@ ScValue *AdScene::scGetProperty(const char *name) {
// NumWaypointGroups (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumWaypointGroups") == 0) {
- _scValue->setInt(_waypointGroups.getSize());
+ _scValue->setInt(_waypointGroups.size());
return _scValue;
}
@@ -1857,7 +1852,7 @@ ScValue *AdScene::scGetProperty(const char *name) {
// NumFreeNodes (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumFreeNodes") == 0) {
- _scValue->setInt(_objects.getSize());
+ _scValue->setInt(_objects.size());
return _scValue;
}
@@ -2101,7 +2096,7 @@ bool AdScene::addObject(AdObject *object) {
//////////////////////////////////////////////////////////////////////////
bool AdScene::removeObject(AdObject *object) {
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i] == object) {
_objects.remove_at(i);
return _gameRef->unregisterObject(object);
@@ -2113,8 +2108,6 @@ bool AdScene::removeObject(AdObject *object) {
//////////////////////////////////////////////////////////////////////////
bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
- int i;
-
buffer->putTextIndent(indent, "SCENE {\n");
buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", getName());
@@ -2130,7 +2123,7 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
// scripts
- for (i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
@@ -2178,7 +2171,7 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
// waypoints
buffer->putTextIndent(indent + 2, "; ----- waypoints\n");
- for (i = 0; i < _waypointGroups.getSize(); i++) {
+ for (uint32 i = 0; i < _waypointGroups.size(); i++) {
_waypointGroups[i]->saveAsText(buffer, indent + 2);
}
@@ -2186,19 +2179,19 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
// layers
buffer->putTextIndent(indent + 2, "; ----- layers\n");
- for (i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
_layers[i]->saveAsText(buffer, indent + 2);
}
// scale levels
buffer->putTextIndent(indent + 2, "; ----- scale levels\n");
- for (i = 0; i < _scaleLevels.getSize(); i++) {
+ for (uint32 i = 0; i < _scaleLevels.size(); i++) {
_scaleLevels[i]->saveAsText(buffer, indent + 2);
}
// rotation levels
buffer->putTextIndent(indent + 2, "; ----- rotation levels\n");
- for (i = 0; i < _rotLevels.getSize(); i++) {
+ for (uint32 i = 0; i < _rotLevels.size(); i++) {
_rotLevels[i]->saveAsText(buffer, indent + 2);
}
@@ -2207,15 +2200,13 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
// free entities
buffer->putTextIndent(indent + 2, "; ----- free entities\n");
- for (i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_type == OBJECT_ENTITY) {
_objects[i]->saveAsText(buffer, indent + 2);
}
}
-
-
buffer->putTextIndent(indent, "}\n");
return STATUS_OK;
}
@@ -2226,7 +2217,7 @@ bool AdScene::sortScaleLevels() {
bool changed;
do {
changed = false;
- for (int i = 0; i < _scaleLevels.getSize() - 1; i++) {
+ for (uint32 i = 0; i < _scaleLevels.size() - 1; i++) {
if (_scaleLevels[i]->_posY > _scaleLevels[i + 1]->_posY) {
AdScaleLevel *sl = _scaleLevels[i];
_scaleLevels[i] = _scaleLevels[i + 1];
@@ -2247,7 +2238,7 @@ bool AdScene::sortRotLevels() {
bool changed;
do {
changed = false;
- for (int i = 0; i < _rotLevels.getSize() - 1; i++) {
+ for (uint32 i = 0; i < _rotLevels.size() - 1; i++) {
if (_rotLevels[i]->_posX > _rotLevels[i + 1]->_posX) {
AdRotLevel *rl = _rotLevels[i];
_rotLevels[i] = _rotLevels[i + 1];
@@ -2268,9 +2259,9 @@ float AdScene::getScaleAt(int Y) {
AdScaleLevel *prev = NULL;
AdScaleLevel *next = NULL;
- for (int i = 0; i < _scaleLevels.getSize(); i++) {
+ for (uint32 i = 0; i < _scaleLevels.size(); i++) {
/* AdScaleLevel *xxx = _scaleLevels[i];*/
- /* int j = _scaleLevels.getSize(); */
+ /* int j = _scaleLevels.size(); */
if (_scaleLevels[i]->_posY < Y) {
prev = _scaleLevels[i];
} else {
@@ -2517,7 +2508,7 @@ void AdScene::pfPointsStart() {
//////////////////////////////////////////////////////////////////////////
void AdScene::pfPointsAdd(int x, int y, int distance) {
- if (_pfPointsNum >= _pfPath.getSize()) {
+ if (_pfPointsNum >= (int32)_pfPath.size()) {
_pfPath.add(new AdPathPoint(x, y, distance));
} else {
_pfPath[_pfPointsNum]->x = x;
@@ -2630,9 +2621,9 @@ BaseObject *AdScene::getNodeByName(const char *name) {
BaseObject *ret = NULL;
// dependent objects
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
AdLayer *layer = _layers[i];
- for (int j = 0; j < layer->_nodes.getSize(); j++) {
+ for (uint32 j = 0; j < layer->_nodes.size(); j++) {
AdSceneNode *node = layer->_nodes[j];
if ((node->_type == OBJECT_ENTITY && !scumm_stricmp(name, node->_entity->getName())) ||
(node->_type == OBJECT_REGION && !scumm_stricmp(name, node->_region->getName()))) {
@@ -2652,14 +2643,14 @@ BaseObject *AdScene::getNodeByName(const char *name) {
}
// free entities
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_type == OBJECT_ENTITY && !scumm_stricmp(name, _objects[i]->getName())) {
return _objects[i];
}
}
// waypoint groups
- for (int i = 0; i < _waypointGroups.getSize(); i++) {
+ for (uint32 i = 0; i < _waypointGroups.size(); i++) {
if (!scumm_stricmp(name, _waypointGroups[i]->getName())) {
return _waypointGroups[i];
}
@@ -2696,9 +2687,9 @@ bool AdScene::persistState(bool saving) {
AdNodeState *nodeState;
// dependent objects
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
AdLayer *layer = _layers[i];
- for (int j = 0; j < layer->_nodes.getSize(); j++) {
+ for (uint32 j = 0; j < layer->_nodes.size(); j++) {
AdSceneNode *node = layer->_nodes[j];
switch (node->_type) {
case OBJECT_ENTITY:
@@ -2733,7 +2724,7 @@ bool AdScene::persistState(bool saving) {
}
// free entities
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (!_objects[i]->_saveState) {
continue;
}
@@ -2748,7 +2739,7 @@ bool AdScene::persistState(bool saving) {
}
// waypoint groups
- for (int i = 0; i < _waypointGroups.getSize(); i++) {
+ for (uint32 i = 0; i < _waypointGroups.size(); i++) {
nodeState = state->getNodeState(_waypointGroups[i]->getName(), saving);
if (nodeState) {
if (saving) {
@@ -2768,9 +2759,9 @@ float AdScene::getRotationAt(int x, int y) {
AdRotLevel *prev = NULL;
AdRotLevel *next = NULL;
- for (int i = 0; i < _rotLevels.getSize(); i++) {
+ for (uint32 i = 0; i < _rotLevels.size(); i++) {
/* AdRotLevel *xxx = _rotLevels[i];
- int j = _rotLevels.getSize();*/
+ int j = _rotLevels.size();*/
if (_rotLevels[i]->_posX < x) {
prev = _rotLevels[i];
} else {
@@ -2794,9 +2785,9 @@ float AdScene::getRotationAt(int x, int y) {
//////////////////////////////////////////////////////////////////////////
bool AdScene::handleItemAssociations(const char *itemName, bool show) {
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
AdLayer *layer = _layers[i];
- for (int j = 0; j < layer->_nodes.getSize(); j++) {
+ for (uint32 j = 0; j < layer->_nodes.size(); j++) {
if (layer->_nodes[j]->_type == OBJECT_ENTITY) {
AdEntity *ent = layer->_nodes[j]->_entity;
@@ -2807,7 +2798,7 @@ bool AdScene::handleItemAssociations(const char *itemName, bool show) {
}
}
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
if (_objects[i]->_type == OBJECT_ENTITY) {
AdEntity *ent = (AdEntity *)_objects[i];
if (ent->_item && strcmp(ent->_item, itemName) == 0) {
@@ -2824,7 +2815,7 @@ bool AdScene::handleItemAssociations(const char *itemName, bool show) {
bool AdScene::getRegionsAt(int x, int y, AdRegion **regionList, int numRegions) {
int numUsed = 0;
if (_mainLayer) {
- for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
+ for (int i = _mainLayer->_nodes.size() - 1; i >= 0; i--) {
AdSceneNode *node = _mainLayer->_nodes[i];
if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->pointInRegion(x, y)) {
if (numUsed < numRegions - 1) {
@@ -2854,13 +2845,13 @@ BaseObject *AdScene::getNextAccessObject(BaseObject *currObject) {
BaseArray<AdObject *> objects;
getSceneObjects(objects, true);
- if (objects.getSize() == 0) {
+ if (objects.size() == 0) {
return NULL;
} else {
if (currObject != NULL) {
- for (int i = 0; i < objects.getSize(); i++) {
+ for (uint32 i = 0; i < objects.size(); i++) {
if (objects[i] == currObject) {
- if (i < objects.getSize() - 1) {
+ if (i < objects.size() - 1) {
return objects[i + 1];
} else {
break;
@@ -2878,11 +2869,11 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) {
BaseArray<AdObject *> objects;
getSceneObjects(objects, true);
- if (objects.getSize() == 0) {
+ if (objects.size() == 0) {
return NULL;
} else {
if (currObject != NULL) {
- for (int i = objects.getSize() - 1; i >= 0; i--) {
+ for (int i = objects.size() - 1; i >= 0; i--) {
if (objects[i] == currObject) {
if (i > 0) {
return objects[i - 1];
@@ -2892,7 +2883,7 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) {
}
}
}
- return objects[objects.getSize() - 1];
+ return objects[objects.size() - 1];
}
return NULL;
}
@@ -2900,14 +2891,14 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) {
//////////////////////////////////////////////////////////////////////////
bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOnly) {
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
// close-up layer -> remove everything below it
if (interactiveOnly && _layers[i]->_closeUp) {
objects.clear();
}
- for (int j = 0; j < _layers[i]->_nodes.getSize(); j++) {
+ for (uint32 j = 0; j < _layers[i]->_nodes.size(); j++) {
AdSceneNode *node = _layers[i]->_nodes[j];
switch (node->_type) {
case OBJECT_ENTITY: {
@@ -2921,9 +2912,9 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOn
case OBJECT_REGION: {
BaseArray<AdObject *> regionObj;
getRegionObjects(node->_region, regionObj, interactiveOnly);
- for (int newIndex = 0; newIndex < regionObj.getSize(); newIndex++) {
+ for (uint32 newIndex = 0; newIndex < regionObj.size(); newIndex++) {
bool found = false;
- for (int old = 0; old < objects.getSize(); old++) {
+ for (uint32 old = 0; old < objects.size(); old++) {
if (objects[old] == regionObj[newIndex]) {
found = true;
break;
@@ -2933,7 +2924,7 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOn
objects.add(regionObj[newIndex]);
}
}
- //if (RegionObj.getSize() > 0) Objects.Append(RegionObj);
+ //if (regionObj.size() > 0) Objects.Append(RegionObj);
}
break;
default:
@@ -2946,9 +2937,9 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOn
// objects outside any region
BaseArray<AdObject *> regionObj;
getRegionObjects(NULL, regionObj, interactiveOnly);
- for (int newIndex = 0; newIndex < regionObj.getSize(); newIndex++) {
+ for (uint32 newIndex = 0; newIndex < regionObj.size(); newIndex++) {
bool found = false;
- for (int old = 0; old < objects.getSize(); old++) {
+ for (uint32 old = 0; old < objects.size(); old++) {
if (objects[old] == regionObj[newIndex]) {
found = true;
break;
@@ -2970,7 +2961,7 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *> &objects,
AdObject *obj;
// global objects
- for (int i = 0; i < adGame->_objects.getSize(); i++) {
+ for (uint32 i = 0; i < adGame->_objects.size(); i++) {
obj = adGame->_objects[i];
if (obj->_active && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
if (interactiveOnly && !obj->_registrable) {
@@ -2982,7 +2973,7 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *> &objects,
}
// scene objects
- for (int i = 0; i < _objects.getSize(); i++) {
+ for (uint32 i = 0; i < _objects.size(); i++) {
obj = _objects[i];
if (obj->_active && !obj->_editorOnly && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
if (interactiveOnly && !obj->_registrable) {
diff --git a/engines/wintermute/ad/ad_scene_state.cpp b/engines/wintermute/ad/ad_scene_state.cpp
index 4a85148540..04fd52c382 100644
--- a/engines/wintermute/ad/ad_scene_state.cpp
+++ b/engines/wintermute/ad/ad_scene_state.cpp
@@ -47,7 +47,7 @@ AdSceneState::~AdSceneState() {
delete[] _filename;
_filename = NULL;
- for (int i = 0; i < _nodeStates.getSize(); i++) {
+ for (uint32 i = 0; i < _nodeStates.size(); i++) {
delete _nodeStates[i];
}
_nodeStates.clear();
@@ -75,7 +75,7 @@ void AdSceneState::setFilename(const char *filename) {
//////////////////////////////////////////////////////////////////////////
AdNodeState *AdSceneState::getNodeState(const char *name, bool saving) {
- for (int i = 0; i < _nodeStates.getSize(); i++) {
+ for (uint32 i = 0; i < _nodeStates.size(); i++) {
if (scumm_stricmp(_nodeStates[i]->getName(), name) == 0) {
return _nodeStates[i];
}
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 0c3080c9cd..51765e3fe9 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -318,7 +318,7 @@ bool AdSentence::update(TDirection dir) {
currentTime = _gameRef->_timer - _startTime;
bool talkNodeFound = false;
- for (int i = 0; i < _talkDef->_nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _talkDef->_nodes.size(); i++) {
if (_talkDef->_nodes[i]->isInTimeInterval(currentTime, dir)) {
talkNodeFound = true;
diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index 08136d787e..cd96345fc8 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -52,7 +52,7 @@ AdTalkDef::AdTalkDef(BaseGame *inGame) : BaseObject(inGame) {
//////////////////////////////////////////////////////////////////////////
AdTalkDef::~AdTalkDef() {
- for (int i = 0; i < _nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _nodes.size(); i++) {
delete _nodes[i];
}
_nodes.clear();
@@ -232,7 +232,7 @@ bool AdTalkDef::saveAsText(BaseDynamicBuffer *buffer, int indent) {
_defaultSpriteSet->saveAsText(buffer, indent + 2);
}
- for (int i = 0; i < _nodes.getSize(); i++) {
+ for (uint32 i = 0; i < _nodes.size(); i++) {
_nodes[i]->saveAsText(buffer, indent + 2);
buffer->putTextIndent(indent, "\n");
}
diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index 165ee50270..89d7bd8a46 100644
--- a/engines/wintermute/ad/ad_talk_holder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -52,12 +52,12 @@ AdTalkHolder::~AdTalkHolder() {
delete _sprite;
_sprite = NULL;
- for (int i = 0; i < _talkSprites.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSprites.size(); i++) {
delete _talkSprites[i];
}
_talkSprites.clear();
- for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSpritesEx.size(); i++) {
delete _talkSpritesEx[i];
}
_talkSpritesEx.clear();
@@ -88,7 +88,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) {
if (stance != NULL) {
// search special talk stances
- for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSpritesEx.size(); i++) {
if (scumm_stricmp(_talkSpritesEx[i]->getName(), stance) == 0) {
ret = _talkSpritesEx[i];
break;
@@ -96,7 +96,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) {
}
if (ret == NULL) {
// serach generic talk stances
- for (int i = 0; i < _talkSprites.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSprites.size(); i++) {
if (scumm_stricmp(_talkSprites[i]->getName(), stance) == 0) {
ret = _talkSprites[i];
break;
@@ -107,11 +107,11 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) {
// not a valid stance? get a random one
if (ret == NULL) {
- if (_talkSprites.getSize() < 1) {
+ if (_talkSprites.size() < 1) {
ret = _sprite;
} else {
// TODO: remember last
- int rnd = BaseEngine::instance().randInt(0, _talkSprites.getSize() - 1);
+ int rnd = BaseEngine::instance().randInt(0, _talkSprites.size() - 1);
ret = _talkSprites[rnd];
}
}
@@ -228,7 +228,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS
bool setTemp2 = false;
if (ex) {
- for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSpritesEx.size(); i++) {
if (scumm_stricmp(_talkSpritesEx[i]->getFilename(), filename) == 0) {
if (_currentSprite == _talkSpritesEx[i]) {
setCurrent = true;
@@ -242,7 +242,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS
}
}
} else {
- for (int i = 0; i < _talkSprites.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSprites.size(); i++) {
if (scumm_stricmp(_talkSprites[i]->getFilename(), filename) == 0) {
if (_currentSprite == _talkSprites[i]) {
setCurrent = true;
@@ -288,7 +288,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS
// delete current
if (ex) {
- for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSpritesEx.size(); i++) {
if (_talkSpritesEx[i] == _currentSprite) {
setCurrent = true;
}
@@ -299,7 +299,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS
}
_talkSpritesEx.clear();
} else {
- for (int i = 0; i < _talkSprites.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSprites.size(); i++) {
if (_talkSprites[i] == _currentSprite) {
setCurrent = true;
}
@@ -372,13 +372,13 @@ const char *AdTalkHolder::scToString() {
//////////////////////////////////////////////////////////////////////////
bool AdTalkHolder::saveAsText(BaseDynamicBuffer *buffer, int indent) {
- for (int i = 0; i < _talkSprites.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSprites.size(); i++) {
if (_talkSprites[i]->getFilename()) {
buffer->putTextIndent(indent + 2, "TALK=\"%s\"\n", _talkSprites[i]->getFilename());
}
}
- for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
+ for (uint32 i = 0; i < _talkSpritesEx.size(); i++) {
if (_talkSpritesEx[i]->getFilename()) {
buffer->putTextIndent(indent + 2, "TALK_SPECIAL=\"%s\"\n", _talkSpritesEx[i]->getFilename());
}
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 1573f5914e..8da62c9115 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -56,7 +56,7 @@ AdWaypointGroup::~AdWaypointGroup() {
//////////////////////////////////////////////////////////////////////////
void AdWaypointGroup::cleanup() {
- for (int i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
delete _points[i];
}
_points.clear();
@@ -179,7 +179,7 @@ bool AdWaypointGroup::saveAsText(BaseDynamicBuffer *buffer, int indent) {
}
BaseClass::saveAsText(buffer, indent + 2);
- for (int i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
buffer->putTextIndent(indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
}
@@ -253,7 +253,7 @@ bool AdWaypointGroup::mimic(AdWaypointGroup *wpt, float scale, int argX, int arg
cleanup();
- for (int i = 0; i < wpt->_points.getSize(); i++) {
+ for (uint32 i = 0; i < wpt->_points.size(); i++) {
int x = (int)((float)wpt->_points[i]->x * scale / 100.0f);
int y = (int)((float)wpt->_points[i]->y * scale / 100.0f);
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-09 14:33:18 +0000