From 0a43bba003c5e5cbf302a667e8515d4066d72407 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Mon, 9 Jul 2012 04:50:38 +0200 Subject: WINTERMUTE: Rename FuncName->funcName in coll_templ.h --- engines/wintermute/Ad/AdActor.cpp | 44 ++--- engines/wintermute/Ad/AdEntity.cpp | 8 +- engines/wintermute/Ad/AdGame.cpp | 182 +++++++++--------- engines/wintermute/Ad/AdInventory.cpp | 18 +- engines/wintermute/Ad/AdInventoryBox.cpp | 6 +- engines/wintermute/Ad/AdItem.cpp | 4 +- engines/wintermute/Ad/AdLayer.cpp | 32 ++-- engines/wintermute/Ad/AdObject.cpp | 58 +++--- engines/wintermute/Ad/AdPath.cpp | 12 +- engines/wintermute/Ad/AdRegion.cpp | 10 +- engines/wintermute/Ad/AdResponseBox.cpp | 44 ++--- engines/wintermute/Ad/AdScene.cpp | 226 +++++++++++------------ engines/wintermute/Ad/AdSceneState.cpp | 8 +- engines/wintermute/Ad/AdSentence.cpp | 2 +- engines/wintermute/Ad/AdTalkDef.cpp | 8 +- engines/wintermute/Ad/AdTalkHolder.cpp | 44 ++--- engines/wintermute/Ad/AdWaypointGroup.cpp | 12 +- engines/wintermute/Base/BFileManager.cpp | 54 +++--- engines/wintermute/Base/BFontBitmap.cpp | 8 +- engines/wintermute/Base/BFontStorage.cpp | 16 +- engines/wintermute/Base/BFontTT.cpp | 18 +- engines/wintermute/Base/BFrame.cpp | 60 +++--- engines/wintermute/Base/BGame.cpp | 70 +++---- engines/wintermute/Base/BRegion.cpp | 48 ++--- engines/wintermute/Base/BRenderSDL.cpp | 4 +- engines/wintermute/Base/BRenderer.cpp | 6 +- engines/wintermute/Base/BScriptHolder.cpp | 34 ++-- engines/wintermute/Base/BSoundMgr.cpp | 18 +- engines/wintermute/Base/BSprite.cpp | 60 +++--- engines/wintermute/Base/BSubFrame.cpp | 4 +- engines/wintermute/Base/BSurfaceStorage.cpp | 18 +- engines/wintermute/Base/PartEmitter.cpp | 66 +++---- engines/wintermute/Base/PartParticle.cpp | 2 +- engines/wintermute/Base/file/BDiskFile.cpp | 2 +- engines/wintermute/Base/scriptables/SXStore.cpp | 40 ++-- engines/wintermute/Base/scriptables/ScEngine.cpp | 76 ++++---- engines/wintermute/Base/scriptables/ScEngine.h | 2 +- engines/wintermute/Base/scriptables/ScScript.cpp | 10 +- engines/wintermute/Base/scriptables/ScStack.cpp | 28 +-- engines/wintermute/UI/UIButton.cpp | 4 +- engines/wintermute/UI/UIEdit.cpp | 4 +- engines/wintermute/UI/UIEntity.cpp | 2 +- engines/wintermute/UI/UIObject.cpp | 26 +-- engines/wintermute/UI/UIText.cpp | 4 +- engines/wintermute/UI/UIWindow.cpp | 60 +++--- engines/wintermute/coll_templ.h | 96 +++++----- engines/wintermute/video/VidPlayer.cpp | 10 +- 47 files changed, 784 insertions(+), 784 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index a823a18dde..16ea49f6ff 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -103,21 +103,21 @@ CAdActor::~CAdActor() { _animSprite2 = NULL; // ref only - for (int i = 0; i < _talkSprites.GetSize(); i++) { + for (int i = 0; i < _talkSprites.getSize(); i++) { delete _talkSprites[i]; } - _talkSprites.RemoveAll(); + _talkSprites.removeAll(); - for (int i = 0; i < _talkSpritesEx.GetSize(); i++) { + for (int i = 0; i < _talkSpritesEx.getSize(); i++) { delete _talkSpritesEx[i]; } - _talkSpritesEx.RemoveAll(); + _talkSpritesEx.removeAll(); - for (int i = 0; i < _anims.GetSize(); i++) { + for (int i = 0; i < _anims.getSize(); i++) { delete _anims[i]; _anims[i] = NULL; } - _anims.RemoveAll(); + _anims.removeAll(); } @@ -298,13 +298,13 @@ ERRORCODE CAdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_TALK: spr = new CAdSpriteSet(Game, this); if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC; - else _talkSprites.Add(spr); + else _talkSprites.add(spr); break; case TOKEN_TALK_SPECIAL: spr = new CAdSpriteSet(Game, this); if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC; - else _talkSpritesEx.Add(spr); + else _talkSpritesEx.add(spr); break; case TOKEN_STAND: @@ -434,7 +434,7 @@ ERRORCODE CAdActor::loadBuffer(byte *buffer, bool complete) { case TOKEN_ANIMATION: { CAdSpriteSet *Anim = new CAdSpriteSet(Game, this); if (!Anim || DID_FAIL(Anim->loadBuffer(params, false))) cmd = PARSERR_GENERIC; - else _anims.Add(Anim); + else _anims.add(Anim); } break; } @@ -940,7 +940,7 @@ ERRORCODE CAdActor::scCallMethod(CScScript *script, CScStack *stack, CScStack *t const char *AnimName = stack->pop()->getString(); bool Found = false; - for (int i = 0; i < _anims.GetSize(); i++) { + for (int i = 0; i < _anims.getSize(); i++) { if (scumm_stricmp(_anims[i]->_name, AnimName) == 0) { // invalidate sprites in use if (_anims[i]->containsSprite(_tempSprite2)) _tempSprite2 = NULL; @@ -949,7 +949,7 @@ ERRORCODE CAdActor::scCallMethod(CScScript *script, CScStack *stack, CScStack *t delete _anims[i]; _anims[i] = NULL; - _anims.RemoveAt(i); + _anims.removeAt(i); i--; Found = true; } @@ -1118,7 +1118,7 @@ CBSprite *CAdActor::getTalkStance(const char *stance) { } // old way - if (_talkSprites.GetSize() > 0 || _talkSpritesEx.GetSize() > 0) + if (_talkSprites.getSize() > 0 || _talkSpritesEx.getSize() > 0) return getTalkStanceOld(stance); // new way @@ -1131,13 +1131,13 @@ CBSprite *CAdActor::getTalkStance(const char *stance) { // not - get a random talk if (!ret) { CBArray TalkAnims; - for (int i = 0; i < _anims.GetSize(); i++) { + for (int i = 0; i < _anims.getSize(); i++) { if (_talkAnimName.compareToIgnoreCase(_anims[i]->_name) == 0) - TalkAnims.Add(_anims[i]); + TalkAnims.add(_anims[i]); } - if (TalkAnims.GetSize() > 0) { - int rnd = g_wintermute->randInt(0, TalkAnims.GetSize() - 1); + if (TalkAnims.getSize() > 0) { + int rnd = g_wintermute->randInt(0, TalkAnims.getSize() - 1); ret = TalkAnims[rnd]->getSprite(_dir); } else { if (_standSprite) ret = _standSprite->getSprite(_dir); @@ -1156,7 +1156,7 @@ CBSprite *CAdActor::getTalkStanceOld(const char *stance) { if (stance != NULL) { // search special stances - for (int i = 0; i < _talkSpritesEx.GetSize(); i++) { + for (int i = 0; i < _talkSpritesEx.getSize(); i++) { if (scumm_stricmp(_talkSpritesEx[i]->_name, stance) == 0) { ret = _talkSpritesEx[i]->getSprite(_dir); break; @@ -1164,7 +1164,7 @@ CBSprite *CAdActor::getTalkStanceOld(const char *stance) { } if (ret == NULL) { // search generic stances - for (int i = 0; i < _talkSprites.GetSize(); i++) { + for (int i = 0; i < _talkSprites.getSize(); i++) { if (scumm_stricmp(_talkSprites[i]->_name, stance) == 0) { ret = _talkSprites[i]->getSprite(_dir); break; @@ -1175,10 +1175,10 @@ CBSprite *CAdActor::getTalkStanceOld(const char *stance) { // not a valid stance? get a random one if (ret == NULL) { - if (_talkSprites.GetSize() < 1) ret = _standSprite->getSprite(_dir); + if (_talkSprites.getSize() < 1) ret = _standSprite->getSprite(_dir); else { // TODO: remember last - int rnd = g_wintermute->randInt(0, _talkSprites.GetSize() - 1); + int rnd = g_wintermute->randInt(0, _talkSprites.getSize() - 1); ret = _talkSprites[rnd]->getSprite(_dir); } } @@ -1254,7 +1254,7 @@ int CAdActor::getHeight() { ////////////////////////////////////////////////////////////////////////// CAdSpriteSet *CAdActor::getAnimByName(const Common::String &animName) { - for (int i = 0; i < _anims.GetSize(); i++) { + for (int i = 0; i < _anims.getSize(); i++) { if (animName.compareToIgnoreCase(_anims[i]->_name) == 0) return _anims[i]; } @@ -1288,7 +1288,7 @@ ERRORCODE CAdActor::mergeAnims(const char *animsFilename) { if (!Anim || DID_FAIL(Anim->loadBuffer(params, false))) { cmd = PARSERR_GENERIC; Ret = STATUS_FAILED; - } else _anims.Add(Anim); + } else _anims.add(Anim); } break; } diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp index a5fb78858c..599afee626 100644 --- a/engines/wintermute/Ad/AdEntity.cpp +++ b/engines/wintermute/Ad/AdEntity.cpp @@ -237,14 +237,14 @@ ERRORCODE CAdEntity::loadBuffer(byte *buffer, bool complete) { case TOKEN_TALK: { spr = new CBSprite(Game, this); if (!spr || DID_FAIL(spr->loadFile((char *)params, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC; - else _talkSprites.Add(spr); + else _talkSprites.add(spr); } break; case TOKEN_TALK_SPECIAL: { spr = new CBSprite(Game, this); if (!spr || DID_FAIL(spr->loadFile((char *)params, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC; - else _talkSpritesEx.Add(spr); + else _talkSpritesEx.add(spr); } break; @@ -503,7 +503,7 @@ ERRORCODE CAdEntity::display() { if (_ignoreItems && ((CAdGame *)Game)->_selectedItem) Reg = false; if (_region && (Reg || _editorAlwaysRegister)) { - Game->_renderer->_rectList.Add(new CBActiveRect(Game, _registerAlias, _region, Game->_offsetX, Game->_offsetY)); + Game->_renderer->_rectList.add(new CBActiveRect(Game, _registerAlias, _region, Game->_offsetX, Game->_offsetY)); } displaySpriteAttachments(true); @@ -910,7 +910,7 @@ ERRORCODE CAdEntity::saveAsText(CBDynBuffer *buffer, int indent) { int i; - for (i = 0; i < _scripts.GetSize(); i++) { + for (i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp index 69a31575cb..6a58f99881 100644 --- a/engines/wintermute/Ad/AdGame.cpp +++ b/engines/wintermute/Ad/AdGame.cpp @@ -120,40 +120,40 @@ CAdGame::~CAdGame() { ERRORCODE CAdGame::cleanup() { int i; - for (i = 0; i < _objects.GetSize(); i++) { + for (i = 0; i < _objects.getSize(); i++) { unregisterObject(_objects[i]); _objects[i] = NULL; } - _objects.RemoveAll(); + _objects.removeAll(); - for (i = 0; i < _dlgPendingBranches.GetSize(); i++) { + for (i = 0; i < _dlgPendingBranches.getSize(); i++) { delete [] _dlgPendingBranches[i]; } - _dlgPendingBranches.RemoveAll(); + _dlgPendingBranches.removeAll(); - for (i = 0; i < _speechDirs.GetSize(); i++) { + for (i = 0; i < _speechDirs.getSize(); i++) { delete [] _speechDirs[i]; } - _speechDirs.RemoveAll(); + _speechDirs.removeAll(); unregisterObject(_scene); _scene = NULL; // remove items - for (i = 0; i < _items.GetSize(); i++) Game->unregisterObject(_items[i]); - _items.RemoveAll(); + for (i = 0; i < _items.getSize(); i++) Game->unregisterObject(_items[i]); + _items.removeAll(); // clear remaining inventories delete _invObject; _invObject = NULL; - for (i = 0; i < _inventories.GetSize(); i++) { + for (i = 0; i < _inventories.getSize(); i++) { delete _inventories[i]; } - _inventories.RemoveAll(); + _inventories.removeAll(); if (_responseBox) { @@ -181,14 +181,14 @@ ERRORCODE CAdGame::cleanup() { delete _sceneViewport; _sceneViewport = NULL; - for (i = 0; i < _sceneStates.GetSize(); i++) delete _sceneStates[i]; - _sceneStates.RemoveAll(); + for (i = 0; i < _sceneStates.getSize(); i++) delete _sceneStates[i]; + _sceneStates.removeAll(); - for (i = 0; i < _responsesBranch.GetSize(); i++) delete _responsesBranch[i]; - _responsesBranch.RemoveAll(); + for (i = 0; i < _responsesBranch.getSize(); i++) delete _responsesBranch[i]; + _responsesBranch.removeAll(); - for (i = 0; i < _responsesGame.GetSize(); i++) delete _responsesGame[i]; - _responsesGame.RemoveAll(); + for (i = 0; i < _responsesGame.getSize(); i++) delete _responsesGame[i]; + _responsesGame.removeAll(); return CBGame::cleanup(); } @@ -211,7 +211,7 @@ ERRORCODE CAdGame::initLoop() { if (_scene) res = _scene->initLoop(); - _sentences.RemoveAll(); + _sentences.removeAll(); return res; } @@ -219,7 +219,7 @@ ERRORCODE CAdGame::initLoop() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::addObject(CAdObject *object) { - _objects.Add(object); + _objects.add(object); return registerObject(object); } @@ -232,9 +232,9 @@ ERRORCODE CAdGame::removeObject(CAdObject *object) { if (DID_SUCCEED(Res)) return Res; } - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i] == object) { - _objects.RemoveAt(i); + _objects.removeAt(i); break; } } @@ -259,7 +259,7 @@ ERRORCODE CAdGame::changeScene(const char *filename, bool fadeIn) { if (_scene) { // reset objects - for (int i = 0; i < _objects.GetSize(); i++) _objects[i]->reset(); + for (int i = 0; i < _objects.getSize(); i++) _objects[i]->reset(); // reset scene properties _scene->_sFXVolume = 100; @@ -273,7 +273,7 @@ ERRORCODE CAdGame::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 (int i = 0; i < _objects.getSize(); i++) { _objects[i]->invalidateCurrRegions(); _objects[i]->_stickRegion = NULL; } @@ -288,13 +288,13 @@ ERRORCODE CAdGame::changeScene(const char *filename, bool fadeIn) { ////////////////////////////////////////////////////////////////////////// void CAdGame::addSentence(CAdSentence *sentence) { - _sentences.Add(sentence); + _sentences.add(sentence); } ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::displaySentences(bool frozen) { - for (int i = 0; i < _sentences.GetSize(); i++) { + for (int i = 0; i < _sentences.getSize(); i++) { if (frozen && _sentences[i]->_freezable) continue; else _sentences[i]->display(); } @@ -304,7 +304,7 @@ ERRORCODE CAdGame::displaySentences(bool frozen) { ////////////////////////////////////////////////////////////////////////// void CAdGame::finishSentences() { - for (int i = 0; i < _sentences.GetSize(); i++) { + for (int i = 0; i < _sentences.getSize(); i++) { if (_sentences[i]->CanSkip()) { _sentences[i]->_duration = 0; if (_sentences[i]->_sound) _sentences[i]->_sound->stop(); @@ -446,7 +446,7 @@ ERRORCODE CAdGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th CAdItem *item = NULL; if (val->isInt()) { int index = val->getInt(); - if (index >= 0 && index < _items.GetSize()) item = _items[index]; + if (index >= 0 && index < _items.getSize()) item = _items[index]; } else { item = getItemByName(val->getString()); } @@ -484,7 +484,7 @@ ERRORCODE CAdGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th if (strcmp(name, "AddResponseOnce") == 0) res->_responseType = RESPONSE_ONCE; else if (strcmp(name, "AddResponseOnceGame") == 0) res->_responseType = RESPONSE_ONCE_GAME; - _responseBox->_responses.Add(res); + _responseBox->_responses.add(res); } } else { script->runtimeError("Game.AddResponse: response box is not defined"); @@ -526,13 +526,13 @@ ERRORCODE CAdGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th if (_responseBox) { _responseBox->weedResponses(); - if (_responseBox->_responses.GetSize() == 0) { + if (_responseBox->_responses.getSize() == 0) { stack->pushNULL(); return STATUS_OK; } - if (_responseBox->_responses.GetSize() == 1 && autoSelectLast) { + if (_responseBox->_responses.getSize() == 1 && autoSelectLast) { stack->pushInt(_responseBox->_responses[0]->_iD); _responseBox->handleResponse(_responseBox->_responses[0]); _responseBox->clearResponses(); @@ -559,7 +559,7 @@ ERRORCODE CAdGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th stack->correctParams(0); if (_responseBox) { _responseBox->weedResponses(); - stack->pushInt(_responseBox->_responses.GetSize()); + stack->pushInt(_responseBox->_responses.getSize()); } else { script->runtimeError("Game.GetNumResponses: response box is not defined"); stack->pushNULL(); @@ -607,8 +607,8 @@ ERRORCODE CAdGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th else if (strcmp(name, "GetCurrentDlgBranch") == 0) { stack->correctParams(0); - if (_dlgPendingBranches.GetSize() > 0) { - stack->pushString(_dlgPendingBranches[_dlgPendingBranches.GetSize() - 1]); + if (_dlgPendingBranches.getSize() > 0) { + stack->pushString(_dlgPendingBranches[_dlgPendingBranches.getSize() - 1]); } else stack->pushNULL(); return STATUS_OK; @@ -650,10 +650,10 @@ ERRORCODE CAdGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th CScValue *val = stack->pop(); if (!val->isNULL()) { - for (int i = 0; i < _inventories.GetSize(); i++) { + for (int i = 0; i < _inventories.getSize(); i++) { CAdInventory *Inv = _inventories[i]; - for (int j = 0; j < Inv->_takenItems.GetSize(); j++) { + for (int j = 0; j < Inv->_takenItems.getSize(); j++) { if (val->getNative() == Inv->_takenItems[j]) { stack->pushBool(true); return STATUS_OK; @@ -918,7 +918,7 @@ CScValue *CAdGame::scGetProperty(const char *name) { // TotalNumItems ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "TotalNumItems") == 0) { - _scValue->setInt(_items.GetSize()); + _scValue->setInt(_items.getSize()); return _scValue; } @@ -962,7 +962,7 @@ ERRORCODE CAdGame::scSetProperty(const char *name, CScValue *value) { else { if (value->isNative()) { _selectedItem = NULL; - for (int i = 0; i < _items.GetSize(); i++) { + for (int i = 0; i < _items.getSize(); i++) { if (_items[i] == value->getNative()) { _selectedItem = (CAdItem *)value->getNative(); break; @@ -1405,7 +1405,7 @@ ERRORCODE CAdGame::loadItemsBuffer(byte *buffer, bool merge) { CBParser parser(Game); if (!merge) { - while (_items.GetSize() > 0) deleteItem(_items[0]); + while (_items.getSize() > 0) deleteItem(_items[0]); } while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { @@ -1450,7 +1450,7 @@ CAdSceneState *CAdGame::getSceneState(const char *filename, bool saving) { if (filenameCor[i] == '/') filenameCor[i] = '\\'; } - for (int i = 0; i < _sceneStates.GetSize(); i++) { + for (int i = 0; i < _sceneStates.getSize(); i++) { if (scumm_stricmp(_sceneStates[i]->_filename, filenameCor) == 0) { delete [] filenameCor; return _sceneStates[i]; @@ -1461,7 +1461,7 @@ CAdSceneState *CAdGame::getSceneState(const char *filename, bool saving) { CAdSceneState *ret = new CAdSceneState(Game); ret->setFilename(filenameCor); - _sceneStates.Add(ret); + _sceneStates.add(ret); delete [] filenameCor; return ret; @@ -1491,7 +1491,7 @@ ERRORCODE CAdGame::windowLoadHook(CUIWindow *win, char **buffer, char **params) cmd = PARSERR_GENERIC; } else { ent->_parent = win; - win->_widgets.Add(ent); + win->_widgets.add(ent); } } break; @@ -1517,7 +1517,7 @@ ERRORCODE CAdGame::windowScriptMethodHook(CUIWindow *win, CScScript *script, CSc stack->pushNative(ent, true); ent->_parent = win; - win->_widgets.Add(ent); + win->_widgets.add(ent); return STATUS_OK; } else return STATUS_FAILED; @@ -1529,7 +1529,7 @@ ERRORCODE CAdGame::startDlgBranch(const char *branchName, const char *scriptName char *name = new char[strlen(branchName) + 1 + strlen(scriptName) + 1 + strlen(eventName) + 1]; if (name) { sprintf(name, "%s.%s.%s", branchName, scriptName, eventName); - _dlgPendingBranches.Add(name); + _dlgPendingBranches.add(name); } return STATUS_OK; } @@ -1539,8 +1539,8 @@ ERRORCODE CAdGame::startDlgBranch(const char *branchName, const char *scriptName ERRORCODE CAdGame::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.getSize() > 0) { + name = _dlgPendingBranches[_dlgPendingBranches.getSize() - 1]; } else { if (branchName != NULL) { name = new char[strlen(branchName) + 1 + strlen(scriptName) + 1 + strlen(eventName) + 1]; @@ -1555,25 +1555,25 @@ ERRORCODE CAdGame::endDlgBranch(const char *branchName, const char *scriptName, int startIndex = -1; - for (int i = _dlgPendingBranches.GetSize() - 1; i >= 0; i--) { + for (int i = _dlgPendingBranches.getSize() - 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 (int i = startIndex; i < _dlgPendingBranches.getSize(); i++) { //ClearBranchResponses(_dlgPendingBranches[i]); delete [] _dlgPendingBranches[i]; _dlgPendingBranches[i] = NULL; } - _dlgPendingBranches.RemoveAt(startIndex, _dlgPendingBranches.GetSize() - startIndex); + _dlgPendingBranches.removeAt(startIndex, _dlgPendingBranches.getSize() - startIndex); } // dialogue is over, forget selected responses - if (_dlgPendingBranches.GetSize() == 0) { - for (int i = 0; i < _responsesBranch.GetSize(); i++) delete _responsesBranch[i]; - _responsesBranch.RemoveAll(); + if (_dlgPendingBranches.getSize() == 0) { + for (int i = 0; i < _responsesBranch.getSize(); i++) delete _responsesBranch[i]; + _responsesBranch.removeAll(); } if (deleteName) delete [] name; @@ -1584,10 +1584,10 @@ ERRORCODE CAdGame::endDlgBranch(const char *branchName, const char *scriptName, ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::clearBranchResponses(char *name) { - for (int i = 0; i < _responsesBranch.GetSize(); i++) { + for (int i = 0; i < _responsesBranch.getSize(); i++) { if (scumm_stricmp(name, _responsesBranch[i]->_context) == 0) { delete _responsesBranch[i]; - _responsesBranch.RemoveAt(i); + _responsesBranch.removeAt(i); i--; } } @@ -1600,16 +1600,16 @@ ERRORCODE CAdGame::addBranchResponse(int ID) { if (branchResponseUsed(ID)) return STATUS_OK; CAdResponseContext *r = new CAdResponseContext(Game); r->_iD = ID; - r->setContext(_dlgPendingBranches.GetSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.GetSize() - 1] : NULL); - _responsesBranch.Add(r); + r->setContext(_dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL); + _responsesBranch.add(r); return STATUS_OK; } ////////////////////////////////////////////////////////////////////////// bool CAdGame::branchResponseUsed(int ID) { - char *Context = _dlgPendingBranches.GetSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.GetSize() - 1] : NULL; - for (int i = 0; i < _responsesBranch.GetSize(); i++) { + char *Context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL; + for (int i = 0; i < _responsesBranch.getSize(); i++) { if (_responsesBranch[i]->_iD == ID) { if ((Context == NULL && _responsesBranch[i]->_context == NULL) || scumm_stricmp(Context, _responsesBranch[i]->_context) == 0) return true; } @@ -1623,16 +1623,16 @@ ERRORCODE CAdGame::addGameResponse(int ID) { if (gameResponseUsed(ID)) return STATUS_OK; CAdResponseContext *r = new CAdResponseContext(Game); r->_iD = ID; - r->setContext(_dlgPendingBranches.GetSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.GetSize() - 1] : NULL); - _responsesGame.Add(r); + r->setContext(_dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL); + _responsesGame.add(r); return STATUS_OK; } ////////////////////////////////////////////////////////////////////////// bool CAdGame::gameResponseUsed(int ID) { - char *Context = _dlgPendingBranches.GetSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.GetSize() - 1] : NULL; - for (int i = 0; i < _responsesGame.GetSize(); i++) { + char *Context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL; + for (int i = 0; i < _responsesGame.getSize(); i++) { CAdResponseContext *RespContext = _responsesGame[i]; if (RespContext->_iD == ID) { if ((Context == NULL && RespContext->_context == NULL) || ((Context != NULL && RespContext->_context != NULL) && scumm_stricmp(Context, RespContext->_context) == 0)) return true; @@ -1644,25 +1644,25 @@ bool CAdGame::gameResponseUsed(int ID) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::resetResponse(int ID) { - char *Context = _dlgPendingBranches.GetSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.GetSize() - 1] : NULL; + char *Context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL; int i; - for (i = 0; i < _responsesGame.GetSize(); i++) { + for (i = 0; i < _responsesGame.getSize(); i++) { if (_responsesGame[i]->_iD == ID) { if ((Context == NULL && _responsesGame[i]->_context == NULL) || scumm_stricmp(Context, _responsesGame[i]->_context) == 0) { delete _responsesGame[i]; - _responsesGame.RemoveAt(i); + _responsesGame.removeAt(i); break; } } } - for (i = 0; i < _responsesBranch.GetSize(); i++) { + for (i = 0; i < _responsesBranch.getSize(); i++) { if (_responsesBranch[i]->_iD == ID) { if ((Context == NULL && _responsesBranch[i]->_context == NULL) || scumm_stricmp(Context, _responsesBranch[i]->_context) == 0) { delete _responsesBranch[i]; - _responsesBranch.RemoveAt(i); + _responsesBranch.removeAt(i); break; } } @@ -1741,21 +1741,21 @@ ERRORCODE CAdGame::displayContent(bool doUpdate, bool displayAll) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::registerInventory(CAdInventory *inv) { - for (int i = 0; i < _inventories.GetSize(); i++) { + for (int i = 0; i < _inventories.getSize(); i++) { if (_inventories[i] == inv) return STATUS_OK; } registerObject(inv); - _inventories.Add(inv); + _inventories.add(inv); return STATUS_OK; } ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::unregisterInventory(CAdInventory *inv) { - for (int i = 0; i < _inventories.GetSize(); i++) { + for (int i = 0; i < _inventories.getSize(); i++) { if (_inventories[i] == inv) { unregisterObject(_inventories[i]); - _inventories.RemoveAt(i); + _inventories.removeAt(i); return STATUS_OK; } } @@ -1764,10 +1764,10 @@ ERRORCODE CAdGame::unregisterInventory(CAdInventory *inv) { ////////////////////////////////////////////////////////////////////////// bool CAdGame::isItemTaken(char *itemName) { - for (int i = 0; i < _inventories.GetSize(); i++) { + for (int i = 0; i < _inventories.getSize(); i++) { CAdInventory *Inv = _inventories[i]; - for (int j = 0; j < Inv->_takenItems.GetSize(); j++) { + for (int j = 0; j < Inv->_takenItems.getSize(); j++) { if (scumm_stricmp(itemName, Inv->_takenItems[j]->_name) == 0) { return true; } @@ -1778,7 +1778,7 @@ bool CAdGame::isItemTaken(char *itemName) { ////////////////////////////////////////////////////////////////////////// CAdItem *CAdGame::getItemByName(const char *name) { - for (int i = 0; i < _items.GetSize(); i++) { + for (int i = 0; i < _items.getSize(); i++) { if (scumm_stricmp(_items[i]->_name, name) == 0) return _items[i]; } return NULL; @@ -1787,7 +1787,7 @@ CAdItem *CAdGame::getItemByName(const char *name) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::addItem(CAdItem *item) { - _items.Add(item); + _items.add(item); return Game->registerObject(item); } @@ -1795,28 +1795,28 @@ ERRORCODE CAdGame::addItem(CAdItem *item) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdGame::resetContent() { // clear pending dialogs - for (int i = 0; i < _dlgPendingBranches.GetSize(); i++) { + for (int i = 0; i < _dlgPendingBranches.getSize(); i++) { delete [] _dlgPendingBranches[i]; } - _dlgPendingBranches.RemoveAll(); + _dlgPendingBranches.removeAll(); // clear inventories - for (int i = 0; i < _inventories.GetSize(); i++) { - _inventories[i]->_takenItems.RemoveAll(); + for (int i = 0; i < _inventories.getSize(); i++) { + _inventories[i]->_takenItems.removeAll(); } // clear scene states - for (int i = 0; i < _sceneStates.GetSize(); i++) delete _sceneStates[i]; - _sceneStates.RemoveAll(); + for (int i = 0; i < _sceneStates.getSize(); i++) delete _sceneStates[i]; + _sceneStates.removeAll(); // clear once responses - for (int i = 0; i < _responsesBranch.GetSize(); i++) delete _responsesBranch[i]; - _responsesBranch.RemoveAll(); + for (int i = 0; i < _responsesBranch.getSize(); i++) delete _responsesBranch[i]; + _responsesBranch.removeAll(); // clear once game responses - for (int i = 0; i < _responsesGame.GetSize(); i++) delete _responsesGame[i]; - _responsesGame.RemoveAll(); + for (int i = 0; i < _responsesGame.getSize(); i++) delete _responsesGame[i]; + _responsesGame.removeAll(); // reload inventory items if (_itemsFile) loadItemsFile(_itemsFile); @@ -1835,15 +1835,15 @@ ERRORCODE CAdGame::deleteItem(CAdItem *item) { _scene->handleItemAssociations(item->_name, false); // remove from all inventories - for (int i = 0; i < _inventories.GetSize(); i++) { + for (int i = 0; i < _inventories.getSize(); i++) { _inventories[i]->removeItem(item); } // remove object - for (int i = 0; i < _items.GetSize(); i++) { + for (int i = 0; i < _items.getSize(); i++) { if (_items[i] == item) { unregisterObject(_items[i]); - _items.RemoveAt(i); + _items.removeAt(i); break; } } @@ -1861,13 +1861,13 @@ ERRORCODE CAdGame::addSpeechDir(const char *dir) { if (temp[strlen(temp) - 1] != '\\' && temp[strlen(temp) - 1] != '/') strcat(temp, "\\"); - for (int i = 0; i < _speechDirs.GetSize(); i++) { + for (int i = 0; i < _speechDirs.getSize(); i++) { if (scumm_stricmp(_speechDirs[i], temp) == 0) { delete [] temp; return STATUS_OK; } } - _speechDirs.Add(temp); + _speechDirs.add(temp); return STATUS_OK; } @@ -1883,10 +1883,10 @@ ERRORCODE CAdGame::removeSpeechDir(const char *dir) { strcat(temp, "\\"); bool Found = false; - for (int i = 0; i < _speechDirs.GetSize(); i++) { + for (int i = 0; i < _speechDirs.getSize(); i++) { if (scumm_stricmp(_speechDirs[i], temp) == 0) { delete [] _speechDirs[i]; - _speechDirs.RemoveAt(i); + _speechDirs.removeAt(i); Found = true; break; } @@ -1902,7 +1902,7 @@ ERRORCODE CAdGame::removeSpeechDir(const char *dir) { char *CAdGame::findSpeechFile(char *stringID) { char *ret = new char[MAX_PATH_LENGTH]; - for (int i = 0; i < _speechDirs.GetSize(); i++) { + for (int i = 0; i < _speechDirs.getSize(); i++) { sprintf(ret, "%s%s.ogg", _speechDirs[i], stringID); Common::SeekableReadStream *file = _fileManager->openFile(ret); // TODO: Replace with hasFile if (file) { diff --git a/engines/wintermute/Ad/AdInventory.cpp b/engines/wintermute/Ad/AdInventory.cpp index 41e9a89ed5..1c14cb710c 100644 --- a/engines/wintermute/Ad/AdInventory.cpp +++ b/engines/wintermute/Ad/AdInventory.cpp @@ -44,7 +44,7 @@ CAdInventory::CAdInventory(CBGame *inGame): CBObject(inGame) { ////////////////////////////////////////////////////////////////////////// CAdInventory::~CAdInventory() { - _takenItems.RemoveAll(); // ref only + _takenItems.removeAll(); // ref only } @@ -56,9 +56,9 @@ ERRORCODE CAdInventory::insertItem(const char *name, const char *insertAfter) { if (item == NULL) return STATUS_FAILED; int insertIndex = -1; - for (int i = 0; i < _takenItems.GetSize(); i++) { + for (int i = 0; i < _takenItems.getSize(); i++) { if (scumm_stricmp(_takenItems[i]->_name, name) == 0) { - _takenItems.RemoveAt(i); + _takenItems.removeAt(i); i--; continue; } @@ -66,8 +66,8 @@ ERRORCODE CAdInventory::insertItem(const char *name, const char *insertAfter) { } - if (insertIndex == -1) _takenItems.Add(item); - else _takenItems.InsertAt(insertIndex, item); + if (insertIndex == -1) _takenItems.add(item); + else _takenItems.insertAt(insertIndex, item); return STATUS_OK; } @@ -77,10 +77,10 @@ ERRORCODE CAdInventory::insertItem(const char *name, const char *insertAfter) { ERRORCODE CAdInventory::removeItem(const char *name) { if (name == NULL) return STATUS_FAILED; - for (int i = 0; i < _takenItems.GetSize(); i++) { + for (int i = 0; i < _takenItems.getSize(); i++) { if (scumm_stricmp(_takenItems[i]->_name, name) == 0) { if (((CAdGame *)Game)->_selectedItem == _takenItems[i])((CAdGame *)Game)->_selectedItem = NULL; - _takenItems.RemoveAt(i); + _takenItems.removeAt(i); return STATUS_OK; } } @@ -94,10 +94,10 @@ ERRORCODE CAdInventory::removeItem(const char *name) { ERRORCODE CAdInventory::removeItem(CAdItem *item) { if (item == NULL) return STATUS_FAILED; - for (int i = 0; i < _takenItems.GetSize(); i++) { + for (int i = 0; i < _takenItems.getSize(); i++) { if (_takenItems[i] == item) { if (((CAdGame *)Game)->_selectedItem == _takenItems[i])((CAdGame *)Game)->_selectedItem = NULL; - _takenItems.RemoveAt(i); + _takenItems.removeAt(i); return STATUS_OK; } } diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp index 3b887c4737..fe3a9b8a09 100644 --- a/engines/wintermute/Ad/AdInventoryBox.cpp +++ b/engines/wintermute/Ad/AdInventoryBox.cpp @@ -109,7 +109,7 @@ ERRORCODE CAdInventoryBox::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 < adGame->_inventoryOwner->getInventory()->_takenItems.getSize()); } @@ -136,7 +136,7 @@ ERRORCODE CAdInventoryBox::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 < adGame->_inventoryOwner->getInventory()->_takenItems.getSize()) { CAdItem *item = adGame->_inventoryOwner->getInventory()->_takenItems[ItemIndex]; if (item != ((CAdGame *)Game)->_selectedItem || !_hideSelected) { item->update(); @@ -308,7 +308,7 @@ ERRORCODE CAdInventoryBox::loadBuffer(byte *buffer, bool complete) { _visible = always_visible; if (_window) { - for (int i = 0; i < _window->_widgets.GetSize(); i++) { + for (int i = 0; i < _window->_widgets.getSize(); i++) { if (!_window->_widgets[i]->_listenerObject) _window->_widgets[i]->setListener(this, _window->_widgets[i], 0); } diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp index e2e7374f68..435947e96d 100644 --- a/engines/wintermute/Ad/AdItem.cpp +++ b/engines/wintermute/Ad/AdItem.cpp @@ -244,14 +244,14 @@ ERRORCODE CAdItem::loadBuffer(byte *buffer, bool complete) { case TOKEN_TALK: { CBSprite *spr = new CBSprite(Game, this); if (!spr || DID_FAIL(spr->loadFile((char *)params, ((CAdGame *)Game)->_texTalkLifeTime))) cmd = PARSERR_GENERIC; - else _talkSprites.Add(spr); + else _talkSprites.add(spr); } break; case TOKEN_TALK_SPECIAL: { CBSprite *spr = new CBSprite(Game, this); if (!spr || DID_FAIL(spr->loadFile((char *)params, ((CAdGame *)Game)->_texTalkLifeTime))) cmd = PARSERR_GENERIC; - else _talkSpritesEx.Add(spr); + else _talkSpritesEx.add(spr); } break; diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp index 06765b6cba..fd37d21550 100644 --- a/engines/wintermute/Ad/AdLayer.cpp +++ b/engines/wintermute/Ad/AdLayer.cpp @@ -54,9 +54,9 @@ CAdLayer::CAdLayer(CBGame *inGame): CBObject(inGame) { ////////////////////////////////////////////////////////////////////////// CAdLayer::~CAdLayer() { - for (int i = 0; i < _nodes.GetSize(); i++) + for (int i = 0; i < _nodes.getSize(); i++) delete _nodes[i]; - _nodes.RemoveAll(); + _nodes.removeAll(); } @@ -175,7 +175,7 @@ ERRORCODE CAdLayer::loadBuffer(byte *buffer, bool complete) { node = NULL; } else { node->setRegion(region); - _nodes.Add(node); + _nodes.add(node); } } break; @@ -192,7 +192,7 @@ ERRORCODE CAdLayer::loadBuffer(byte *buffer, bool complete) { node = NULL; } else { node->setEntity(entity); - _nodes.Add(node); + _nodes.add(node); } } break; @@ -237,7 +237,7 @@ ERRORCODE CAdLayer::scCallMethod(CScScript *script, CScStack *stack, CScStack *t if (val->_type == VAL_INT) node = val->getInt(); else { // get by name - for (int i = 0; i < _nodes.GetSize(); i++) { + for (int i = 0; i < _nodes.getSize(); i++) { if ((_nodes[i]->_type == OBJECT_ENTITY && scumm_stricmp(_nodes[i]->_entity->_name, val->getString()) == 0) || (_nodes[i]->_type == OBJECT_REGION && scumm_stricmp(_nodes[i]->_region->_name, val->getString()) == 0)) { node = i; @@ -246,7 +246,7 @@ ERRORCODE CAdLayer::scCallMethod(CScScript *script, CScStack *stack, CScStack *t } } - if (node < 0 || node >= _nodes.GetSize()) stack->pushNULL(); + if (node < 0 || node >= _nodes.getSize()) stack->pushNULL(); else { switch (_nodes[node]->_type) { case OBJECT_ENTITY: @@ -281,7 +281,7 @@ ERRORCODE CAdLayer::scCallMethod(CScScript *script, CScStack *stack, CScStack *t node->setEntity(entity); stack->pushNative(entity, true); } - _nodes.Add(node); + _nodes.add(node); return STATUS_OK; } @@ -306,8 +306,8 @@ ERRORCODE CAdLayer::scCallMethod(CScScript *script, CScStack *stack, CScStack *t stack->pushNative(entity, true); } if (index < 0) index = 0; - if (index <= _nodes.GetSize() - 1) _nodes.InsertAt(index, node); - else _nodes.Add(node); + if (index <= _nodes.getSize() - 1) _nodes.insertAt(index, node); + else _nodes.add(node); return STATUS_OK; } @@ -322,7 +322,7 @@ ERRORCODE CAdLayer::scCallMethod(CScScript *script, CScStack *stack, CScStack *t CAdSceneNode *toDelete = NULL; if (val->isNative()) { CBScriptable *temp = val->getNative(); - for (int i = 0; i < _nodes.GetSize(); i++) { + for (int i = 0; i < _nodes.getSize(); i++) { if (_nodes[i]->_region == temp || _nodes[i]->_entity == temp) { toDelete = _nodes[i]; break; @@ -330,7 +330,7 @@ ERRORCODE CAdLayer::scCallMethod(CScScript *script, CScStack *stack, CScStack *t } } else { int index = val->getInt(); - if (index >= 0 && index < _nodes.GetSize()) { + if (index >= 0 && index < _nodes.getSize()) { toDelete = _nodes[index]; } } @@ -339,11 +339,11 @@ ERRORCODE CAdLayer::scCallMethod(CScScript *script, CScStack *stack, CScStack *t return STATUS_OK; } - for (int i = 0; i < _nodes.GetSize(); i++) { + for (int i = 0; i < _nodes.getSize(); i++) { if (_nodes[i] == toDelete) { delete _nodes[i]; _nodes[i] = NULL; - _nodes.RemoveAt(i); + _nodes.removeAt(i); break; } } @@ -371,7 +371,7 @@ CScValue *CAdLayer::scGetProperty(const char *name) { // NumNodes (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumNodes") == 0) { - _scValue->setInt(_nodes.GetSize()); + _scValue->setInt(_nodes.getSize()); return _scValue; } @@ -491,13 +491,13 @@ ERRORCODE CAdLayer::saveAsText(CBDynBuffer *buffer, int indent) { int i; - for (i = 0; i < _scripts.GetSize(); i++) { + for (i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } if (_scProp) _scProp->saveAsText(buffer, indent + 2); - for (i = 0; i < _nodes.GetSize(); i++) { + for (i = 0; i < _nodes.getSize(); i++) { switch (_nodes[i]->_type) { case OBJECT_ENTITY: _nodes[i]->_entity->saveAsText(buffer, indent + 2); diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp index 038cacefad..06c63a4d1b 100644 --- a/engines/wintermute/Ad/AdObject.cpp +++ b/engines/wintermute/Ad/AdObject.cpp @@ -138,15 +138,15 @@ CAdObject::~CAdObject() { Game->unregisterObject(_partEmitter); - for (int i = 0; i < _attachmentsPre.GetSize(); i++) { + for (int i = 0; i < _attachmentsPre.getSize(); i++) { Game->unregisterObject(_attachmentsPre[i]); } - _attachmentsPre.RemoveAll(); + _attachmentsPre.removeAll(); - for (int i = 0; i < _attachmentsPost.GetSize(); i++) { + for (int i = 0; i < _attachmentsPost.getSize(); i++) { Game->unregisterObject(_attachmentsPost[i]); } - _attachmentsPost.RemoveAll(); + _attachmentsPost.removeAll(); } @@ -295,7 +295,7 @@ ERRORCODE CAdObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * 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.getSize(); i++) { if (main->_nodes[i]->_type == OBJECT_REGION && main->_nodes[i]->_region->_name && scumm_stricmp(main->_nodes[i]->_region->_name, regionName) == 0) { _stickRegion = main->_nodes[i]->_region; regFound = true; @@ -305,7 +305,7 @@ ERRORCODE CAdObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * } else if (val->isNative()) { CBScriptable *obj = val->getNative(); - for (i = 0; i < main->_nodes.GetSize(); i++) { + for (i = 0; i < main->_nodes.getSize(); i++) { if (main->_nodes[i]->_type == OBJECT_REGION && main->_nodes[i]->_region == obj) { _stickRegion = main->_nodes[i]->_region; regFound = true; @@ -412,7 +412,7 @@ ERRORCODE CAdObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * CAdItem *item = ((CAdGame *)Game)->getItemByName(val->getString()); if (item) stack->pushNative(item, true); else stack->pushNULL(); - } else if (val->isNULL() || val->getInt() < 0 || val->getInt() >= _inventory->_takenItems.GetSize()) + } else if (val->isNULL() || val->getInt() < 0 || val->getInt() >= _inventory->_takenItems.getSize()) stack->pushNULL(); else stack->pushNative(_inventory->_takenItems[val->getInt()], true); @@ -433,7 +433,7 @@ ERRORCODE CAdObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * CScValue *val = stack->pop(); if (!val->isNULL()) { - for (int i = 0; i < _inventory->_takenItems.GetSize(); i++) { + for (int i = 0; i < _inventory->_takenItems.getSize(); i++) { if (val->getNative() == _inventory->_takenItems[i]) { stack->pushBool(true); return STATUS_OK; @@ -502,8 +502,8 @@ ERRORCODE CAdObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * ent->_posY = offsetY; ent->_active = true; - if (preDisplay) _attachmentsPre.Add(ent); - else _attachmentsPost.Add(ent); + if (preDisplay) _attachmentsPre.add(ent); + else _attachmentsPost.add(ent); stack->pushBool(true); } @@ -520,37 +520,37 @@ ERRORCODE CAdObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * bool found = false; if (val->isNative()) { CBScriptable *obj = val->getNative(); - for (int i = 0; i < _attachmentsPre.GetSize(); i++) { + for (int i = 0; i < _attachmentsPre.getSize(); i++) { if (_attachmentsPre[i] == obj) { found = true; Game->unregisterObject(_attachmentsPre[i]); - _attachmentsPre.RemoveAt(i); + _attachmentsPre.removeAt(i); i--; } } - for (int i = 0; i < _attachmentsPost.GetSize(); i++) { + for (int i = 0; i < _attachmentsPost.getSize(); i++) { if (_attachmentsPost[i] == obj) { found = true; Game->unregisterObject(_attachmentsPost[i]); - _attachmentsPost.RemoveAt(i); + _attachmentsPost.removeAt(i); i--; } } } else { const char *attachmentName = val->getString(); - for (int i = 0; i < _attachmentsPre.GetSize(); i++) { + for (int i = 0; i < _attachmentsPre.getSize(); i++) { if (_attachmentsPre[i]->_name && scumm_stricmp(_attachmentsPre[i]->_name, attachmentName) == 0) { found = true; Game->unregisterObject(_attachmentsPre[i]); - _attachmentsPre.RemoveAt(i); + _attachmentsPre.removeAt(i); i--; } } - for (int i = 0; i < _attachmentsPost.GetSize(); i++) { + for (int i = 0; i < _attachmentsPost.getSize(); i++) { if (_attachmentsPost[i]->_name && scumm_stricmp(_attachmentsPost[i]->_name, attachmentName) == 0) { found = true; Game->unregisterObject(_attachmentsPost[i]); - _attachmentsPost.RemoveAt(i); + _attachmentsPost.removeAt(i); i--; } } @@ -571,24 +571,24 @@ ERRORCODE CAdObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * if (val->isInt()) { int index = val->getInt(); int currIndex = 0; - for (int i = 0; i < _attachmentsPre.GetSize(); i++) { + for (int i = 0; i < _attachmentsPre.getSize(); i++) { if (currIndex == index) ret = _attachmentsPre[i]; currIndex++; } - for (int i = 0; i < _attachmentsPost.GetSize(); i++) { + for (int i = 0; i < _attachmentsPost.getSize(); i++) { if (currIndex == index) ret = _attachmentsPost[i]; currIndex++; } } else { const char *attachmentName = val->getString(); - for (int i = 0; i < _attachmentsPre.GetSize(); i++) { + for (int i = 0; i < _attachmentsPre.getSize(); i++) { if (_attachmentsPre[i]->_name && scumm_stricmp(_attachmentsPre[i]->_name, attachmentName) == 0) { ret = _attachmentsPre[i]; break; } } if (!ret) { - for (int i = 0; i < _attachmentsPost.GetSize(); i++) { + for (int i = 0; i < _attachmentsPost.getSize(); i++) { if (_attachmentsPost[i]->_name && scumm_stricmp(_attachmentsPost[i]->_name, attachmentName) == 0) { ret = _attachmentsPre[i]; break; @@ -687,7 +687,7 @@ CScValue *CAdObject::scGetProperty(const char *name) { // NumItems (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumItems") == 0) { - _scValue->setInt(getInventory()->_takenItems.GetSize()); + _scValue->setInt(getInventory()->_takenItems.getSize()); return _scValue; } @@ -705,7 +705,7 @@ CScValue *CAdObject::scGetProperty(const char *name) { // NumAttachments (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumAttachments") == 0) { - _scValue->setInt(_attachmentsPre.GetSize() + _attachmentsPost.GetSize()); + _scValue->setInt(_attachmentsPre.getSize() + _attachmentsPost.getSize()); return _scValue; } @@ -810,7 +810,7 @@ int CAdObject::getHeight() { else { CBFrame *frame = _currentSprite->_frames[_currentSprite->_currentFrame]; int ret = 0; - for (int i = 0; i < frame->_subframes.GetSize(); i++) { + for (int i = 0; i < frame->_subframes.getSize(); i++) { ret = MAX(ret, frame->_subframes[i]->_hotspotY); } @@ -1109,10 +1109,10 @@ ERRORCODE CAdObject::getScale(float *scaleX, float *scaleY) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdObject::updateSpriteAttachments() { - for (int i = 0; i < _attachmentsPre.GetSize(); i++) { + for (int i = 0; i < _attachmentsPre.getSize(); i++) { _attachmentsPre[i]->update(); } - for (int i = 0; i < _attachmentsPost.GetSize(); i++) { + for (int i = 0; i < _attachmentsPost.getSize(); i++) { _attachmentsPost[i]->update(); } return STATUS_OK; @@ -1121,11 +1121,11 @@ ERRORCODE CAdObject::updateSpriteAttachments() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdObject::displaySpriteAttachments(bool preDisplay) { if (preDisplay) { - for (int i = 0; i < _attachmentsPre.GetSize(); i++) { + for (int i = 0; i < _attachmentsPre.getSize(); i++) { displaySpriteAttachment(_attachmentsPre[i]); } } else { - for (int i = 0; i < _attachmentsPost.GetSize(); i++) { + for (int i = 0; i < _attachmentsPost.getSize(); i++) { displaySpriteAttachment(_attachmentsPost[i]); } } diff --git a/engines/wintermute/Ad/AdPath.cpp b/engines/wintermute/Ad/AdPath.cpp index bac9681cef..5ce603609f 100644 --- a/engines/wintermute/Ad/AdPath.cpp +++ b/engines/wintermute/Ad/AdPath.cpp @@ -49,10 +49,10 @@ CAdPath::~CAdPath() { ////////////////////////////////////////////////////////////////////////// void CAdPath::reset() { - for (int i = 0; i < _points.GetSize(); i++) + for (int i = 0; i < _points.getSize(); i++) delete _points[i]; - _points.RemoveAll(); + _points.removeAll(); _currIndex = -1; _ready = false; } @@ -60,7 +60,7 @@ void CAdPath::reset() { ////////////////////////////////////////////////////////////////////////// CBPoint *CAdPath::getFirst() { - if (_points.GetSize() > 0) { + if (_points.getSize() > 0) { _currIndex = 0; return _points[_currIndex]; } else return NULL; @@ -70,21 +70,21 @@ CBPoint *CAdPath::getFirst() { ////////////////////////////////////////////////////////////////////////// CBPoint *CAdPath::getNext() { _currIndex++; - if (_currIndex < _points.GetSize()) return _points[_currIndex]; + if (_currIndex < _points.getSize()) return _points[_currIndex]; else return NULL; } ////////////////////////////////////////////////////////////////////////// CBPoint *CAdPath::getCurrent() { - if (_currIndex >= 0 && _currIndex < _points.GetSize()) return _points[_currIndex]; + if (_currIndex >= 0 && _currIndex < _points.getSize()) return _points[_currIndex]; else return NULL; } ////////////////////////////////////////////////////////////////////////// void CAdPath::addPoint(CBPoint *point) { - _points.Add(point); + _points.add(point); } diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp index ec6017759a..5ca4a56367 100644 --- a/engines/wintermute/Ad/AdRegion.cpp +++ b/engines/wintermute/Ad/AdRegion.cpp @@ -128,8 +128,8 @@ ERRORCODE CAdRegion::loadBuffer(byte *buffer, bool complete) { buffer = params; } - for (int i = 0; i < _points.GetSize(); i++) delete _points[i]; - _points.RemoveAll(); + for (int i = 0; i < _points.getSize(); i++) delete _points[i]; + _points.removeAll(); int ar = 255, ag = 255, ab = 255, alpha = 255; @@ -170,7 +170,7 @@ ERRORCODE CAdRegion::loadBuffer(byte *buffer, bool complete) { case TOKEN_POINT: { int x, y; parser.scanStr((char *)params, "%d,%d", &x, &y); - _points.Add(new CBPoint(x, y)); + _points.add(new CBPoint(x, y)); } break; @@ -359,13 +359,13 @@ ERRORCODE CAdRegion::saveAsText(CBDynBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE"); int i; - for (i = 0; i < _scripts.GetSize(); i++) { + for (i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } if (_scProp) _scProp->saveAsText(buffer, indent + 2); - for (i = 0; i < _points.GetSize(); i++) { + for (i = 0; i < _points.getSize(); i++) { buffer->putTextIndent(indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y); } diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp index 9ab669ba14..f2162012e0 100644 --- a/engines/wintermute/Ad/AdResponseBox.cpp +++ b/engines/wintermute/Ad/AdResponseBox.cpp @@ -94,25 +94,25 @@ CAdResponseBox::~CAdResponseBox() { ////////////////////////////////////////////////////////////////////////// void CAdResponseBox::clearResponses() { - for (int i = 0; i < _responses.GetSize(); i++) { + for (int i = 0; i < _responses.getSize(); i++) { delete _responses[i]; } - _responses.RemoveAll(); + _responses.removeAll(); } ////////////////////////////////////////////////////////////////////////// void CAdResponseBox::clearButtons() { - for (int i = 0; i < _respButtons.GetSize(); i++) { + for (int i = 0; i < _respButtons.getSize(); i++) { delete _respButtons[i]; } - _respButtons.RemoveAll(); + _respButtons.removeAll(); } ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdResponseBox::invalidateButtons() { - for (int i = 0; i < _respButtons.GetSize(); i++) { + for (int i = 0; i < _respButtons.getSize(); i++) { _respButtons[i]->_image = NULL; _respButtons[i]->_cursor = NULL; _respButtons[i]->_font = NULL; @@ -129,7 +129,7 @@ ERRORCODE CAdResponseBox::createButtons() { clearButtons(); _scrollOffset = 0; - for (int i = 0; i < _responses.GetSize(); i++) { + for (int i = 0; i < _responses.getSize(); i++) { CUIButton *btn = new CUIButton(Game); if (btn) { btn->_parent = _window; @@ -172,7 +172,7 @@ ERRORCODE CAdResponseBox::createButtons() { //btn->SetListener(this, btn, _responses[i]->_iD); btn->setListener(this, btn, i); btn->_visible = false; - _respButtons.Add(btn); + _respButtons.add(btn); if (_responseArea.bottom - _responseArea.top < btn->_height) { Game->LOG(0, "Warning: Response '%s' is too high to be displayed within response box. Correcting.", _responses[i]->_text); @@ -325,7 +325,7 @@ ERRORCODE CAdResponseBox::loadBuffer(byte *buffer, bool complete) { } if (_window) { - for (int i = 0; i < _window->_widgets.GetSize(); i++) { + for (int i = 0; i < _window->_widgets.getSize(); i++) { if (!_window->_widgets[i]->_listenerObject) _window->_widgets[i]->setListener(this, _window->_widgets[i], 0); } @@ -411,7 +411,7 @@ ERRORCODE CAdResponseBox::display() { // shift down if needed if (!_horizontal) { int total_height = 0; - for (i = 0; i < _respButtons.GetSize(); i++) total_height += (_respButtons[i]->_height + _spacing); + for (i = 0; i < _respButtons.getSize(); i++) total_height += (_respButtons[i]->_height + _spacing); total_height -= _spacing; switch (_verticalAlign) { @@ -433,7 +433,7 @@ ERRORCODE CAdResponseBox::display() { // prepare response buttons bool scrollNeeded = false; - for (i = _scrollOffset; i < _respButtons.GetSize(); i++) { + for (i = _scrollOffset; i < _respButtons.getSize(); i++) { if ((_horizontal && xxx + _respButtons[i]->_width > rect.right) || (!_horizontal && yyy + _respButtons[i]->_height > rect.bottom)) { @@ -473,7 +473,7 @@ ERRORCODE CAdResponseBox::display() { // display response buttons - for (i = _scrollOffset; i < _respButtons.GetSize(); i++) { + for (i = _scrollOffset; i < _respButtons.getSize(); i++) { _respButtons[i]->display(); } @@ -539,12 +539,12 @@ ERRORCODE CAdResponseBox::persist(CBPersistMgr *persistMgr) { ERRORCODE CAdResponseBox::weedResponses() { CAdGame *adGame = (CAdGame *)Game; - for (int i = 0; i < _responses.GetSize(); i++) { + for (int i = 0; i < _responses.getSize(); i++) { switch (_responses[i]->_responseType) { case RESPONSE_ONCE: if (adGame->branchResponseUsed(_responses[i]->_iD)) { delete _responses[i]; - _responses.RemoveAt(i); + _responses.removeAt(i); i--; } break; @@ -552,7 +552,7 @@ ERRORCODE CAdResponseBox::weedResponses() { case RESPONSE_ONCE_GAME: if (adGame->gameResponseUsed(_responses[i]->_iD)) { delete _responses[i]; - _responses.RemoveAt(i); + _responses.removeAt(i); i--; } break; @@ -599,12 +599,12 @@ CBObject *CAdResponseBox::getNextAccessObject(CBObject *currObject) { CBArray objects; getObjects(objects, true); - if (objects.GetSize() == 0) return NULL; + if (objects.getSize() == 0) return NULL; else { if (currObject != NULL) { - for (int i = 0; i < objects.GetSize(); i++) { + for (int i = 0; i < objects.getSize(); i++) { if (objects[i] == currObject) { - if (i < objects.GetSize() - 1) return objects[i + 1]; + if (i < objects.getSize() - 1) return objects[i + 1]; else break; } } @@ -619,25 +619,25 @@ CBObject *CAdResponseBox::getPrevAccessObject(CBObject *currObject) { CBArray objects; getObjects(objects, true); - if (objects.GetSize() == 0) return NULL; + if (objects.getSize() == 0) return NULL; else { if (currObject != NULL) { - for (int i = objects.GetSize() - 1; i >= 0; i--) { + for (int i = objects.getSize() - 1; i >= 0; i--) { if (objects[i] == currObject) { if (i > 0) return objects[i - 1]; else break; } } } - return objects[objects.GetSize() - 1]; + return objects[objects.getSize() - 1]; } return NULL; } ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdResponseBox::getObjects(CBArray &objects, bool interactiveOnly) { - for (int i = 0; i < _respButtons.GetSize(); i++) { - objects.Add(_respButtons[i]); + for (int i = 0; i < _respButtons.getSize(); i++) { + objects.add(_respButtons[i]); } if (_window) _window->getWindowObjects(objects, interactiveOnly); diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index c6a3b971ed..f674e92274 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -149,32 +149,32 @@ void CAdScene::cleanup() { Game->unregisterObject(_fader); _fader = NULL; - for (i = 0; i < _layers.GetSize(); i++) + for (i = 0; i < _layers.getSize(); i++) Game->unregisterObject(_layers[i]); - _layers.RemoveAll(); + _layers.removeAll(); - for (i = 0; i < _waypointGroups.GetSize(); i++) + for (i = 0; i < _waypointGroups.getSize(); i++) Game->unregisterObject(_waypointGroups[i]); - _waypointGroups.RemoveAll(); + _waypointGroups.removeAll(); - for (i = 0; i < _scaleLevels.GetSize(); i++) + for (i = 0; i < _scaleLevels.getSize(); i++) Game->unregisterObject(_scaleLevels[i]); - _scaleLevels.RemoveAll(); + _scaleLevels.removeAll(); - for (i = 0; i < _rotLevels.GetSize(); i++) + for (i = 0; i < _rotLevels.getSize(); i++) Game->unregisterObject(_rotLevels[i]); - _rotLevels.RemoveAll(); + _rotLevels.removeAll(); - for (i = 0; i < _pfPath.GetSize(); i++) + for (i = 0; i < _pfPath.getSize(); i++) delete _pfPath[i]; - _pfPath.RemoveAll(); + _pfPath.removeAll(); _pfPointsNum = 0; - for (i = 0; i < _objects.GetSize(); i++) + for (i = 0; i < _objects.getSize(); i++) Game->unregisterObject(_objects[i]); - _objects.RemoveAll(); + _objects.removeAll(); delete _viewport; _viewport = NULL; @@ -200,7 +200,7 @@ bool CAdScene::getPath(CBPoint source, CBPoint target, CAdPath *path, CBObject * pfPointsStart(); // first point - //_pfPath.Add(new CAdPathPoint(source.x, source.y, 0)); + //_pfPath.add(new CAdPathPoint(source.x, source.y, 0)); // if we're one pixel stuck, get unstuck int startX = source.x; @@ -228,11 +228,11 @@ bool CAdScene::getPath(CBPoint source, CBPoint target, CAdPath *path, CBObject * //CorrectTargetPoint(&target.x, &target.y); // last point - //_pfPath.Add(new CAdPathPoint(target.x, target.y, INT_MAX)); + //_pfPath.add(new CAdPathPoint(target.x, target.y, INT_MAX)); pfPointsAdd(target.x, target.y, INT_MAX); // active waypoints - for (i = 0; i < _waypointGroups.GetSize(); i++) { + for (i = 0; i < _waypointGroups.getSize(); i++) { if (_waypointGroups[i]->_active) { pfAddWaypointGroup(_waypointGroups[i], requester); } @@ -240,13 +240,13 @@ bool CAdScene::getPath(CBPoint source, CBPoint target, CAdPath *path, CBObject * // free waypoints - for (i = 0; i < _objects.GetSize(); i++) { + for (i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentWptGroup) { pfAddWaypointGroup(_objects[i]->_currentWptGroup, requester); } } CAdGame *adGame = (CAdGame *)Game; - for (i = 0; i < adGame->_objects.GetSize(); i++) { + for (i = 0; i < adGame->_objects.getSize(); i++) { if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentWptGroup) { pfAddWaypointGroup(adGame->_objects[i]->_currentWptGroup, requester); } @@ -261,10 +261,10 @@ bool CAdScene::getPath(CBPoint source, CBPoint target, CAdPath *path, CBObject * void CAdScene::pfAddWaypointGroup(CAdWaypointGroup *wpt, CBObject *requester) { if (!wpt->_active) return; - for (int i = 0; i < wpt->_points.GetSize(); i++) { + for (int i = 0; i < wpt->_points.getSize(); i++) { if (isBlockedAt(wpt->_points[i]->x, wpt->_points[i]->y, true, requester)) continue; - //_pfPath.Add(new CAdPathPoint(Wpt->_points[i]->x, Wpt->_points[i]->y, INT_MAX)); + //_pfPath.add(new CAdPathPoint(Wpt->_points[i]->x, Wpt->_points[i]->y, INT_MAX)); pfPointsAdd(wpt->_points[i]->x, wpt->_points[i]->y, INT_MAX); } } @@ -276,7 +276,7 @@ float CAdScene::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.getSize() - 1; i >= 0; i--) { CAdSceneNode *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) { @@ -302,7 +302,7 @@ uint32 CAdScene::getAlphaAt(int x, int y, bool colorCheck) { else ret = 0xFFFFFFFF; if (_mainLayer) { - for (int i = _mainLayer->_nodes.GetSize() - 1; i >= 0; i--) { + for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) { CAdSceneNode *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) ret = node->_region->_alpha; @@ -320,13 +320,13 @@ bool CAdScene::isBlockedAt(int x, int y, bool checkFreeObjects, CBObject *reques if (checkFreeObjects) { - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentBlockRegion) { if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return true; } } CAdGame *adGame = (CAdGame *)Game; - for (int i = 0; i < adGame->_objects.GetSize(); i++) { + for (int i = 0; i < adGame->_objects.getSize(); i++) { if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentBlockRegion) { if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return true; } @@ -335,7 +335,7 @@ bool CAdScene::isBlockedAt(int x, int y, bool checkFreeObjects, CBObject *reques if (_mainLayer) { - for (int i = 0; i < _mainLayer->_nodes.GetSize(); i++) { + for (int i = 0; i < _mainLayer->_nodes.getSize(); i++) { CAdSceneNode *node = _mainLayer->_nodes[i]; /* if (Node->_type == OBJECT_REGION && Node->_region->_active && Node->_region->_blocked && Node->_region->PointInRegion(X, Y)) @@ -361,13 +361,13 @@ bool CAdScene::isWalkableAt(int x, int y, bool checkFreeObjects, CBObject *reque bool ret = false; if (checkFreeObjects) { - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentBlockRegion) { if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return false; } } CAdGame *adGame = (CAdGame *)Game; - for (int i = 0; i < adGame->_objects.GetSize(); i++) { + for (int i = 0; i < adGame->_objects.getSize(); i++) { if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentBlockRegion) { if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return false; } @@ -376,7 +376,7 @@ bool CAdScene::isWalkableAt(int x, int y, bool checkFreeObjects, CBObject *reque if (_mainLayer) { - for (int i = 0; i < _mainLayer->_nodes.GetSize(); i++) { + for (int i = 0; i < _mainLayer->_nodes.getSize(); i++) { CAdSceneNode *node = _mainLayer->_nodes[i]; if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_decoration && node->_region->pointInRegion(x, y)) { if (node->_region->_blocked) { @@ -459,7 +459,7 @@ void CAdScene::pathFinderStep() { // target point marked, generate path and terminate if (lowestPt->x == _pfTarget->x && lowestPt->y == _pfTarget->y) { while (lowestPt != NULL) { - _pfTargetPath->_points.InsertAt(0, new CBPoint(lowestPt->x, lowestPt->y)); + _pfTargetPath->_points.insertAt(0, new CBPoint(lowestPt->x, lowestPt->y)); lowestPt = lowestPt->_origin; } @@ -646,7 +646,7 @@ ERRORCODE CAdScene::loadBuffer(byte *buffer, bool complete) { layer = NULL; } else { Game->registerObject(layer); - _layers.Add(layer); + _layers.add(layer); if (layer->_main) { _mainLayer = layer; _width = layer->_width; @@ -664,7 +664,7 @@ ERRORCODE CAdScene::loadBuffer(byte *buffer, bool complete) { wpt = NULL; } else { Game->registerObject(wpt); - _waypointGroups.Add(wpt); + _waypointGroups.add(wpt); } } break; @@ -677,7 +677,7 @@ ERRORCODE CAdScene::loadBuffer(byte *buffer, bool complete) { sl = NULL; } else { Game->registerObject(sl); - _scaleLevels.Add(sl); + _scaleLevels.add(sl); } } break; @@ -690,7 +690,7 @@ ERRORCODE CAdScene::loadBuffer(byte *buffer, bool complete) { rl = NULL; } else { Game->registerObject(rl); - _rotLevels.Add(rl); + _rotLevels.add(rl); } } break; @@ -943,7 +943,7 @@ ERRORCODE CAdScene::traverseNodes(bool doUpdate) { /* int MainOffsetX = 0; */ /* int MainOffsetY = 0; */ - for (j = 0; j < _layers.GetSize(); j++) { + for (j = 0; j < _layers.getSize(); j++) { if (!_layers[j]->_active) continue; // make layer exclusive @@ -977,7 +977,7 @@ ERRORCODE CAdScene::traverseNodes(bool doUpdate) { // for each node - for (k = 0; k < _layers[j]->_nodes.GetSize(); k++) { + for (k = 0; k < _layers[j]->_nodes.getSize(); k++) { CAdSceneNode *node = _layers[j]->_nodes[k]; switch (node->_type) { case OBJECT_ENTITY: @@ -1041,7 +1041,7 @@ ERRORCODE CAdScene::updateFreeObjects() { // *** update all active objects is3DSet = false; - for (int i = 0; i < adGame->_objects.GetSize(); i++) { + for (int i = 0; i < adGame->_objects.getSize(); i++) { if (!adGame->_objects[i]->_active) continue; adGame->_objects[i]->update(); @@ -1049,7 +1049,7 @@ ERRORCODE CAdScene::updateFreeObjects() { } - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (!_objects[i]->_active) continue; _objects[i]->update(); @@ -1073,26 +1073,26 @@ ERRORCODE CAdScene::displayRegionContent(CAdRegion *region, bool display3DOnly) CAdObject *obj; // global objects - for (int i = 0; i < adGame->_objects.GetSize(); i++) { + for (int i = 0; i < adGame->_objects.getSize(); 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); + objects.add(obj); } } // scene objects - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); 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); + objects.add(obj); } } // sort by _posY - qsort(objects.GetData(), objects.GetSize(), sizeof(CAdObject *), CAdScene::compareObjs); + qsort(objects.getData(), objects.getSize(), sizeof(CAdObject *), CAdScene::compareObjs); // display them - for (int i = 0; i < objects.GetSize(); i++) { + for (int i = 0; i < objects.getSize(); i++) { obj = objects[i]; if (display3DOnly && !obj->_is3D) continue; @@ -1107,7 +1107,7 @@ ERRORCODE CAdScene::displayRegionContent(CAdRegion *region, bool display3DOnly) // display design only objects if (!display3DOnly) { if (Game->_editorMode && region == NULL) { - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_active && _objects[i]->_editorOnly) { _objects[i]->display(); _objects[i]->_drawn = true; @@ -1140,7 +1140,7 @@ ERRORCODE CAdScene::displayRegionContentOld(CAdRegion *region) { int minY = INT_MAX; // global objects - for (int i = 0; i < adGame->_objects.GetSize(); i++) { + for (int i = 0; i < adGame->_objects.getSize(); 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; @@ -1148,7 +1148,7 @@ ERRORCODE CAdScene::displayRegionContentOld(CAdRegion *region) { } // scene objects - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); 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; @@ -1167,7 +1167,7 @@ ERRORCODE CAdScene::displayRegionContentOld(CAdRegion *region) { // design only objects if (Game->_editorMode && region == NULL) { - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_active && _objects[i]->_editorOnly) { _objects[i]->display(); _objects[i]->_drawn = true; @@ -1344,12 +1344,12 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t CScValue *val = stack->pop(); if (val->isInt()) { int layer = val->getInt(); - if (layer < 0 || layer >= _layers.GetSize()) stack->pushNULL(); + if (layer < 0 || layer >= _layers.getSize()) stack->pushNULL(); else stack->pushNative(_layers[layer], true); } else { const char *LayerName = val->getString(); bool LayerFound = false; - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { if (scumm_stricmp(LayerName, _layers[i]->_name) == 0) { stack->pushNative(_layers[i], true); LayerFound = true; @@ -1367,7 +1367,7 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t else if (strcmp(name, "GetWaypointGroup") == 0) { stack->correctParams(1); int group = stack->pop()->getInt(); - if (group < 0 || group >= _waypointGroups.GetSize()) stack->pushNULL(); + if (group < 0 || group >= _waypointGroups.getSize()) stack->pushNULL(); else stack->pushNative(_waypointGroups[group], true); return STATUS_OK; } @@ -1396,10 +1396,10 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t CAdObject *ret = NULL; if (val->isInt()) { int index = val->getInt(); - if (index >= 0 && index < _objects.GetSize()) ret = _objects[index]; + if (index >= 0 && index < _objects.getSize()) ret = _objects[index]; } else { const char *nodeName = val->getString(); - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i] && _objects[i]->_name && scumm_stricmp(_objects[i]->_name, nodeName) == 0) { ret = _objects[i]; break; @@ -1425,7 +1425,7 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t if (!val->isNULL()) includeDecors = val->getBool(); if (_mainLayer) { - for (int i = _mainLayer->_nodes.GetSize() - 1; i >= 0; i--) { + for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) { CAdSceneNode *node = _mainLayer->_nodes[i]; if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->pointInRegion(x, y)) { if (node->_region->_decoration && !includeDecors) continue; @@ -1591,7 +1591,7 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t layer->_width = _mainLayer->_width; layer->_height = _mainLayer->_height; } - _layers.Add(layer); + _layers.add(layer); Game->registerObject(layer); stack->pushNative(layer, true); @@ -1613,8 +1613,8 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t layer->_height = _mainLayer->_height; } if (index < 0) index = 0; - if (index <= _layers.GetSize() - 1) _layers.InsertAt(index, layer); - else _layers.Add(layer); + if (index <= _layers.getSize() - 1) _layers.insertAt(index, layer); + else _layers.add(layer); Game->registerObject(layer); @@ -1632,7 +1632,7 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t CAdLayer *toDelete = NULL; if (val->isNative()) { CBScriptable *temp = val->getNative(); - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { if (_layers[i] == temp) { toDelete = _layers[i]; break; @@ -1640,7 +1640,7 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t } } else { int index = val->getInt(); - if (index >= 0 && index < _layers.GetSize()) { + if (index >= 0 && index < _layers.getSize()) { toDelete = _layers[index]; } } @@ -1655,9 +1655,9 @@ ERRORCODE CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *t return STATUS_OK; } - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { if (_layers[i] == toDelete) { - _layers.RemoveAt(i); + _layers.removeAt(i); Game->unregisterObject(toDelete); break; } @@ -1686,7 +1686,7 @@ CScValue *CAdScene::scGetProperty(const char *name) { // NumLayers (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumLayers") == 0) { - _scValue->setInt(_layers.GetSize()); + _scValue->setInt(_layers.getSize()); return _scValue; } @@ -1694,7 +1694,7 @@ CScValue *CAdScene::scGetProperty(const char *name) { // NumWaypointGroups (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumWaypointGroups") == 0) { - _scValue->setInt(_waypointGroups.GetSize()); + _scValue->setInt(_waypointGroups.getSize()); return _scValue; } @@ -1712,7 +1712,7 @@ CScValue *CAdScene::scGetProperty(const char *name) { // NumFreeNodes (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumFreeNodes") == 0) { - _scValue->setInt(_objects.GetSize()); + _scValue->setInt(_objects.getSize()); return _scValue; } @@ -1943,16 +1943,16 @@ const char *CAdScene::scToString() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdScene::addObject(CAdObject *object) { - _objects.Add(object); + _objects.add(object); return Game->registerObject(object); } ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdScene::removeObject(CAdObject *object) { - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i] == object) { - _objects.RemoveAt(i); + _objects.removeAt(i); return Game->unregisterObject(object); } } @@ -1977,7 +1977,7 @@ ERRORCODE CAdScene::saveAsText(CBDynBuffer *buffer, int indent) { // scripts - for (i = 0; i < _scripts.GetSize(); i++) { + for (i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } @@ -2023,28 +2023,28 @@ ERRORCODE CAdScene::saveAsText(CBDynBuffer *buffer, int indent) { // waypoints buffer->putTextIndent(indent + 2, "; ----- waypoints\n"); - for (i = 0; i < _waypointGroups.GetSize(); i++) _waypointGroups[i]->saveAsText(buffer, indent + 2); + for (i = 0; i < _waypointGroups.getSize(); i++) _waypointGroups[i]->saveAsText(buffer, indent + 2); buffer->putTextIndent(indent + 2, "\n"); // layers buffer->putTextIndent(indent + 2, "; ----- layers\n"); - for (i = 0; i < _layers.GetSize(); i++) _layers[i]->saveAsText(buffer, indent + 2); + for (i = 0; i < _layers.getSize(); i++) _layers[i]->saveAsText(buffer, indent + 2); // scale levels buffer->putTextIndent(indent + 2, "; ----- scale levels\n"); - for (i = 0; i < _scaleLevels.GetSize(); i++) _scaleLevels[i]->saveAsText(buffer, indent + 2); + for (i = 0; i < _scaleLevels.getSize(); i++) _scaleLevels[i]->saveAsText(buffer, indent + 2); // rotation levels buffer->putTextIndent(indent + 2, "; ----- rotation levels\n"); - for (i = 0; i < _rotLevels.GetSize(); i++) _rotLevels[i]->saveAsText(buffer, indent + 2); + for (i = 0; i < _rotLevels.getSize(); i++) _rotLevels[i]->saveAsText(buffer, indent + 2); buffer->putTextIndent(indent + 2, "\n"); // free entities buffer->putTextIndent(indent + 2, "; ----- free entities\n"); - for (i = 0; i < _objects.GetSize(); i++) { + for (i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_type == OBJECT_ENTITY) { _objects[i]->saveAsText(buffer, indent + 2); @@ -2063,7 +2063,7 @@ ERRORCODE CAdScene::sortScaleLevels() { bool changed; do { changed = false; - for (int i = 0; i < _scaleLevels.GetSize() - 1; i++) { + for (int i = 0; i < _scaleLevels.getSize() - 1; i++) { if (_scaleLevels[i]->_posY > _scaleLevels[i + 1]->_posY) { CAdScaleLevel *sl = _scaleLevels[i]; _scaleLevels[i] = _scaleLevels[i + 1]; @@ -2084,7 +2084,7 @@ ERRORCODE CAdScene::sortRotLevels() { bool changed; do { changed = false; - for (int i = 0; i < _rotLevels.GetSize() - 1; i++) { + for (int i = 0; i < _rotLevels.getSize() - 1; i++) { if (_rotLevels[i]->_posX > _rotLevels[i + 1]->_posX) { CAdRotLevel *rl = _rotLevels[i]; _rotLevels[i] = _rotLevels[i + 1]; @@ -2105,9 +2105,9 @@ float CAdScene::getScaleAt(int Y) { CAdScaleLevel *prev = NULL; CAdScaleLevel *next = NULL; - for (int i = 0; i < _scaleLevels.GetSize(); i++) { + for (int i = 0; i < _scaleLevels.getSize(); i++) { /* CAdScaleLevel *xxx = _scaleLevels[i];*/ - /* int j = _scaleLevels.GetSize(); */ + /* int j = _scaleLevels.getSize(); */ if (_scaleLevels[i]->_posY < Y) prev = _scaleLevels[i]; else { next = _scaleLevels[i]; @@ -2335,8 +2335,8 @@ void CAdScene::pfPointsStart() { ////////////////////////////////////////////////////////////////////////// void CAdScene::pfPointsAdd(int x, int y, int distance) { - if (_pfPointsNum >= _pfPath.GetSize()) { - _pfPath.Add(new CAdPathPoint(x, y, distance)); + if (_pfPointsNum >= _pfPath.getSize()) { + _pfPath.add(new CAdPathPoint(x, y, distance)); } else { _pfPath[_pfPointsNum]->x = x; _pfPath[_pfPointsNum]->y = y; @@ -2424,9 +2424,9 @@ CBObject *CAdScene::getNodeByName(const char *name) { CBObject *ret = NULL; // dependent objects - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { CAdLayer *layer = _layers[i]; - for (int j = 0; j < layer->_nodes.GetSize(); j++) { + for (int j = 0; j < layer->_nodes.getSize(); j++) { CAdSceneNode *node = layer->_nodes[j]; if ((node->_type == OBJECT_ENTITY && !scumm_stricmp(name, node->_entity->_name)) || (node->_type == OBJECT_REGION && !scumm_stricmp(name, node->_region->_name))) { @@ -2446,14 +2446,14 @@ CBObject *CAdScene::getNodeByName(const char *name) { } // free entities - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_type == OBJECT_ENTITY && !scumm_stricmp(name, _objects[i]->_name)) { return _objects[i]; } } // waypoint groups - for (int i = 0; i < _waypointGroups.GetSize(); i++) { + for (int i = 0; i < _waypointGroups.getSize(); i++) { if (!scumm_stricmp(name, _waypointGroups[i]->_name)) { return _waypointGroups[i]; } @@ -2486,9 +2486,9 @@ ERRORCODE CAdScene::persistState(bool saving) { CAdNodeState *nodeState; // dependent objects - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { CAdLayer *layer = _layers[i]; - for (int j = 0; j < layer->_nodes.GetSize(); j++) { + for (int j = 0; j < layer->_nodes.getSize(); j++) { CAdSceneNode *node = layer->_nodes[j]; switch (node->_type) { case OBJECT_ENTITY: @@ -2516,7 +2516,7 @@ ERRORCODE CAdScene::persistState(bool saving) { } // free entities - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (!_objects[i]->_saveState) continue; if (_objects[i]->_type == OBJECT_ENTITY) { nodeState = state->getNodeState(_objects[i]->_name, saving); @@ -2529,7 +2529,7 @@ ERRORCODE CAdScene::persistState(bool saving) { } // waypoint groups - for (int i = 0; i < _waypointGroups.GetSize(); i++) { + for (int i = 0; i < _waypointGroups.getSize(); i++) { nodeState = state->getNodeState(_waypointGroups[i]->_name, saving); if (nodeState) { if (saving) nodeState->_active = _waypointGroups[i]->_active; @@ -2546,9 +2546,9 @@ float CAdScene::getRotationAt(int x, int y) { CAdRotLevel *prev = NULL; CAdRotLevel *next = NULL; - for (int i = 0; i < _rotLevels.GetSize(); i++) { + for (int i = 0; i < _rotLevels.getSize(); i++) { /* CAdRotLevel *xxx = _rotLevels[i]; - int j = _rotLevels.GetSize();*/ + int j = _rotLevels.getSize();*/ if (_rotLevels[i]->_posX < x) prev = _rotLevels[i]; else { next = _rotLevels[i]; @@ -2569,9 +2569,9 @@ float CAdScene::getRotationAt(int x, int y) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdScene::handleItemAssociations(const char *itemName, bool show) { - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { CAdLayer *layer = _layers[i]; - for (int j = 0; j < layer->_nodes.GetSize(); j++) { + for (int j = 0; j < layer->_nodes.getSize(); j++) { if (layer->_nodes[j]->_type == OBJECT_ENTITY) { CAdEntity *ent = layer->_nodes[j]->_entity; @@ -2580,7 +2580,7 @@ ERRORCODE CAdScene::handleItemAssociations(const char *itemName, bool show) { } } - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); i++) { if (_objects[i]->_type == OBJECT_ENTITY) { CAdEntity *ent = (CAdEntity *)_objects[i]; if (ent->_item && strcmp(ent->_item, itemName) == 0) ent->_active = show; @@ -2595,7 +2595,7 @@ ERRORCODE CAdScene::handleItemAssociations(const char *itemName, bool show) { ERRORCODE CAdScene::getRegionsAt(int x, int y, CAdRegion **regionList, int numRegions) { int numUsed = 0; if (_mainLayer) { - for (int i = _mainLayer->_nodes.GetSize() - 1; i >= 0; i--) { + for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) { CAdSceneNode *node = _mainLayer->_nodes[i]; if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->pointInRegion(x, y)) { if (numUsed < numRegions - 1) { @@ -2623,12 +2623,12 @@ CBObject *CAdScene::getNextAccessObject(CBObject *currObject) { CBArray objects; getSceneObjects(objects, true); - if (objects.GetSize() == 0) return NULL; + if (objects.getSize() == 0) return NULL; else { if (currObject != NULL) { - for (int i = 0; i < objects.GetSize(); i++) { + for (int i = 0; i < objects.getSize(); i++) { if (objects[i] == currObject) { - if (i < objects.GetSize() - 1) return objects[i + 1]; + if (i < objects.getSize() - 1) return objects[i + 1]; else break; } } @@ -2643,17 +2643,17 @@ CBObject *CAdScene::getPrevAccessObject(CBObject *currObject) { CBArray objects; getSceneObjects(objects, true); - if (objects.GetSize() == 0) return NULL; + if (objects.getSize() == 0) return NULL; else { if (currObject != NULL) { - for (int i = objects.GetSize() - 1; i >= 0; i--) { + for (int i = objects.getSize() - 1; i >= 0; i--) { if (objects[i] == currObject) { if (i > 0) return objects[i - 1]; else break; } } } - return objects[objects.GetSize() - 1]; + return objects[objects.getSize() - 1]; } return NULL; } @@ -2661,35 +2661,35 @@ CBObject *CAdScene::getPrevAccessObject(CBObject *currObject) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdScene::getSceneObjects(CBArray &objects, bool interactiveOnly) { - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { // close-up layer -> remove everything below it - if (interactiveOnly && _layers[i]->_closeUp) objects.RemoveAll(); + if (interactiveOnly && _layers[i]->_closeUp) objects.removeAll(); - for (int j = 0; j < _layers[i]->_nodes.GetSize(); j++) { + for (int j = 0; j < _layers[i]->_nodes.getSize(); j++) { CAdSceneNode *node = _layers[i]->_nodes[j]; switch (node->_type) { case OBJECT_ENTITY: { CAdEntity *ent = node->_entity; if (ent->_active && (ent->_registrable || !interactiveOnly)) - objects.Add(ent); + objects.add(ent); } break; case OBJECT_REGION: { CBArray regionObj; getRegionObjects(node->_region, regionObj, interactiveOnly); - for (int newIndex = 0; newIndex < regionObj.GetSize(); newIndex++) { + for (int newIndex = 0; newIndex < regionObj.getSize(); newIndex++) { bool found = false; - for (int old = 0; old < objects.GetSize(); old++) { + for (int old = 0; old < objects.getSize(); old++) { if (objects[old] == regionObj[newIndex]) { found = true; break; } } - if (!found) objects.Add(regionObj[newIndex]); + if (!found) objects.add(regionObj[newIndex]); } - //if(RegionObj.GetSize() > 0) Objects.Append(RegionObj); + //if(RegionObj.getSize() > 0) Objects.Append(RegionObj); } break; default: @@ -2702,15 +2702,15 @@ ERRORCODE CAdScene::getSceneObjects(CBArray &objects, // objects outside any region CBArray regionObj; getRegionObjects(NULL, regionObj, interactiveOnly); - for (int newIndex = 0; newIndex < regionObj.GetSize(); newIndex++) { + for (int newIndex = 0; newIndex < regionObj.getSize(); newIndex++) { bool found = false; - for (int old = 0; old < objects.GetSize(); old++) { + for (int old = 0; old < objects.getSize(); old++) { if (objects[old] == regionObj[newIndex]) { found = true; break; } } - if (!found) objects.Add(regionObj[newIndex]); + if (!found) objects.add(regionObj[newIndex]); } @@ -2724,27 +2724,27 @@ ERRORCODE CAdScene::getRegionObjects(CAdRegion *region, CBArray_objects.GetSize(); i++) { + for (int i = 0; i < adGame->_objects.getSize(); 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) continue; - objects.Add(obj); + objects.add(obj); } } // scene objects - for (int i = 0; i < _objects.GetSize(); i++) { + for (int i = 0; i < _objects.getSize(); 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) continue; - objects.Add(obj); + objects.add(obj); } } // sort by _posY - qsort(objects.GetData(), objects.GetSize(), sizeof(CAdObject *), CAdScene::compareObjs); + qsort(objects.getData(), objects.getSize(), sizeof(CAdObject *), CAdScene::compareObjs); return STATUS_OK; } diff --git a/engines/wintermute/Ad/AdSceneState.cpp b/engines/wintermute/Ad/AdSceneState.cpp index 9778e8919d..00b1b6c250 100644 --- a/engines/wintermute/Ad/AdSceneState.cpp +++ b/engines/wintermute/Ad/AdSceneState.cpp @@ -48,8 +48,8 @@ CAdSceneState::~CAdSceneState() { delete[] _filename; _filename = NULL; - for (int i = 0; i < _nodeStates.GetSize(); i++) delete _nodeStates[i]; - _nodeStates.RemoveAll(); + for (int i = 0; i < _nodeStates.getSize(); i++) delete _nodeStates[i]; + _nodeStates.removeAll(); } @@ -72,14 +72,14 @@ void CAdSceneState::setFilename(const char *filename) { ////////////////////////////////////////////////////////////////////////// CAdNodeState *CAdSceneState::getNodeState(char *name, bool saving) { - for (int i = 0; i < _nodeStates.GetSize(); i++) { + for (int i = 0; i < _nodeStates.getSize(); i++) { if (scumm_stricmp(_nodeStates[i]->_name, name) == 0) return _nodeStates[i]; } if (saving) { CAdNodeState *ret = new CAdNodeState(Game); ret->setName(name); - _nodeStates.Add(ret); + _nodeStates.add(ret); return ret; } else return NULL; diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp index 341f47a503..ed43630e0c 100644 --- a/engines/wintermute/Ad/AdSentence.cpp +++ b/engines/wintermute/Ad/AdSentence.cpp @@ -283,7 +283,7 @@ ERRORCODE CAdSentence::update(TDirection dir) { currentTime = Game->_timer - _startTime; bool talkNodeFound = false; - for (int i = 0; i < _talkDef->_nodes.GetSize(); i++) { + for (int i = 0; i < _talkDef->_nodes.getSize(); i++) { if (_talkDef->_nodes[i]->isInTimeInterval(currentTime, dir)) { talkNodeFound = true; diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp index 0f16241e99..62b6ea8b67 100644 --- a/engines/wintermute/Ad/AdTalkDef.cpp +++ b/engines/wintermute/Ad/AdTalkDef.cpp @@ -53,8 +53,8 @@ CAdTalkDef::CAdTalkDef(CBGame *inGame): CBObject(inGame) { ////////////////////////////////////////////////////////////////////////// CAdTalkDef::~CAdTalkDef() { - for (int i = 0; i < _nodes.GetSize(); i++) delete _nodes[i]; - _nodes.RemoveAll(); + for (int i = 0; i < _nodes.getSize(); i++) delete _nodes[i]; + _nodes.removeAll(); delete[] _defaultSpriteFilename; delete _defaultSprite; @@ -129,7 +129,7 @@ ERRORCODE CAdTalkDef::loadBuffer(byte *buffer, bool complete) { case TOKEN_ACTION: { CAdTalkNode *Node = new CAdTalkNode(Game); - if (Node && DID_SUCCEED(Node->loadBuffer(params, false))) _nodes.Add(Node); + if (Node && DID_SUCCEED(Node->loadBuffer(params, false))) _nodes.add(Node); else { delete Node; Node = NULL; @@ -217,7 +217,7 @@ ERRORCODE CAdTalkDef::saveAsText(CBDynBuffer *buffer, int indent) { if (_defaultSpriteSetFilename) buffer->putTextIndent(indent + 2, "DEFAULT_SPRITESET_FILE=\"%s\"\n", _defaultSpriteSetFilename); else if (_defaultSpriteSet) _defaultSpriteSet->saveAsText(buffer, indent + 2); - for (int i = 0; i < _nodes.GetSize(); i++) { + for (int i = 0; i < _nodes.getSize(); i++) { _nodes[i]->saveAsText(buffer, indent + 2); buffer->putTextIndent(indent, "\n"); } diff --git a/engines/wintermute/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp index 5e25431d1a..eb4860b5d6 100644 --- a/engines/wintermute/Ad/AdTalkHolder.cpp +++ b/engines/wintermute/Ad/AdTalkHolder.cpp @@ -53,13 +53,13 @@ CAdTalkHolder::~CAdTalkHolder() { delete _sprite; _sprite = NULL; - for (int i = 0; i < _talkSprites.GetSize(); i++) + for (int i = 0; i < _talkSprites.getSize(); i++) delete _talkSprites[i]; - _talkSprites.RemoveAll(); + _talkSprites.removeAll(); - for (int i = 0; i < _talkSpritesEx.GetSize(); i++) + for (int i = 0; i < _talkSpritesEx.getSize(); i++) delete _talkSpritesEx[i]; - _talkSpritesEx.RemoveAll(); + _talkSpritesEx.removeAll(); } ////////////////////////////////////////////////////////////////////////// @@ -85,7 +85,7 @@ CBSprite *CAdTalkHolder::getTalkStance(const char *stance) { if (stance != NULL) { // search special talk stances - for (int i = 0; i < _talkSpritesEx.GetSize(); i++) { + for (int i = 0; i < _talkSpritesEx.getSize(); i++) { if (scumm_stricmp(_talkSpritesEx[i]->_name, stance) == 0) { ret = _talkSpritesEx[i]; break; @@ -93,7 +93,7 @@ CBSprite *CAdTalkHolder::getTalkStance(const char *stance) { } if (ret == NULL) { // serach generic talk stances - for (int i = 0; i < _talkSprites.GetSize(); i++) { + for (int i = 0; i < _talkSprites.getSize(); i++) { if (scumm_stricmp(_talkSprites[i]->_name, stance) == 0) { ret = _talkSprites[i]; break; @@ -104,10 +104,10 @@ CBSprite *CAdTalkHolder::getTalkStance(const char *stance) { // not a valid stance? get a random one if (ret == NULL) { - if (_talkSprites.GetSize() < 1) ret = _sprite; + if (_talkSprites.getSize() < 1) ret = _sprite; else { // TODO: remember last - int rnd = g_wintermute->randInt(0, _talkSprites.GetSize() - 1); + int rnd = g_wintermute->randInt(0, _talkSprites.getSize() - 1); ret = _talkSprites[rnd]; } } @@ -189,8 +189,8 @@ ERRORCODE CAdTalkHolder::scCallMethod(CScScript *script, CScStack *stack, CScSta stack->pushBool(false); script->runtimeError("AddTalkSprite method failed for file '%s'", filename); } else { - if (Ex) _talkSpritesEx.Add(spr); - else _talkSprites.Add(spr); + if (Ex) _talkSpritesEx.add(spr); + else _talkSprites.add(spr); stack->pushBool(true); } return STATUS_OK; @@ -209,26 +209,26 @@ ERRORCODE CAdTalkHolder::scCallMethod(CScScript *script, CScStack *stack, CScSta bool setTemp2 = false; if (ex) { - for (int i = 0; i < _talkSpritesEx.GetSize(); i++) { + for (int i = 0; i < _talkSpritesEx.getSize(); i++) { if (scumm_stricmp(_talkSpritesEx[i]->_filename, filename) == 0) { if (_currentSprite == _talkSpritesEx[i]) setCurrent = true; if (_tempSprite2 == _talkSpritesEx[i]) setTemp2 = true; delete _talkSpritesEx[i]; - _talkSpritesEx.RemoveAt(i); + _talkSpritesEx.removeAt(i); break; } } } else { - for (int i = 0; i < _talkSprites.GetSize(); i++) { + for (int i = 0; i < _talkSprites.getSize(); i++) { if (scumm_stricmp(_talkSprites[i]->_filename, filename) == 0) { if (_currentSprite == _talkSprites[i]) setCurrent = true; if (_tempSprite2 == _talkSprites[i]) setTemp2 = true; delete _talkSprites[i]; - _talkSprites.RemoveAt(i); + _talkSprites.removeAt(i); break; } } @@ -263,28 +263,28 @@ ERRORCODE CAdTalkHolder::scCallMethod(CScScript *script, CScStack *stack, CScSta // delete current if (ex) { - for (int i = 0; i < _talkSpritesEx.GetSize(); i++) { + for (int i = 0; i < _talkSpritesEx.getSize(); i++) { if (_talkSpritesEx[i] == _currentSprite) setCurrent = true; if (_talkSpritesEx[i] == _tempSprite2) setTemp2 = true; delete _talkSpritesEx[i]; } - _talkSpritesEx.RemoveAll(); + _talkSpritesEx.removeAll(); } else { - for (int i = 0; i < _talkSprites.GetSize(); i++) { + for (int i = 0; i < _talkSprites.getSize(); i++) { if (_talkSprites[i] == _currentSprite) setCurrent = true; if (_talkSprites[i] == _tempSprite2) setTemp2 = true; delete _talkSprites[i]; } - _talkSprites.RemoveAll(); + _talkSprites.removeAll(); } // set new if (ex) - _talkSpritesEx.Add(spr); + _talkSpritesEx.add(spr); else - _talkSprites.Add(spr); + _talkSprites.add(spr); stack->pushBool(true); if (setCurrent) @@ -338,12 +338,12 @@ const char *CAdTalkHolder::scToString() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CAdTalkHolder::saveAsText(CBDynBuffer *buffer, int indent) { - for (int i = 0; i < _talkSprites.GetSize(); i++) { + for (int i = 0; i < _talkSprites.getSize(); i++) { if (_talkSprites[i]->_filename) buffer->putTextIndent(indent + 2, "TALK=\"%s\"\n", _talkSprites[i]->_filename); } - for (int i = 0; i < _talkSpritesEx.GetSize(); i++) { + for (int i = 0; i < _talkSpritesEx.getSize(); i++) { if (_talkSpritesEx[i]->_filename) buffer->putTextIndent(indent + 2, "TALK_SPECIAL=\"%s\"\n", _talkSpritesEx[i]->_filename); } diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp index e9e18e5101..4ad2dc1749 100644 --- a/engines/wintermute/Ad/AdWaypointGroup.cpp +++ b/engines/wintermute/Ad/AdWaypointGroup.cpp @@ -56,9 +56,9 @@ CAdWaypointGroup::~CAdWaypointGroup() { ////////////////////////////////////////////////////////////////////////// void CAdWaypointGroup::cleanup() { - for (int i = 0; i < _points.GetSize(); i++) + for (int i = 0; i < _points.getSize(); i++) delete _points[i]; - _points.RemoveAll(); + _points.removeAll(); _editorSelectedPoint = -1; } @@ -133,7 +133,7 @@ ERRORCODE CAdWaypointGroup::loadBuffer(byte *buffer, bool complete) { case TOKEN_POINT: { int x, y; parser.scanStr((char *)params, "%d,%d", &x, &y); - _points.Add(new CBPoint(x, y)); + _points.add(new CBPoint(x, y)); } break; @@ -174,7 +174,7 @@ ERRORCODE CAdWaypointGroup::saveAsText(CBDynBuffer *buffer, int indent) { _scProp->saveAsText(buffer, indent + 2); CBBase::saveAsText(buffer, indent + 2); - for (int i = 0; i < _points.GetSize(); i++) { + for (int i = 0; i < _points.getSize(); i++) { buffer->putTextIndent(indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y); } @@ -244,11 +244,11 @@ ERRORCODE CAdWaypointGroup::mimic(CAdWaypointGroup *wpt, float scale, int argX, cleanup(); - for (int i = 0; i < wpt->_points.GetSize(); i++) { + for (int i = 0; i < wpt->_points.getSize(); i++) { int x = (int)((float)wpt->_points[i]->x * scale / 100.0f); int y = (int)((float)wpt->_points[i]->y * scale / 100.0f); - _points.Add(new CBPoint(x + argX, y + argY)); + _points.add(new CBPoint(x + argX, y + argY)); } _lastMimicScale = scale; diff --git a/engines/wintermute/Base/BFileManager.cpp b/engines/wintermute/Base/BFileManager.cpp index 621089d803..706da2a93b 100644 --- a/engines/wintermute/Base/BFileManager.cpp +++ b/engines/wintermute/Base/BFileManager.cpp @@ -75,13 +75,13 @@ CBFileManager::~CBFileManager() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBFileManager::cleanup() { // delete registered paths - for (int i = 0; i < _singlePaths.GetSize(); i++) + for (int i = 0; i < _singlePaths.getSize(); i++) delete [] _singlePaths[i]; - _singlePaths.RemoveAll(); + _singlePaths.removeAll(); - for (int i = 0; i < _packagePaths.GetSize(); i++) + for (int i = 0; i < _packagePaths.getSize(); i++) delete [] _packagePaths[i]; - _packagePaths.RemoveAll(); + _packagePaths.removeAll(); // delete file entries @@ -93,16 +93,16 @@ ERRORCODE CBFileManager::cleanup() { _files.clear(); // close open files - for (int i = 0; i < _openFiles.GetSize(); i++) { + for (int i = 0; i < _openFiles.getSize(); i++) { delete _openFiles[i]; } - _openFiles.RemoveAll(); + _openFiles.removeAll(); // delete packages - for (int i = 0; i < _packages.GetSize(); i++) + for (int i = 0; i < _packages.getSize(); i++) delete _packages[i]; - _packages.RemoveAll(); + _packages.removeAll(); delete[] _basePath; _basePath = NULL; @@ -226,7 +226,7 @@ ERRORCODE CBFileManager::saveFile(const Common::String &filename, byte *Buffer, ////////////////////////////////////////////////////////////////////////// ERRORCODE CBFileManager::requestCD(int cd, char *packageFile, const char *filename) { // unmount all non-local packages - for (int i = 0; i < _packages.GetSize(); i++) { + for (int i = 0; i < _packages.getSize(); i++) { if (_packages[i]->_cD > 0) _packages[i]->close(); } @@ -250,10 +250,10 @@ ERRORCODE CBFileManager::addPath(TPathType type, const Common::String &path) { switch (type) { case PATH_SINGLE: - _singlePaths.Add(buffer); + _singlePaths.add(buffer); break; case PATH_PACKAGE: - _packagePaths.Add(buffer); + _packagePaths.add(buffer); break; } @@ -263,13 +263,13 @@ ERRORCODE CBFileManager::addPath(TPathType type, const Common::String &path) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBFileManager::reloadPaths() { // delete registered paths - for (int i = 0; i < _singlePaths.GetSize(); i++) + for (int i = 0; i < _singlePaths.getSize(); i++) delete [] _singlePaths[i]; - _singlePaths.RemoveAll(); + _singlePaths.removeAll(); - for (int i = 0; i < _packagePaths.GetSize(); i++) + for (int i = 0; i < _packagePaths.getSize(); i++) delete [] _packagePaths[i]; - _packagePaths.RemoveAll(); + _packagePaths.removeAll(); return initPaths(); } @@ -361,7 +361,7 @@ ERRORCODE CBFileManager::registerPackages() { #if 0 AnsiString extension = AnsiString(PACKAGE_EXTENSION); - for (int i = 0; i < _packagePaths.GetSize(); i++) { + for (int i = 0; i < _packagePaths.getSize(); i++) { boost::filesystem::path absPath = boost::filesystem::syste_complete(_packagePaths[i]); //Game->LOG(0, "Scanning: %s", absPath.string().c_str()); @@ -386,10 +386,10 @@ ERRORCODE CBFileManager::registerPackages() { } } #endif - warning(" Registered %d files in %d package(s)", _files.size(), _packages.GetSize()); - Game->LOG(0, " Registered %d files in %d package(s)", _files.size(), _packages.GetSize()); + warning(" Registered %d files in %d package(s)", _files.size(), _packages.getSize()); + Game->LOG(0, " Registered %d files in %d package(s)", _files.size(), _packages.getSize()); - warning(" Registered %d files in %d package(s)", _files.size(), _packages.GetSize()); + warning(" Registered %d files in %d package(s)", _files.size(), _packages.getSize()); return STATUS_OK; } @@ -453,7 +453,7 @@ ERRORCODE CBFileManager::registerPackage(const Common::String &filename , bool s pkg->_priority = hdr.Priority; if (!hdr.MasterIndex) pkg->_cD = 0; // override CD to fixed disk - _packages.Add(pkg); + _packages.add(pkg); // read file entries @@ -583,7 +583,7 @@ ERRORCODE CBFileManager::registerPackage(const char *Path, const char *name, boo pkg->_priority = hdr.Priority; if (!hdr.MasterIndex) pkg->_cD = 0; // override CD to fixed disk - _packages.Add(pkg); + _packages.add(pkg); // read file entries @@ -672,7 +672,7 @@ Common::File *CBFileManager::openPackage(const Common::String &name) { Common::File *ret = new Common::File(); char filename[MAX_PATH_LENGTH]; - for (int i = 0; i < _packagePaths.GetSize(); i++) { + for (int i = 0; i < _packagePaths.getSize(); i++) { sprintf(filename, "%s%s.%s", _packagePaths[i], name.c_str(), PACKAGE_EXTENSION); ret->open(filename); if (ret->isOpen()) { @@ -698,7 +698,7 @@ Common::File *CBFileManager::openSingleFile(const Common::String &name) { Common::File *ret = NULL; char filename[MAX_PATH_LENGTH]; - for (int i = 0; i < _singlePaths.GetSize(); i++) { + for (int i = 0; i < _singlePaths.getSize(); i++) { sprintf(filename, "%s%s", _singlePaths[i], name.c_str()); ret->open(filename); if (ret->isOpen()) @@ -723,7 +723,7 @@ bool CBFileManager::getFullPath(const Common::String &filename, char *fullname) Common::File f; bool found = false; - for (int i = 0; i < _singlePaths.GetSize(); i++) { + for (int i = 0; i < _singlePaths.getSize(); i++) { sprintf(fullname, "%s%s", _singlePaths[i], filename.c_str()); f.open(fullname); if (f.isOpen()) { @@ -786,17 +786,17 @@ Common::SeekableReadStream *CBFileManager::openFile(const Common::String &filena #endif*/ Common::SeekableReadStream *File = openFileRaw(filename); - if (File && keepTrackOf) _openFiles.Add(File); + if (File && keepTrackOf) _openFiles.add(File); return File; } ////////////////////////////////////////////////////////////////////////// ERRORCODE CBFileManager::closeFile(Common::SeekableReadStream *File) { - for (int i = 0; i < _openFiles.GetSize(); i++) { + for (int i = 0; i < _openFiles.getSize(); i++) { if (_openFiles[i] == File) { delete _openFiles[i]; - _openFiles.RemoveAt(i); + _openFiles.removeAt(i); return STATUS_OK; } } diff --git a/engines/wintermute/Base/BFontBitmap.cpp b/engines/wintermute/Base/BFontBitmap.cpp index 56e969d7e7..0af81f7ed4 100644 --- a/engines/wintermute/Base/BFontBitmap.cpp +++ b/engines/wintermute/Base/BFontBitmap.cpp @@ -231,8 +231,8 @@ void CBFontBitmap::drawChar(byte c, int x, int y) { bool handled = false; if (_sprite) { _sprite->GetCurrentFrame(); - if (_sprite->_currentFrame >= 0 && _sprite->_currentFrame < _sprite->_frames.GetSize() && _sprite->_frames[_sprite->_currentFrame]) { - if (_sprite->_frames[_sprite->_currentFrame]->_subframes.GetSize() > 0) { + if (_sprite->_currentFrame >= 0 && _sprite->_currentFrame < _sprite->_frames.getSize() && _sprite->_frames[_sprite->_currentFrame]) { + if (_sprite->_frames[_sprite->_currentFrame]->_subframes.getSize() > 0) { _sprite->_frames[_sprite->_currentFrame]->_subframes[0]->_surface->displayTrans(x, y, rect); } handled = true; @@ -491,8 +491,8 @@ ERRORCODE CBFontBitmap::getWidths() { CBSurface *surf = NULL; if (_sprite) { - if (_widthsFrame >= 0 && _widthsFrame < _sprite->_frames.GetSize()) { - if (_sprite->_frames[_widthsFrame] && _sprite->_frames[_widthsFrame]->_subframes.GetSize() > 0) { + if (_widthsFrame >= 0 && _widthsFrame < _sprite->_frames.getSize()) { + if (_sprite->_frames[_widthsFrame] && _sprite->_frames[_widthsFrame]->_subframes.getSize() > 0) { surf = _sprite->_frames[_widthsFrame]->_subframes[0]->_surface; } } diff --git a/engines/wintermute/Base/BFontStorage.cpp b/engines/wintermute/Base/BFontStorage.cpp index 7642a88bac..8b43510708 100644 --- a/engines/wintermute/Base/BFontStorage.cpp +++ b/engines/wintermute/Base/BFontStorage.cpp @@ -52,18 +52,18 @@ CBFontStorage::~CBFontStorage() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBFontStorage::cleanup(bool warn) { - for (int i = 0; i < _fonts.GetSize(); i++) { + for (int i = 0; i < _fonts.getSize(); i++) { if (warn) Game->LOG(0, "Removing orphan font '%s'", _fonts[i]->_filename); delete _fonts[i]; } - _fonts.RemoveAll(); + _fonts.removeAll(); return STATUS_OK; } ////////////////////////////////////////////////////////////////////////// ERRORCODE CBFontStorage::initLoop() { - for (int i = 0; i < _fonts.GetSize(); i++) { + for (int i = 0; i < _fonts.getSize(); i++) { _fonts[i]->initLoop(); } return STATUS_OK; @@ -73,7 +73,7 @@ ERRORCODE CBFontStorage::initLoop() { CBFont *CBFontStorage::addFont(const char *filename) { if (!filename) return NULL; - for (int i = 0; i < _fonts.GetSize(); i++) { + for (int i = 0; i < _fonts.getSize(); i++) { if (scumm_stricmp(_fonts[i]->_filename, filename) == 0) { _fonts[i]->_refCount++; return _fonts[i]; @@ -90,14 +90,14 @@ CBFont *CBFontStorage::addFont(const char *filename) { } else { font->_refCount = 1; - _fonts.Add(font); + _fonts.add(font); return font; } */ CBFont *font = CBFont::createFromFile(Game, filename); if (font) { font->_refCount = 1; - _fonts.Add(font); + _fonts.add(font); } return font; } @@ -107,12 +107,12 @@ CBFont *CBFontStorage::addFont(const char *filename) { ERRORCODE CBFontStorage::removeFont(CBFont *font) { if (!font) return STATUS_FAILED; - for (int i = 0; i < _fonts.GetSize(); i++) { + for (int i = 0; i < _fonts.getSize(); i++) { if (_fonts[i] == font) { _fonts[i]->_refCount--; if (_fonts[i]->_refCount <= 0) { delete _fonts[i]; - _fonts.RemoveAt(i); + _fonts.removeAt(i); } break; } diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp index 22f16a53f6..998aead064 100644 --- a/engines/wintermute/Base/BFontTT.cpp +++ b/engines/wintermute/Base/BFontTT.cpp @@ -73,10 +73,10 @@ CBFontTT::CBFontTT(CBGame *inGame): CBFont(inGame) { CBFontTT::~CBFontTT(void) { clearCache(); - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { delete _layers[i]; } - _layers.RemoveAll(); + _layers.removeAll(); delete[] _fontFile; _fontFile = NULL; @@ -219,7 +219,7 @@ void CBFontTT::drawText(byte *text, int x, int y, int width, TTextAlign align, i if (surface) { Common::Rect rc; CBPlatform::setRect(&rc, 0, 0, surface->getWidth(), surface->getHeight()); - for (int i = 0; i < _layers.GetSize(); i++) { + for (int i = 0; i < _layers.getSize(); i++) { uint32 color = _layers[i]->_color; uint32 origForceAlpha = _renderer->_forceAlphaColor; if (_renderer->_forceAlphaColor != 0) { @@ -518,7 +518,7 @@ ERRORCODE CBFontTT::loadBuffer(byte *buffer) { case TOKEN_LAYER: { CBTTFontLayer *Layer = new CBTTFontLayer; - if (Layer && DID_SUCCEED(parseLayer(Layer, (byte *)params))) _layers.Add(Layer); + if (Layer && DID_SUCCEED(parseLayer(Layer, (byte *)params))) _layers.add(Layer); else { delete Layer; Layer = NULL; @@ -535,10 +535,10 @@ ERRORCODE CBFontTT::loadBuffer(byte *buffer) { } // create at least one layer - if (_layers.GetSize() == 0) { + if (_layers.getSize() == 0) { CBTTFontLayer *Layer = new CBTTFontLayer; Layer->_color = BaseColor; - _layers.Add(Layer); + _layers.add(Layer); } if (!_fontFile) CBUtils::setString(&_fontFile, "arial.ttf"); @@ -605,16 +605,16 @@ ERRORCODE CBFontTT::persist(CBPersistMgr *persistMgr) { // persist layers int numLayers; if (persistMgr->_saving) { - numLayers = _layers.GetSize(); + numLayers = _layers.getSize(); persistMgr->transfer(TMEMBER(numLayers)); for (int i = 0; i < numLayers; i++) _layers[i]->persist(persistMgr); } else { - numLayers = _layers.GetSize(); + numLayers = _layers.getSize(); persistMgr->transfer(TMEMBER(numLayers)); for (int i = 0; i < numLayers; i++) { CBTTFontLayer *layer = new CBTTFontLayer; layer->persist(persistMgr); - _layers.Add(layer); + _layers.add(layer); } } diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp index 5f516c3735..7680671434 100644 --- a/engines/wintermute/Base/BFrame.cpp +++ b/engines/wintermute/Base/BFrame.cpp @@ -62,15 +62,15 @@ CBFrame::~CBFrame() { delete _sound; _sound = NULL; - for (int i = 0; i < _subframes.GetSize(); i++) + for (int i = 0; i < _subframes.getSize(); i++) delete _subframes[i]; - _subframes.RemoveAll(); + _subframes.removeAll(); - for (int i = 0; i < _applyEvent.GetSize(); i++) { + for (int i = 0; i < _applyEvent.getSize(); i++) { delete[] _applyEvent[i]; _applyEvent[i] = NULL; } - _applyEvent.RemoveAll(); + _applyEvent.removeAll(); } @@ -78,7 +78,7 @@ CBFrame::~CBFrame() { ERRORCODE CBFrame::draw(int x, int y, CBObject *registerOwner, float zoomX, float zoomY, bool precise, uint32 alpha, bool allFrames, float rotate, TSpriteBlendMode blendMode) { ERRORCODE res; - for (int i = 0; i < _subframes.GetSize(); i++) { + for (int i = 0; i < _subframes.getSize(); i++) { res = _subframes[i]->draw(x, y, registerOwner, zoomX, zoomY, precise, alpha, rotate, blendMode); if (DID_FAIL(res)) return res; } @@ -98,7 +98,7 @@ ERRORCODE CBFrame::oneTimeDisplay(CBObject *owner, bool muted) { */ } if (owner) { - for (int i = 0; i < _applyEvent.GetSize(); i++) { + for (int i = 0; i < _applyEvent.getSize(); i++) { owner->applyEvent(_applyEvent[i]); } } @@ -241,7 +241,7 @@ ERRORCODE CBFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { if (!subframe || DID_FAIL(subframe->loadBuffer((byte *)params, lifeTime, keepLoaded))) { delete subframe; cmd = PARSERR_GENERIC; - } else _subframes.Add(subframe); + } else _subframes.add(subframe); } break; @@ -262,7 +262,7 @@ ERRORCODE CBFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { case TOKEN_APPLY_EVENT: { char *Event = new char[strlen(params) + 1]; strcpy(Event, params); - _applyEvent.Add(Event); + _applyEvent.add(Event); } break; @@ -318,7 +318,7 @@ ERRORCODE CBFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { sub->_editorSelected = editorSelected; - _subframes.InsertAt(0, sub); + _subframes.insertAt(0, sub); return STATUS_OK; } @@ -331,7 +331,7 @@ bool CBFrame::getBoundingRect(Common::Rect *rect, int x, int y, float scaleX, fl Common::Rect subRect; - for (int i = 0; i < _subframes.GetSize(); i++) { + for (int i = 0; i < _subframes.getSize(); i++) { _subframes[i]->getBoundingRect(&subRect, x, y, scaleX, scaleY); CBPlatform::unionRect(rect, rect, &subRect); } @@ -359,13 +359,13 @@ ERRORCODE CBFrame::saveAsText(CBDynBuffer *buffer, int indent) { if (_editorExpanded) buffer->putTextIndent(indent + 2, "EDITOR_EXPANDED=%s\n", _editorExpanded ? "TRUE" : "FALSE"); - if (_subframes.GetSize() > 0) _subframes[0]->saveAsText(buffer, indent, false); + if (_subframes.getSize() > 0) _subframes[0]->saveAsText(buffer, indent, false); - for (int i = 1; i < _subframes.GetSize(); i++) { + for (int i = 1; i < _subframes.getSize(); i++) { _subframes[i]->saveAsText(buffer, indent + 2); } - for (int i = 0; i < _applyEvent.GetSize(); i++) { + for (int i = 0; i < _applyEvent.getSize(); i++) { buffer->putTextIndent(indent + 2, "APPLY_EVENT=\"%s\"\n", _applyEvent[i]); } @@ -438,7 +438,7 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th if (strcmp(name, "GetSubframe") == 0) { stack->correctParams(1); int index = stack->pop()->getInt(-1); - if (index < 0 || index >= _subframes.GetSize()) { + if (index < 0 || index >= _subframes.getSize()) { script->runtimeError("Frame.GetSubframe: Subframe index %d is out of range.", index); stack->pushNULL(); } else stack->pushNative(_subframes[index], true); @@ -454,15 +454,15 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th CScValue *val = stack->pop(); if (val->isInt()) { int index = val->getInt(-1); - if (index < 0 || index >= _subframes.GetSize()) { + if (index < 0 || index >= _subframes.getSize()) { script->runtimeError("Frame.DeleteSubframe: Subframe index %d is out of range.", index); } } else { CBSubFrame *sub = (CBSubFrame *)val->getNative(); - for (int i = 0; i < _subframes.GetSize(); i++) { + for (int i = 0; i < _subframes.getSize(); i++) { if (_subframes[i] == sub) { delete _subframes[i]; - _subframes.RemoveAt(i); + _subframes.removeAt(i); break; } } @@ -485,7 +485,7 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th sub->setSurface(filename); sub->setDefaultRect(); } - _subframes.Add(sub); + _subframes.add(sub); stack->pushNative(sub, true); return STATUS_OK; @@ -508,8 +508,8 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th sub->setSurface(filename); } - if (index >= _subframes.GetSize()) _subframes.Add(sub); - else _subframes.InsertAt(index, sub); + if (index >= _subframes.getSize()) _subframes.add(sub); + else _subframes.insertAt(index, sub); stack->pushNative(sub, true); return STATUS_OK; @@ -521,7 +521,7 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th else if (strcmp(name, "GetSubframe") == 0) { stack->correctParams(1); int index = stack->pop()->getInt(-1); - if (index < 0 || index >= _applyEvent.GetSize()) { + if (index < 0 || index >= _applyEvent.getSize()) { script->runtimeError("Frame.GetEvent: Event index %d is out of range.", index); stack->pushNULL(); } else stack->pushString(_applyEvent[index]); @@ -534,13 +534,13 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th else if (strcmp(name, "AddEvent") == 0) { stack->correctParams(1); const char *event = stack->pop()->getString(); - for (int i = 0; i < _applyEvent.GetSize(); i++) { + for (int i = 0; i < _applyEvent.getSize(); i++) { if (scumm_stricmp(_applyEvent[i], event) == 0) { stack->pushNULL(); return STATUS_OK; } } - _applyEvent.Add(event); + _applyEvent.add(event); stack->pushNULL(); return STATUS_OK; } @@ -551,10 +551,10 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th else if (strcmp(name, "DeleteEvent") == 0) { stack->correctParams(1); const char *event = stack->pop()->getString(); - for (int i = 0; i < _applyEvent.GetSize(); i++) { + for (int i = 0; i < _applyEvent.getSize(); i++) { if (scumm_stricmp(_applyEvent[i], event) == 0) { delete [] _applyEvent[i]; - _applyEvent.RemoveAt(i); + _applyEvent.removeAt(i); break; } } @@ -564,7 +564,7 @@ ERRORCODE CBFrame::scCallMethod(CScScript *script, CScStack *stack, CScStack *th ////////////////////////////////////////////////////////////////////////// else { - if (_subframes.GetSize() == 1) return _subframes[0]->scCallMethod(script, stack, thisStack, name); + if (_subframes.getSize() == 1) return _subframes[0]->scCallMethod(script, stack, thisStack, name); else return CBScriptable::scCallMethod(script, stack, thisStack, name); } } @@ -627,7 +627,7 @@ CScValue *CBFrame::scGetProperty(const char *name) { // NumSubframes (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumSubframes") == 0) { - _scValue->setInt(_subframes.GetSize()); + _scValue->setInt(_subframes.getSize()); return _scValue; } @@ -635,13 +635,13 @@ CScValue *CBFrame::scGetProperty(const char *name) { // NumEvents (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumEvents") == 0) { - _scValue->setInt(_applyEvent.GetSize()); + _scValue->setInt(_applyEvent.getSize()); return _scValue; } ////////////////////////////////////////////////////////////////////////// else { - if (_subframes.GetSize() == 1) return _subframes[0]->scGetProperty(name); + if (_subframes.getSize() == 1) return _subframes[0]->scGetProperty(name); else return CBScriptable::scGetProperty(name); } } @@ -691,7 +691,7 @@ ERRORCODE CBFrame::scSetProperty(const char *name, CScValue *value) { ////////////////////////////////////////////////////////////////////////// else { - if (_subframes.GetSize() == 1) return _subframes[0]->scSetProperty(name, value); + if (_subframes.getSize() == 1) return _subframes[0]->scSetProperty(name, value); else return CBScriptable::scSetProperty(name, value); } } diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 26afb8a7d9..d1ade0e3fd 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -360,13 +360,13 @@ ERRORCODE CBGame::cleanup() { unregisterObject(_fader); _fader = NULL; - for (int i = 0; i < _regObjects.GetSize(); i++) { + for (int i = 0; i < _regObjects.getSize(); i++) { delete _regObjects[i]; _regObjects[i] = NULL; } - _regObjects.RemoveAll(); + _regObjects.removeAll(); - _windows.RemoveAll(); // refs only + _windows.removeAll(); // refs only _focusedWindow = NULL; // ref only delete[] _saveImageName; @@ -386,11 +386,11 @@ ERRORCODE CBGame::cleanup() { _scValue = NULL; _sFX = NULL; - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { _scripts[i]->_owner = NULL; _scripts[i]->finish(); } - _scripts.RemoveAll(); + _scripts.removeAll(); _fontStorage->removeFont(_systemFont); _systemFont = NULL; @@ -398,10 +398,10 @@ ERRORCODE CBGame::cleanup() { _fontStorage->removeFont(_videoFont); _videoFont = NULL; - for (int i = 0; i < _quickMessages.GetSize(); i++) delete _quickMessages[i]; - _quickMessages.RemoveAll(); + for (int i = 0; i < _quickMessages.getSize(); i++) delete _quickMessages[i]; + _quickMessages.removeAll(); - _viewportStack.RemoveAll(); + _viewportStack.removeAll(); _viewportSP = -1; delete[] _name; @@ -657,7 +657,7 @@ ERRORCODE CBGame::initLoop() { getMousePos(&_mousePos); _focusedWindow = NULL; - for (int i = _windows.GetSize() - 1; i >= 0; i--) { + for (int i = _windows.getSize() - 1; i >= 0; i--) { if (_windows[i]->_visible) { _focusedWindow = _windows[i]; break; @@ -1097,7 +1097,7 @@ ERRORCODE CBGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi stack->correctParams(1); CUIWindow *win = new CUIWindow(Game); if (win && DID_SUCCEED(win->loadFile(stack->pop()->getString()))) { - _windows.Add(win); + _windows.add(win); registerObject(win); stack->pushNative(win, true); } else { @@ -1856,7 +1856,7 @@ ERRORCODE CBGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi CScValue *val = stack->pop(); CUIWindow *win = new CUIWindow(Game); - _windows.Add(win); + _windows.add(win); registerObject(win); if (!val->isNULL()) win->setName(val->getString()); stack->pushNative(win, true); @@ -1869,7 +1869,7 @@ ERRORCODE CBGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi else if (strcmp(name, "DeleteWindow") == 0) { stack->correctParams(1); CBObject *obj = (CBObject *)stack->pop()->getNative(); - for (int i = 0; i < _windows.GetSize(); i++) { + for (int i = 0; i < _windows.getSize(); i++) { if (_windows[i] == obj) { unregisterObject(_windows[i]); stack->pushBool(true); @@ -2771,13 +2771,13 @@ const char *CBGame::scToString() { #define QUICK_MSG_DURATION 3000 ////////////////////////////////////////////////////////////////////////// ERRORCODE CBGame::displayQuickMsg() { - if (_quickMessages.GetSize() == 0 || !_systemFont) return STATUS_OK; + if (_quickMessages.getSize() == 0 || !_systemFont) return STATUS_OK; // update - for (int i = 0; i < _quickMessages.GetSize(); i++) { + for (int i = 0; i < _quickMessages.getSize(); i++) { if (_currentTime - _quickMessages[i]->_startTime >= QUICK_MSG_DURATION) { delete _quickMessages[i]; - _quickMessages.RemoveAt(i); + _quickMessages.removeAt(i); i--; } } @@ -2785,7 +2785,7 @@ ERRORCODE CBGame::displayQuickMsg() { int posY = 20; // display - for (int i = 0; i < _quickMessages.GetSize(); i++) { + for (int i = 0; i < _quickMessages.getSize(); i++) { _systemFont->drawText((byte *)_quickMessages[i]->getText(), 0, posY, _renderer->_width); posY += _systemFont->getTextHeight((byte *)_quickMessages[i]->getText(), _renderer->_width); } @@ -2796,11 +2796,11 @@ ERRORCODE CBGame::displayQuickMsg() { #define MAX_QUICK_MSG 5 ////////////////////////////////////////////////////////////////////////// void CBGame::quickMessage(const char *text) { - if (_quickMessages.GetSize() >= MAX_QUICK_MSG) { + if (_quickMessages.getSize() >= MAX_QUICK_MSG) { delete _quickMessages[0]; - _quickMessages.RemoveAt(0); + _quickMessages.removeAt(0); } - _quickMessages.Add(new CBQuickMsg(Game, text)); + _quickMessages.add(new CBQuickMsg(Game, text)); } @@ -2819,7 +2819,7 @@ void CBGame::quickMessageForm(char *fmt, ...) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBGame::registerObject(CBObject *object) { - _regObjects.Add(object); + _regObjects.add(object); return STATUS_OK; } @@ -2829,9 +2829,9 @@ ERRORCODE CBGame::unregisterObject(CBObject *object) { if (!object) return STATUS_OK; // is it a window? - for (int i = 0; i < _windows.GetSize(); i++) { + for (int i = 0; i < _windows.getSize(); i++) { if ((CBObject *)_windows[i] == object) { - _windows.RemoveAt(i); + _windows.removeAt(i); // get new focused window if (_focusedWindow == object) _focusedWindow = NULL; @@ -2849,9 +2849,9 @@ ERRORCODE CBGame::unregisterObject(CBObject *object) { if (_store) _store->OnObjectDestroyed(object); // destroy object - for (int i = 0; i < _regObjects.GetSize(); i++) { + for (int i = 0; i < _regObjects.getSize(); i++) { if (_regObjects[i] == object) { - _regObjects.RemoveAt(i); + _regObjects.removeAt(i); if (!_loadInProgress) CSysClassRegistry::getInstance()->enumInstances(invalidateValues, "CScValue", (void *)object); delete object; return STATUS_OK; @@ -2881,7 +2881,7 @@ bool CBGame::validObject(CBObject *object) { if (!object) return false; if (object == this) return true; - for (int i = 0; i < _regObjects.GetSize(); i++) { + for (int i = 0; i < _regObjects.getSize(); i++) { if (_regObjects[i] == object) return true; } return false; @@ -3354,7 +3354,7 @@ ERRORCODE CBGame::displayWindows(bool inGame) { // did we lose focus? focus topmost window if (_focusedWindow == NULL || !_focusedWindow->_visible || _focusedWindow->_disable) { _focusedWindow = NULL; - for (int i = _windows.GetSize() - 1; i >= 0; i--) { + for (int i = _windows.getSize() - 1; i >= 0; i--) { if (_windows[i]->_visible && !_windows[i]->_disable) { _focusedWindow = _windows[i]; break; @@ -3363,7 +3363,7 @@ ERRORCODE CBGame::displayWindows(bool inGame) { } // display all windows - for (int i = 0; i < _windows.GetSize(); i++) { + for (int i = 0; i < _windows.getSize(); i++) { if (_windows[i]->_visible && _windows[i]->_inGame == inGame) { res = _windows[i]->display(); @@ -3679,11 +3679,11 @@ ERRORCODE CBGame::persist(CBPersistMgr *persistMgr) { ERRORCODE CBGame::focusWindow(CUIWindow *Window) { CUIWindow *Prev = _focusedWindow; - for (int i = 0; i < _windows.GetSize(); i++) { + for (int i = 0; i < _windows.getSize(); i++) { if (_windows[i] == Window) { - if (i < _windows.GetSize() - 1) { - _windows.RemoveAt(i); - _windows.Add(Window); + if (i < _windows.getSize() - 1) { + _windows.removeAt(i); + _windows.add(Window); Game->_focusedWindow = Window; } @@ -3938,7 +3938,7 @@ ERRORCODE CBGame::setActiveObject(CBObject *obj) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBGame::pushViewport(CBViewport *viewport) { _viewportSP++; - if (_viewportSP >= _viewportStack.GetSize()) _viewportStack.Add(viewport); + if (_viewportSP >= _viewportStack.getSize()) _viewportStack.add(viewport); else _viewportStack[_viewportSP] = viewport; _renderer->setViewport(viewport->getRect()); @@ -3952,7 +3952,7 @@ ERRORCODE CBGame::popViewport() { _viewportSP--; if (_viewportSP < -1) Game->LOG(0, "Fatal: Viewport stack underflow!"); - if (_viewportSP >= 0 && _viewportSP < _viewportStack.GetSize()) _renderer->setViewport(_viewportStack[_viewportSP]->getRect()); + if (_viewportSP >= 0 && _viewportSP < _viewportStack.getSize()) _renderer->setViewport(_viewportStack[_viewportSP]->getRect()); else _renderer->setViewport(_renderer->_drawOffsetX, _renderer->_drawOffsetY, _renderer->_width + _renderer->_drawOffsetX, @@ -4139,7 +4139,7 @@ void CBGame::DEBUG_DumpClassRegistry() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBGame::invalidateDeviceObjects() { - for (int i = 0; i < _regObjects.GetSize(); i++) { + for (int i = 0; i < _regObjects.getSize(); i++) { _regObjects[i]->invalidateDeviceObjects(); } return STATUS_OK; @@ -4148,7 +4148,7 @@ ERRORCODE CBGame::invalidateDeviceObjects() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBGame::restoreDeviceObjects() { - for (int i = 0; i < _regObjects.GetSize(); i++) { + for (int i = 0; i < _regObjects.getSize(); i++) { _regObjects[i]->restoreDeviceObjects(); } return STATUS_OK; diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp index 45b202e35f..63e862a569 100644 --- a/engines/wintermute/Base/BRegion.cpp +++ b/engines/wintermute/Base/BRegion.cpp @@ -61,8 +61,8 @@ CBRegion::~CBRegion() { ////////////////////////////////////////////////////////////////////////// void CBRegion::cleanup() { - for (int i = 0; i < _points.GetSize(); i++) delete _points[i]; - _points.RemoveAll(); + for (int i = 0; i < _points.getSize(); i++) delete _points[i]; + _points.removeAll(); CBPlatform::setRectEmpty(&_rect); _editorSelectedPoint = -1; @@ -77,7 +77,7 @@ bool CBRegion::createRegion() { ////////////////////////////////////////////////////////////////////////// bool CBRegion::pointInRegion(int x, int y) { - if (_points.GetSize() < 3) return false; + if (_points.getSize() < 3) return false; Common::Point pt; pt.x = x; @@ -155,8 +155,8 @@ ERRORCODE CBRegion::loadBuffer(byte *buffer, bool complete) { int i; - for (i = 0; i < _points.GetSize(); i++) delete _points[i]; - _points.RemoveAll(); + for (i = 0; i < _points.getSize(); i++) delete _points[i]; + _points.removeAll(); while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) { switch (cmd) { @@ -179,7 +179,7 @@ ERRORCODE CBRegion::loadBuffer(byte *buffer, bool complete) { case TOKEN_POINT: { int x, y; parser.scanStr((char *)params, "%d,%d", &x, &y); - _points.Add(new CBPoint(x, y)); + _points.add(new CBPoint(x, y)); } break; @@ -220,7 +220,7 @@ ERRORCODE CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *t int x = stack->pop()->getInt(); int y = stack->pop()->getInt(); - _points.Add(new CBPoint(x, y)); + _points.add(new CBPoint(x, y)); createRegion(); stack->pushBool(true); @@ -237,8 +237,8 @@ ERRORCODE CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *t int x = stack->pop()->getInt(); int y = stack->pop()->getInt(); - if (Index >= 0 && Index < _points.GetSize()) { - _points.InsertAt(Index, new CBPoint(x, y)); + if (Index >= 0 && Index < _points.getSize()) { + _points.insertAt(Index, new CBPoint(x, y)); createRegion(); stack->pushBool(true); @@ -256,7 +256,7 @@ ERRORCODE CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *t int x = stack->pop()->getInt(); int y = stack->pop()->getInt(); - if (Index >= 0 && Index < _points.GetSize()) { + if (Index >= 0 && Index < _points.getSize()) { _points[Index]->x = x; _points[Index]->y = y; createRegion(); @@ -274,11 +274,11 @@ ERRORCODE CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *t stack->correctParams(1); int index = stack->pop()->getInt(); - if (index >= 0 && index < _points.GetSize()) { + if (index >= 0 && index < _points.getSize()) { delete _points[index]; _points[index] = NULL; - _points.RemoveAt(index); + _points.removeAt(index); createRegion(); stack->pushBool(true); @@ -294,7 +294,7 @@ ERRORCODE CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *t stack->correctParams(1); int index = stack->pop()->getInt(); - if (index >= 0 && index < _points.GetSize()) { + if (index >= 0 && index < _points.getSize()) { CScValue *val = stack->getPushValue(); if (val) { val->setProperty("X", _points[index]->x); @@ -341,7 +341,7 @@ CScValue *CBRegion::scGetProperty(const char *name) { // NumPoints ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumPoints") == 0) { - _scValue->setInt(_points.GetSize()); + _scValue->setInt(_points.getSize()); return _scValue; } @@ -389,11 +389,11 @@ ERRORCODE CBRegion::saveAsText(CBDynBuffer *buffer, int indent, const char *name int i; - for (i = 0; i < _scripts.GetSize(); i++) { + for (i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } - for (i = 0; i < _points.GetSize(); i++) { + for (i = 0; i < _points.getSize(); i++) { buffer->putTextIndent(indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y); } @@ -427,7 +427,7 @@ typedef struct { ////////////////////////////////////////////////////////////////////////// bool CBRegion::ptInPolygon(int x, int y) { - if (_points.GetSize() < 3) return false; + if (_points.getSize() < 3) return false; int counter = 0; double xinters; @@ -439,9 +439,9 @@ bool CBRegion::ptInPolygon(int x, int y) { p1.x = (double)_points[0]->x; p1.y = (double)_points[0]->y; - for (int i = 1; i <= _points.GetSize(); i++) { - p2.x = (double)_points[i % _points.GetSize()]->x; - p2.y = (double)_points[i % _points.GetSize()]->y; + for (int i = 1; i <= _points.getSize(); i++) { + p2.x = (double)_points[i % _points.getSize()]->x; + p2.y = (double)_points[i % _points.getSize()]->y; if (p.y > MIN(p1.y, p2.y)) { if (p.y <= MAX(p1.y, p2.y)) { @@ -466,11 +466,11 @@ bool CBRegion::ptInPolygon(int x, int y) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBRegion::getBoundingRect(Common::Rect *rect) { - if (_points.GetSize() == 0) CBPlatform::setRectEmpty(rect); + if (_points.getSize() == 0) CBPlatform::setRectEmpty(rect); else { int MinX = INT_MAX, MinY = INT_MAX, MaxX = INT_MIN, MaxY = INT_MIN; - for (int i = 0; i < _points.GetSize(); i++) { + for (int i = 0; i < _points.getSize(); i++) { MinX = MIN(MinX, _points[i]->x); MinY = MIN(MinY, _points[i]->y); @@ -489,13 +489,13 @@ ERRORCODE CBRegion::mimic(CBRegion *region, float scale, int x, int y) { cleanup(); - for (int i = 0; i < region->_points.GetSize(); i++) { + for (int i = 0; i < region->_points.getSize(); i++) { int xVal, yVal; xVal = (int)((float)region->_points[i]->x * scale / 100.0f); yVal = (int)((float)region->_points[i]->y * scale / 100.0f); - _points.Add(new CBPoint(xVal + x, yVal + y)); + _points.add(new CBPoint(xVal + x, yVal + y)); } _lastMimicScale = scale; diff --git a/engines/wintermute/Base/BRenderSDL.cpp b/engines/wintermute/Base/BRenderSDL.cpp index 323c6cc7be..51202d26ef 100644 --- a/engines/wintermute/Base/BRenderSDL.cpp +++ b/engines/wintermute/Base/BRenderSDL.cpp @@ -639,7 +639,7 @@ void CBRenderSDL::dumpData(const char *filename) { int TotalKB = 0; int TotalLoss = 0; fprintf(f, "Filename;Usage;Size;KBytes\n"); - for (int i = 0; i < Mgr->_surfaces.GetSize(); i++) { + for (int i = 0; i < Mgr->_surfaces.getSize(); i++) { CBSurfaceSDL *Surf = (CBSurfaceSDL *)Mgr->_surfaces[i]; if (!Surf->_filename) continue; if (!Surf->_valid) continue; @@ -653,7 +653,7 @@ void CBRenderSDL::dumpData(const char *filename) { fprintf(f, "%d;", kb); fprintf(f, "\n"); } - fprintf(f, "Total %d;;;%d\n", Mgr->_surfaces.GetSize(), TotalKB); + fprintf(f, "Total %d;;;%d\n", Mgr->_surfaces.getSize(), TotalKB); fclose(f); diff --git a/engines/wintermute/Base/BRenderer.cpp b/engines/wintermute/Base/BRenderer.cpp index a3774e3770..b593161c41 100644 --- a/engines/wintermute/Base/BRenderer.cpp +++ b/engines/wintermute/Base/BRenderer.cpp @@ -72,7 +72,7 @@ CBObject *CBRenderer::getObjectAt(int x, int y) { point.x = x; point.y = y; - for (int i = _rectList.GetSize() - 1; i >= 0; i--) { + for (int i = _rectList.getSize() - 1; i >= 0; i--) { if (CBPlatform::ptInRect(&_rectList[i]->_rect, point)) { if (_rectList[i]->_precise) { // frame @@ -106,10 +106,10 @@ CBObject *CBRenderer::getObjectAt(int x, int y) { ////////////////////////////////////////////////////////////////////////// void CBRenderer::deleteRectList() { - for (int i = 0; i < _rectList.GetSize(); i++) { + for (int i = 0; i < _rectList.getSize(); i++) { delete _rectList[i]; } - _rectList.RemoveAll(); + _rectList.removeAll(); } diff --git a/engines/wintermute/Base/BScriptHolder.cpp b/engines/wintermute/Base/BScriptHolder.cpp index 160ba7e2cd..40e7d5d392 100644 --- a/engines/wintermute/Base/BScriptHolder.cpp +++ b/engines/wintermute/Base/BScriptHolder.cpp @@ -61,11 +61,11 @@ ERRORCODE CBScriptHolder::cleanup() { int i; - for (i = 0; i < _scripts.GetSize(); i++) { + for (i = 0; i < _scripts.getSize(); i++) { _scripts[i]->finish(true); _scripts[i]->_owner = NULL; } - _scripts.RemoveAll(); + _scripts.removeAll(); return STATUS_OK; } @@ -84,11 +84,11 @@ ERRORCODE CBScriptHolder::applyEvent(const char *eventName, bool unbreakable) { int numHandlers = 0; ERRORCODE ret = STATUS_FAILED; - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (!_scripts[i]->_thread) { CScScript *handler = _scripts[i]->invokeEventHandler(eventName, unbreakable); if (handler) { - //_scripts.Add(handler); + //_scripts.add(handler); numHandlers++; ret = STATUS_OK; } @@ -175,7 +175,7 @@ ERRORCODE CBScriptHolder::scCallMethod(CScScript *script, CScStack *stack, CScSt const char *filename = stack->pop()->getString(); bool killThreads = stack->pop()->getBool(false); bool ret = false; - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (scumm_stricmp(_scripts[i]->_filename, filename) == 0) { _scripts[i]->finish(killThreads); ret = true; @@ -194,7 +194,7 @@ ERRORCODE CBScriptHolder::scCallMethod(CScScript *script, CScStack *stack, CScSt stack->correctParams(1); const char *filename = stack->pop()->getString(); bool ret = false; - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (scumm_stricmp(_scripts[i]->_filename, filename) == 0 && _scripts[i]->_state != SCRIPT_FINISHED && _scripts[i]->_state != SCRIPT_ERROR) { ret = true; break; @@ -277,7 +277,7 @@ ERRORCODE CBScriptHolder::persist(CBPersistMgr *persistMgr) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBScriptHolder::addScript(const char *filename) { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (scumm_stricmp(_scripts[i]->_filename, filename) == 0) { if (_scripts[i]->_state != SCRIPT_FINISHED) { Game->LOG(0, "CBScriptHolder::AddScript - trying to add script '%s' mutiple times (obj: '%s')", filename, _name); @@ -295,8 +295,8 @@ ERRORCODE CBScriptHolder::addScript(const char *filename) { strcpy(scr->_filename, filename); scr->_state = SCRIPT_ERROR; scr->_owner = this; - _scripts.Add(scr); - Game->_scEngine->_scripts.Add(scr); + _scripts.add(scr); + Game->_scEngine->_scripts.add(scr); Game->getDebugMgr()->onScriptInit(scr); return STATUS_OK; @@ -304,7 +304,7 @@ ERRORCODE CBScriptHolder::addScript(const char *filename) { return STATUS_FAILED; } else { scr->_freezable = _freezable; - _scripts.Add(scr); + _scripts.add(scr); return STATUS_OK; } } @@ -312,9 +312,9 @@ ERRORCODE CBScriptHolder::addScript(const char *filename) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBScriptHolder::removeScript(CScScript *script) { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i] == script) { - _scripts.RemoveAt(i); + _scripts.removeAt(i); break; } } @@ -323,7 +323,7 @@ ERRORCODE CBScriptHolder::removeScript(CScScript *script) { ////////////////////////////////////////////////////////////////////////// bool CBScriptHolder::canHandleEvent(const char *EventName) { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (!_scripts[i]->_thread && _scripts[i]->canHandleEvent(EventName)) return true; } return false; @@ -332,7 +332,7 @@ bool CBScriptHolder::canHandleEvent(const char *EventName) { ////////////////////////////////////////////////////////////////////////// bool CBScriptHolder::canHandleMethod(const char *MethodName) { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (!_scripts[i]->_thread && _scripts[i]->canHandleMethod(MethodName)) return true; } return false; @@ -420,7 +420,7 @@ ERRORCODE CBScriptHolder::parseProperty(byte *buffer, bool complete) { ////////////////////////////////////////////////////////////////////////// void CBScriptHolder::makeFreezable(bool freezable) { _freezable = freezable; - for (int i = 0; i < _scripts.GetSize(); i++) + for (int i = 0; i < _scripts.getSize(); i++) _scripts[i]->_freezable = freezable; } @@ -428,14 +428,14 @@ void CBScriptHolder::makeFreezable(bool freezable) { ////////////////////////////////////////////////////////////////////////// CScScript *CBScriptHolder::invokeMethodThread(const char *methodName) { - for (int i = _scripts.GetSize() - 1; i >= 0; i--) { + for (int i = _scripts.getSize() - 1; i >= 0; i--) { if (_scripts[i]->canHandleMethod(methodName)) { CScScript *thread = new CScScript(Game, _scripts[i]->_engine); if (thread) { ERRORCODE ret = thread->createMethodThread(_scripts[i], methodName); if (DID_SUCCEED(ret)) { - _scripts[i]->_engine->_scripts.Add(thread); + _scripts[i]->_engine->_scripts.add(thread); Game->getDebugMgr()->onScriptMethodThreadInit(thread, _scripts[i], methodName); return thread; diff --git a/engines/wintermute/Base/BSoundMgr.cpp b/engines/wintermute/Base/BSoundMgr.cpp index 9e038fd5fc..b8393bc0f2 100644 --- a/engines/wintermute/Base/BSoundMgr.cpp +++ b/engines/wintermute/Base/BSoundMgr.cpp @@ -60,9 +60,9 @@ CBSoundMgr::~CBSoundMgr() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSoundMgr::cleanup() { - for (int i = 0; i < _sounds.GetSize(); i++) + for (int i = 0; i < _sounds.getSize(); i++) delete _sounds[i]; - _sounds.RemoveAll(); + _sounds.removeAll(); #if 0 BASS_Free(); #endif @@ -174,7 +174,7 @@ CBSoundBuffer *CBSoundMgr::addSound(const char *filename, TSoundType type, bool } // register sound - _sounds.Add(sound); + _sounds.add(sound); return sound; @@ -200,17 +200,17 @@ ERRORCODE CBSoundMgr::addSound(CBSoundBuffer *sound, TSoundType type) { } // register sound - _sounds.Add(sound); + _sounds.add(sound); return STATUS_OK; } ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSoundMgr::removeSound(CBSoundBuffer *sound) { - for (int i = 0; i < _sounds.GetSize(); i++) { + for (int i = 0; i < _sounds.getSize(); i++) { if (_sounds[i] == sound) { delete _sounds[i]; - _sounds.RemoveAt(i); + _sounds.removeAt(i); return STATUS_OK; } } @@ -236,7 +236,7 @@ ERRORCODE CBSoundMgr::setVolume(TSoundType type, int volume) { break; } - for (int i = 0; i < _sounds.GetSize(); i++) { + for (int i = 0; i < _sounds.getSize(); i++) { if (_sounds[i]->_type == type) _sounds[i]->setVolume(volume); } @@ -295,7 +295,7 @@ byte CBSoundMgr::getMasterVolumePercent() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSoundMgr::pauseAll(bool includingMusic) { - for (int i = 0; i < _sounds.GetSize(); i++) { + for (int i = 0; i < _sounds.getSize(); i++) { if (_sounds[i]->isPlaying() && (_sounds[i]->_type != SOUND_MUSIC || includingMusic)) { _sounds[i]->pause(); _sounds[i]->_freezePaused = true; @@ -309,7 +309,7 @@ ERRORCODE CBSoundMgr::pauseAll(bool includingMusic) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSoundMgr::resumeAll() { - for (int i = 0; i < _sounds.GetSize(); i++) { + for (int i = 0; i < _sounds.getSize(); i++) { if (_sounds[i]->_freezePaused) { _sounds[i]->resume(); _sounds[i]->_freezePaused = false; diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp index 349cb1e2f5..6fd5152d70 100644 --- a/engines/wintermute/Base/BSprite.cpp +++ b/engines/wintermute/Base/BSprite.cpp @@ -90,9 +90,9 @@ void CBSprite::setDefaults() { void CBSprite::cleanup() { CBScriptHolder::cleanup(); - for (int i = 0; i < _frames.GetSize(); i++) + for (int i = 0; i < _frames.getSize(); i++) delete _frames[i]; - _frames.RemoveAll(); + _frames.removeAll(); delete[] _editorBgFile; _editorBgFile = NULL; @@ -104,7 +104,7 @@ void CBSprite::cleanup() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSprite::draw(int x, int y, CBObject *registerOwner, float zoomX, float zoomY, uint32 alpha) { GetCurrentFrame(zoomX, zoomY); - if (_currentFrame < 0 || _currentFrame >= _frames.GetSize()) return STATUS_OK; + if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) return STATUS_OK; // move owner if allowed to if (_changed && _owner && _owner->_movable) { @@ -147,8 +147,8 @@ ERRORCODE CBSprite::loadFile(const char *filename, int lifeTime, TSpriteCacheTyp delete subframe; } else { CBPlatform::setRect(&subframe->_rect, 0, 0, subframe->_surface->getWidth(), subframe->_surface->getHeight()); - frame->_subframes.Add(subframe); - _frames.Add(frame); + frame->_subframes.add(subframe); + _frames.add(frame); _currentFrame = 0; ret = STATUS_OK; } @@ -295,7 +295,7 @@ ERRORCODE CBSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSprit return STATUS_FAILED; } - _frames.Add(frame); + _frames.add(frame); frameCount++; if (_currentFrame == -1) _currentFrame = 0; } @@ -319,7 +319,7 @@ ERRORCODE CBSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSprit ////////////////////////////////////////////////////////////////////// void CBSprite::reset() { - if (_frames.GetSize() > 0) _currentFrame = 0; + if (_frames.getSize() > 0) _currentFrame = 0; else _currentFrame = -1; killAllSounds(); @@ -344,9 +344,9 @@ bool CBSprite::GetCurrentFrame(float zoomX, float zoomY) { // get current frame if (!_paused && !_finished && timer >= _lastFrameTime + _frames[_currentFrame]->_delay && _lastFrameTime != 0) { - if (_currentFrame < _frames.GetSize() - 1) { + if (_currentFrame < _frames.getSize() - 1) { _currentFrame++; - if (_continuous) _canBreak = (_currentFrame == _frames.GetSize() - 1); + if (_continuous) _canBreak = (_currentFrame == _frames.getSize() - 1); } else { if (_looping) { _currentFrame = 0; @@ -360,12 +360,12 @@ bool CBSprite::GetCurrentFrame(float zoomX, float zoomY) { _lastFrameTime = timer; } - _changed = (lastFrame != _currentFrame || (_looping && _frames.GetSize() == 1)); + _changed = (lastFrame != _currentFrame || (_looping && _frames.getSize() == 1)); if (_lastFrameTime == 0) { _lastFrameTime = timer; _changed = true; - if (_continuous) _canBreak = (_currentFrame == _frames.GetSize() - 1); + if (_continuous) _canBreak = (_currentFrame == _frames.getSize() - 1); } if (_changed) { @@ -384,7 +384,7 @@ bool CBSprite::GetCurrentFrame(float zoomX, float zoomY) { ////////////////////////////////////////////////////////////////////// ERRORCODE CBSprite::display(int X, int Y, CBObject *Register, float ZoomX, float ZoomY, uint32 Alpha, float Rotate, TSpriteBlendMode BlendMode) { - if (_currentFrame < 0 || _currentFrame >= _frames.GetSize()) return STATUS_OK; + if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) return STATUS_OK; // on change... if (_changed) { @@ -403,9 +403,9 @@ ERRORCODE CBSprite::display(int X, int Y, CBObject *Register, float ZoomX, float ////////////////////////////////////////////////////////////////////////// CBSurface *CBSprite::getSurface() { // only used for animated textures for 3D models - if (_currentFrame < 0 || _currentFrame >= _frames.GetSize()) return NULL; + if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) return NULL; CBFrame *Frame = _frames[_currentFrame]; - if (Frame && Frame->_subframes.GetSize() > 0) { + if (Frame && Frame->_subframes.getSize() > 0) { CBSubFrame *Subframe = Frame->_subframes[0]; if (Subframe) return Subframe->_surface; else return NULL; @@ -417,7 +417,7 @@ bool CBSprite::getBoundingRect(Common::Rect *rect, int x, int y, float scaleX, f if (!rect) return false; CBPlatform::setRectEmpty(rect); - for (int i = 0; i < _frames.GetSize(); i++) { + for (int i = 0; i < _frames.getSize(); i++) { Common::Rect frame; Common::Rect temp; CBPlatform::copyRect(&temp, rect); @@ -456,12 +456,12 @@ ERRORCODE CBSprite::saveAsText(CBDynBuffer *buffer, int indent) { int i; // scripts - for (i = 0; i < _scripts.GetSize(); i++) { + for (i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } - for (i = 0; i < _frames.GetSize(); i++) { + for (i = 0; i < _frames.getSize(); i++) { _frames[i]->saveAsText(buffer, indent + 2); } @@ -514,7 +514,7 @@ ERRORCODE CBSprite::scCallMethod(CScScript *script, CScStack *stack, CScStack *t if (strcmp(name, "GetFrame") == 0) { stack->correctParams(1); int Index = stack->pop()->getInt(-1); - if (Index < 0 || Index >= _frames.GetSize()) { + if (Index < 0 || Index >= _frames.getSize()) { script->runtimeError("Sprite.GetFrame: Frame index %d is out of range.", Index); stack->pushNULL(); } else stack->pushNative(_frames[Index], true); @@ -529,16 +529,16 @@ ERRORCODE CBSprite::scCallMethod(CScScript *script, CScStack *stack, CScStack *t CScValue *Val = stack->pop(); if (Val->isInt()) { int Index = Val->getInt(-1); - if (Index < 0 || Index >= _frames.GetSize()) { + if (Index < 0 || Index >= _frames.getSize()) { script->runtimeError("Sprite.DeleteFrame: Frame index %d is out of range.", Index); } } else { CBFrame *Frame = (CBFrame *)Val->getNative(); - for (int i = 0; i < _frames.GetSize(); i++) { + for (int i = 0; i < _frames.getSize(); i++) { if (_frames[i] == Frame) { if (i == _currentFrame) _lastFrameTime = 0; delete _frames[i]; - _frames.RemoveAt(i); + _frames.removeAt(i); break; } } @@ -571,10 +571,10 @@ ERRORCODE CBSprite::scCallMethod(CScScript *script, CScStack *stack, CScStack *t CBSubFrame *sub = new CBSubFrame(Game); if (DID_SUCCEED(sub->setSurface(filename))) { sub->setDefaultRect(); - frame->_subframes.Add(sub); + frame->_subframes.add(sub); } else delete sub; } - _frames.Add(frame); + _frames.add(frame); stack->pushNative(frame, true); return STATUS_OK; @@ -597,13 +597,13 @@ ERRORCODE CBSprite::scCallMethod(CScScript *script, CScStack *stack, CScStack *t CBFrame *frame = new CBFrame(Game); if (filename != NULL) { CBSubFrame *sub = new CBSubFrame(Game); - if (DID_SUCCEED(sub->setSurface(filename))) frame->_subframes.Add(sub); + if (DID_SUCCEED(sub->setSurface(filename))) frame->_subframes.add(sub); else delete sub; } - if (index >= _frames.GetSize()) - _frames.Add(frame); - else _frames.InsertAt(index, frame); + if (index >= _frames.getSize()) + _frames.add(frame); + else _frames.insertAt(index, frame); stack->pushNative(frame, true); return STATUS_OK; @@ -649,7 +649,7 @@ CScValue *CBSprite::scGetProperty(const char *name) { // NumFrames (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumFrames") == 0) { - _scValue->setInt(_frames.GetSize()); + _scValue->setInt(_frames.getSize()); return _scValue; } @@ -713,7 +713,7 @@ ERRORCODE CBSprite::scSetProperty(const char *name, CScValue *value) { ////////////////////////////////////////////////////////////////////////// if (strcmp(name, "CurrentFrame") == 0) { _currentFrame = value->getInt(0); - if (_currentFrame >= _frames.GetSize() || _currentFrame < 0) { + if (_currentFrame >= _frames.getSize() || _currentFrame < 0) { _currentFrame = -1; } _lastFrameTime = 0; @@ -748,7 +748,7 @@ const char *CBSprite::scToString() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSprite::killAllSounds() { - for (int i = 0; i < _frames.GetSize(); i++) { + for (int i = 0; i < _frames.getSize(); i++) { if (_frames[i]->_sound) _frames[i]->_sound->stop(); } diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp index 4a1a5ec1f0..11450a1349 100644 --- a/engines/wintermute/Base/BSubFrame.cpp +++ b/engines/wintermute/Base/BSubFrame.cpp @@ -209,9 +209,9 @@ ERRORCODE CBSubFrame::draw(int x, int y, CBObject *registerOwner, float zoomX, f if (registerOwner != NULL && !_decoration) { if (zoomX == 100 && zoomY == 100) { - Game->_renderer->_rectList.Add(new CBActiveRect(Game, registerOwner, this, x - _hotspotX + _rect.left, y - _hotspotY + _rect.top, _rect.right - _rect.left, _rect.bottom - _rect.top, zoomX, zoomY, precise)); + Game->_renderer->_rectList.add(new CBActiveRect(Game, registerOwner, this, x - _hotspotX + _rect.left, y - _hotspotY + _rect.top, _rect.right - _rect.left, _rect.bottom - _rect.top, zoomX, zoomY, precise)); } else { - Game->_renderer->_rectList.Add(new CBActiveRect(Game, registerOwner, this, (int)(x - (_hotspotX + _rect.left) * (zoomX / 100)), (int)(y - (_hotspotY + _rect.top) * (zoomY / 100)), (int)((_rect.right - _rect.left) * (zoomX / 100)), (int)((_rect.bottom - _rect.top) * (zoomY / 100)), zoomX, zoomY, precise)); + Game->_renderer->_rectList.add(new CBActiveRect(Game, registerOwner, this, (int)(x - (_hotspotX + _rect.left) * (zoomX / 100)), (int)(y - (_hotspotY + _rect.top) * (zoomY / 100)), (int)((_rect.right - _rect.left) * (zoomX / 100)), (int)((_rect.bottom - _rect.top) * (zoomY / 100)), zoomX, zoomY, precise)); } } if (Game->_suspendedRendering) return STATUS_OK; diff --git a/engines/wintermute/Base/BSurfaceStorage.cpp b/engines/wintermute/Base/BSurfaceStorage.cpp index eedfbca178..1c6bb33af3 100644 --- a/engines/wintermute/Base/BSurfaceStorage.cpp +++ b/engines/wintermute/Base/BSurfaceStorage.cpp @@ -52,11 +52,11 @@ CBSurfaceStorage::~CBSurfaceStorage() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSurfaceStorage::cleanup(bool warn) { - for (int i = 0; i < _surfaces.GetSize(); i++) { + for (int i = 0; i < _surfaces.getSize(); i++) { if (warn) Game->LOG(0, "CBSurfaceStorage warning: purging surface '%s', usage:%d", _surfaces[i]->_filename, _surfaces[i]->_referenceCount); delete _surfaces[i]; } - _surfaces.RemoveAll(); + _surfaces.removeAll(); return STATUS_OK; } @@ -67,7 +67,7 @@ ERRORCODE CBSurfaceStorage::initLoop() { if (Game->_smartCache && Game->_liveTimer - _lastCleanupTime >= Game->_surfaceGCCycleTime) { _lastCleanupTime = Game->_liveTimer; sortSurfaces(); - for (int i = 0; i < _surfaces.GetSize(); i++) { + for (int i = 0; i < _surfaces.getSize(); i++) { if (_surfaces[i]->_lifeTime <= 0) break; if (_surfaces[i]->_lifeTime > 0 && _surfaces[i]->_valid && Game->_liveTimer - _surfaces[i]->_lastUsedTime >= _surfaces[i]->_lifeTime) { @@ -82,12 +82,12 @@ ERRORCODE CBSurfaceStorage::initLoop() { ////////////////////////////////////////////////////////////////////// ERRORCODE CBSurfaceStorage::removeSurface(CBSurface *surface) { - for (int i = 0; i < _surfaces.GetSize(); i++) { + for (int i = 0; i < _surfaces.getSize(); i++) { if (_surfaces[i] == surface) { _surfaces[i]->_referenceCount--; if (_surfaces[i]->_referenceCount <= 0) { delete _surfaces[i]; - _surfaces.RemoveAt(i); + _surfaces.removeAt(i); } break; } @@ -98,7 +98,7 @@ ERRORCODE CBSurfaceStorage::removeSurface(CBSurface *surface) { ////////////////////////////////////////////////////////////////////// CBSurface *CBSurfaceStorage::addSurface(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) { - for (int i = 0; i < _surfaces.GetSize(); i++) { + for (int i = 0; i < _surfaces.getSize(); i++) { if (scumm_stricmp(_surfaces[i]->_filename, filename) == 0) { _surfaces[i]->_referenceCount++; return _surfaces[i]; @@ -123,7 +123,7 @@ CBSurface *CBSurfaceStorage::addSurface(const char *filename, bool defaultCK, by return NULL; } else { surface->_referenceCount = 1; - _surfaces.Add(surface); + _surfaces.add(surface); return surface; } } @@ -132,7 +132,7 @@ CBSurface *CBSurfaceStorage::addSurface(const char *filename, bool defaultCK, by ////////////////////////////////////////////////////////////////////// ERRORCODE CBSurfaceStorage::restoreAll() { ERRORCODE ret; - for (int i = 0; i < _surfaces.GetSize(); i++) { + for (int i = 0; i < _surfaces.getSize(); i++) { ret = _surfaces[i]->restore(); if (ret != STATUS_OK) { Game->LOG(0, "CBSurfaceStorage::RestoreAll failed"); @@ -161,7 +161,7 @@ ERRORCODE CBSurfaceStorage::persist(CBPersistMgr *persistMgr) ////////////////////////////////////////////////////////////////////////// ERRORCODE CBSurfaceStorage::sortSurfaces() { - qsort(_surfaces.GetData(), _surfaces.GetSize(), sizeof(CBSurface *), surfaceSortCB); + qsort(_surfaces.getData(), _surfaces.getSize(), sizeof(CBSurface *), surfaceSortCB); return STATUS_OK; } diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp index a07b5a90c7..c3efc74eec 100644 --- a/engines/wintermute/Base/PartEmitter.cpp +++ b/engines/wintermute/Base/PartEmitter.cpp @@ -95,21 +95,21 @@ CPartEmitter::CPartEmitter(CBGame *inGame, CBScriptHolder *Owner) : CBObject(inG ////////////////////////////////////////////////////////////////////////// CPartEmitter::~CPartEmitter(void) { - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { delete _particles[i]; } - _particles.RemoveAll(); + _particles.removeAll(); - for (int i = 0; i < _forces.GetSize(); i++) { + for (int i = 0; i < _forces.getSize(); i++) { delete _forces[i]; } - _forces.RemoveAll(); + _forces.removeAll(); - for (int i = 0; i < _sprites.GetSize(); i++) { + for (int i = 0; i < _sprites.getSize(); i++) { delete [] _sprites[i]; } - _sprites.RemoveAll(); + _sprites.removeAll(); delete[] _emitEvent; _emitEvent = NULL; @@ -120,7 +120,7 @@ ERRORCODE CPartEmitter::addSprite(const char *filename) { if (!filename) return STATUS_FAILED; // do we already have the file? - for (int i = 0; i < _sprites.GetSize(); i++) { + for (int i = 0; i < _sprites.getSize(); i++) { if (scumm_stricmp(filename, _sprites[i]) == 0) return STATUS_OK; } @@ -133,17 +133,17 @@ ERRORCODE CPartEmitter::addSprite(const char *filename) { char *Str = new char[strlen(filename) + 1]; strcpy(Str, filename); - _sprites.Add(Str); + _sprites.add(Str); return STATUS_OK; } ////////////////////////////////////////////////////////////////////////// ERRORCODE CPartEmitter::removeSprite(const char *filename) { - for (int i = 0; i < _sprites.GetSize(); i++) { + for (int i = 0; i < _sprites.getSize(); i++) { if (scumm_stricmp(filename, _sprites[i]) == 0) { delete [] _sprites[i]; - _sprites.RemoveAt(i); + _sprites.removeAt(i); return STATUS_OK; } } @@ -153,7 +153,7 @@ ERRORCODE CPartEmitter::removeSprite(const char *filename) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CPartEmitter::initParticle(CPartParticle *particle, uint32 currentTime, uint32 timerDelta) { if (!particle) return STATUS_FAILED; - if (_sprites.GetSize() == 0) return STATUS_FAILED; + if (_sprites.getSize() == 0) return STATUS_FAILED; int posX = CBUtils::randomInt(_posX, _posX + _width); int posY = CBUtils::randomInt(_posY, _posY + _height); @@ -172,7 +172,7 @@ ERRORCODE CPartEmitter::initParticle(CPartParticle *particle, uint32 currentTime else lifeTime = CBUtils::randomInt(_lifeTime1, _lifeTime2); float angle = CBUtils::randomAngle(_angle1, _angle2); - int spriteIndex = CBUtils::randomInt(0, _sprites.GetSize() - 1); + int spriteIndex = CBUtils::randomInt(0, _sprites.getSize() - 1); float rotation = CBUtils::randomAngle(_rotation1, _rotation2); float angVelocity = CBUtils::randomFloat(_angVelocity1, _angVelocity2); @@ -235,7 +235,7 @@ ERRORCODE CPartEmitter::update() { ERRORCODE CPartEmitter::updateInternal(uint32 currentTime, uint32 timerDelta) { int numLive = 0; - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { _particles[i]->update(this, currentTime, timerDelta); if (!_particles[i]->_isDead) numLive++; @@ -256,7 +256,7 @@ ERRORCODE CPartEmitter::updateInternal(uint32 currentTime, uint32 timerDelta) { int toGen = MIN(_genAmount, _maxParticles - numLive); while (toGen > 0) { int firstDeadIndex = -1; - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { if (_particles[i]->_isDead) { firstDeadIndex = i; break; @@ -267,7 +267,7 @@ ERRORCODE CPartEmitter::updateInternal(uint32 currentTime, uint32 timerDelta) { if (firstDeadIndex >= 0) particle = _particles[firstDeadIndex]; else { particle = new CPartParticle(Game); - _particles.Add(particle); + _particles.add(particle); } initParticle(particle, currentTime, timerDelta); needsSort = true; @@ -289,9 +289,9 @@ ERRORCODE CPartEmitter::updateInternal(uint32 currentTime, uint32 timerDelta) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CPartEmitter::display(CBRegion *region) { - if (_sprites.GetSize() <= 1) Game->_renderer->startSpriteBatch(); + if (_sprites.getSize() <= 1) Game->_renderer->startSpriteBatch(); - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { if (region != NULL && _useRegion) { if (!region->pointInRegion((int)_particles[i]->_pos.x, (int)_particles[i]->_pos.y)) continue; } @@ -299,14 +299,14 @@ ERRORCODE CPartEmitter::display(CBRegion *region) { _particles[i]->display(this); } - if (_sprites.GetSize() <= 1) Game->_renderer->endSpriteBatch(); + if (_sprites.getSize() <= 1) Game->_renderer->endSpriteBatch(); return STATUS_OK; } ////////////////////////////////////////////////////////////////////////// ERRORCODE CPartEmitter::start() { - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { _particles[i]->_isDead = true; } _running = true; @@ -331,7 +331,7 @@ ERRORCODE CPartEmitter::start() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CPartEmitter::sortParticlesByZ() { // sort particles by _posY - qsort(_particles.GetData(), _particles.GetSize(), sizeof(CPartParticle *), CPartEmitter::compareZ); + qsort(_particles.getData(), _particles.getSize(), sizeof(CPartParticle *), CPartEmitter::compareZ); return STATUS_OK; } @@ -366,7 +366,7 @@ ERRORCODE CPartEmitter::setBorderThickness(int thicknessLeft, int thicknessRight CPartForce *CPartEmitter::addForceByName(const char *name) { CPartForce *force = NULL; - for (int i = 0; i < _forces.GetSize(); i++) { + for (int i = 0; i < _forces.getSize(); i++) { if (scumm_stricmp(name, _forces[i]->_name) == 0) { force = _forces[i]; break; @@ -376,7 +376,7 @@ CPartForce *CPartEmitter::addForceByName(const char *name) { force = new CPartForce(Game); if (force) { force->setName(name); - _forces.Add(force); + _forces.add(force); } } return force; @@ -401,10 +401,10 @@ ERRORCODE CPartEmitter::addForce(const char *name, CPartForce::TForceType type, ////////////////////////////////////////////////////////////////////////// ERRORCODE CPartEmitter::removeForce(const char *name) { - for (int i = 0; i < _forces.GetSize(); i++) { + for (int i = 0; i < _forces.getSize(); i++) { if (scumm_stricmp(name, _forces[i]->_name) == 0) { delete _forces[i]; - _forces.RemoveAt(i); + _forces.removeAt(i); return STATUS_OK; } } @@ -482,10 +482,10 @@ ERRORCODE CPartEmitter::scCallMethod(CScScript *script, CScStack *stack, CScStac else if (strcmp(name, "Stop") == 0) { stack->correctParams(0); - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { delete _particles[i]; } - _particles.RemoveAll(); + _particles.removeAll(); _running = false; stack->pushBool(true); @@ -745,7 +745,7 @@ CScValue *CPartEmitter::scGetProperty(const char *name) { ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumLiveParticles") == 0) { int numAlive = 0; - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { if (_particles[i] && !_particles[i]->_isDead) numAlive++; } _scValue->setInt(numAlive); @@ -1163,9 +1163,9 @@ ERRORCODE CPartEmitter::persist(CBPersistMgr *persistMgr) { int numForces; if (persistMgr->_saving) { - numForces = _forces.GetSize(); + numForces = _forces.getSize(); persistMgr->transfer(TMEMBER(numForces)); - for (int i = 0; i < _forces.GetSize(); i++) { + for (int i = 0; i < _forces.getSize(); i++) { _forces[i]->persist(persistMgr); } } else { @@ -1173,15 +1173,15 @@ ERRORCODE CPartEmitter::persist(CBPersistMgr *persistMgr) { for (int i = 0; i < numForces; i++) { CPartForce *force = new CPartForce(Game); force->persist(persistMgr); - _forces.Add(force); + _forces.add(force); } } int numParticles; if (persistMgr->_saving) { - numParticles = _particles.GetSize(); + numParticles = _particles.getSize(); persistMgr->transfer(TMEMBER(numParticles)); - for (int i = 0; i < _particles.GetSize(); i++) { + for (int i = 0; i < _particles.getSize(); i++) { _particles[i]->persist(persistMgr); } } else { @@ -1189,7 +1189,7 @@ ERRORCODE CPartEmitter::persist(CBPersistMgr *persistMgr) { for (int i = 0; i < numParticles; i++) { CPartParticle *particle = new CPartParticle(Game); particle->persist(persistMgr); - _particles.Add(particle); + _particles.add(particle); } } diff --git a/engines/wintermute/Base/PartParticle.cpp b/engines/wintermute/Base/PartParticle.cpp index 9d667bdca8..3eaa546d29 100644 --- a/engines/wintermute/Base/PartParticle.cpp +++ b/engines/wintermute/Base/PartParticle.cpp @@ -143,7 +143,7 @@ ERRORCODE CPartParticle::update(CPartEmitter *emitter, uint32 currentTime, uint3 // update position float elapsedTime = (float)timerDelta / 1000.f; - for (int i = 0; i < emitter->_forces.GetSize(); i++) { + for (int i = 0; i < emitter->_forces.getSize(); i++) { CPartForce *force = emitter->_forces[i]; switch (force->_type) { case CPartForce::FORCE_GLOBAL: diff --git a/engines/wintermute/Base/file/BDiskFile.cpp b/engines/wintermute/Base/file/BDiskFile.cpp index 1e9ec96e66..4287458b8e 100644 --- a/engines/wintermute/Base/file/BDiskFile.cpp +++ b/engines/wintermute/Base/file/BDiskFile.cpp @@ -50,7 +50,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename, CBFileM uint32 prefixSize = 0; Common::SeekableReadStream *file = NULL; - for (int i = 0; i < fileManager->_singlePaths.GetSize(); i++) { + for (int i = 0; i < fileManager->_singlePaths.getSize(); i++) { sprintf(fullPath, "%s%s", fileManager->_singlePaths[i], filename.c_str()); correctSlashes(fullPath); Common::File *tempFile = new Common::File(); diff --git a/engines/wintermute/Base/scriptables/SXStore.cpp b/engines/wintermute/Base/scriptables/SXStore.cpp index 4658f48216..065fac5255 100644 --- a/engines/wintermute/Base/scriptables/SXStore.cpp +++ b/engines/wintermute/Base/scriptables/SXStore.cpp @@ -68,16 +68,16 @@ CSXStore::~CSXStore() { void CSXStore::cleanup() { setEventsEnabled(NULL, false); - for (int i = 0; i < _validProducts.GetSize(); i++) { + for (int i = 0; i < _validProducts.getSize(); i++) { delete _validProducts[i]; } - _validProducts.RemoveAll(); + _validProducts.removeAll(); - for (int i = 0; i < _transactions.GetSize(); i++) { + for (int i = 0; i < _transactions.getSize(); i++) { delete _transactions[i]; } - _transactions.RemoveAll(); + _transactions.removeAll(); _lastProductRequestOwner = _lastPurchaseOwner = _lastRestoreOwner = NULL; @@ -120,7 +120,7 @@ ERRORCODE CSXStore::scCallMethod(CScScript *script, CScStack *stack, CScStack *t else if (strcmp(name, "GetValidProduct") == 0) { stack->correctParams(1); int index = stack->pop()->getInt(); - if (index >= 0 && index < _validProducts.GetSize()) { + if (index >= 0 && index < _validProducts.getSize()) { CScValue *prod = stack->getPushValue(); if (prod) { prod->setProperty("Id", _validProducts[index]->getId()); @@ -152,7 +152,7 @@ ERRORCODE CSXStore::scCallMethod(CScScript *script, CScStack *stack, CScStack *t else if (strcmp(name, "GetTransaction") == 0) { stack->correctParams(1); int index = stack->pop()->getInt(); - if (index >= 0 && index < _transactions.GetSize()) { + if (index >= 0 && index < _transactions.getSize()) { CScValue *trans = stack->getPushValue(); if (trans) { trans->setProperty("Id", _transactions[index]->getId()); @@ -255,7 +255,7 @@ CScValue *CSXStore::scGetProperty(const char *name) { // NumValidProducts (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumValidProducts") == 0) { - _scValue->setInt(_validProducts.GetSize()); + _scValue->setInt(_validProducts.getSize()); return _scValue; } ////////////////////////////////////////////////////////////////////////// @@ -269,7 +269,7 @@ CScValue *CSXStore::scGetProperty(const char *name) { // NumTransactions (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumTransactions") == 0) { - _scValue->setInt(_transactions.GetSize()); + _scValue->setInt(_transactions.getSize()); return _scValue; } @@ -293,16 +293,16 @@ ERRORCODE CSXStore::persist(CBPersistMgr *persistMgr) { // persist valid products int numProducts; if (persistMgr->_saving) { - numProducts = _validProducts.GetSize(); + numProducts = _validProducts.getSize(); persistMgr->transfer(TMEMBER(numProducts)); for (int i = 0; i < numProducts; i++) _validProducts[i]->persist(persistMgr); } else { - numProducts = _validProducts.GetSize(); + numProducts = _validProducts.getSize(); persistMgr->transfer(TMEMBER(numProducts)); for (int i = 0; i < numProducts; i++) { CBStoreProduct *prod = new CBStoreProduct; prod->persist(persistMgr); - _validProducts.Add(prod); + _validProducts.add(prod); } } @@ -362,10 +362,10 @@ bool CSXStore::isAvailable() { ////////////////////////////////////////////////////////////////////////// void CSXStore::receiveProductsStart() { - for (int i = 0; i < _validProducts.GetSize(); i++) { + for (int i = 0; i < _validProducts.getSize(); i++) { delete _validProducts[i]; } - _validProducts.RemoveAll(); + _validProducts.removeAll(); _invalidProducts.clear(); } @@ -378,7 +378,7 @@ void CSXStore::receiveProductsEnd() { ////////////////////////////////////////////////////////////////////////// void CSXStore::addValidProduct(const char *id, const char *name, const char *desc, const char *price) { CBStoreProduct *prod = new CBStoreProduct(id, name, desc, price); - _validProducts.Add(prod); + _validProducts.add(prod); } ////////////////////////////////////////////////////////////////////////// @@ -388,10 +388,10 @@ void CSXStore::addInvalidProduct(const char *id) { ////////////////////////////////////////////////////////////////////////// void CSXStore::receiveTransactionsStart() { - for (int i = 0; i < _transactions.GetSize(); i++) { + for (int i = 0; i < _transactions.getSize(); i++) { delete _transactions[i]; } - _transactions.RemoveAll(); + _transactions.removeAll(); } ////////////////////////////////////////////////////////////////////////// @@ -405,7 +405,7 @@ void CSXStore::receiveTransactionsEnd() { ////////////////////////////////////////////////////////////////////////// void CSXStore::addTransaction(const char *id, const char *productId, const char *state) { CBStoreTransaction *trans = new CBStoreTransaction(id, productId, state); - _transactions.Add(trans); + _transactions.add(trans); } ////////////////////////////////////////////////////////////////////////// @@ -413,7 +413,7 @@ bool CSXStore::purchase(CScScript *script, const char *productId) { if (!productId) return false; #ifdef __IPHONEOS__ - for (int i = 0; i < _validProducts.GetSize(); i++) { + for (int i = 0; i < _validProducts.getSize(); i++) { if (strcmp(productId, _validProducts[i]->GetId()) == 0) { _lastPurchaseOwner = script->_owner; @@ -430,11 +430,11 @@ bool CSXStore::purchase(CScScript *script, const char *productId) { bool CSXStore::finishTransaction(CScScript *script, const char *transId) { if (!transId) return false; #ifdef __IPHONEOS__ - for (int i = 0; i < _transactions.GetSize(); i++) { + for (int i = 0; i < _transactions.getSize(); i++) { if (strcmp(transId, _transactions[i]->GetId()) == 0) { if (StoreKit_FinishTransaction(transId) > 0) { SAFE_DELETE(_transactions[i]); - _transactions.RemoveAt(i); + _transactions.removeAt(i); return true; } else return false; } diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp index 089978ece3..ea651e69bf 100644 --- a/engines/wintermute/Base/scriptables/ScEngine.cpp +++ b/engines/wintermute/Base/scriptables/ScEngine.cpp @@ -89,24 +89,24 @@ CScEngine::~CScEngine() { cleanup(); - for (int i = 0; i < _breakpoints.GetSize(); i++) { + for (int i = 0; i < _breakpoints.getSize(); i++) { delete _breakpoints[i]; _breakpoints[i] = NULL; } - _breakpoints.RemoveAll(); + _breakpoints.removeAll(); } ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::cleanup() { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (!_scripts[i]->_thread && _scripts[i]->_owner) _scripts[i]->_owner->removeScript(_scripts[i]); delete _scripts[i]; - _scripts.RemoveAt(i); + _scripts.removeAt(i); i--; } - _scripts.RemoveAll(); + _scripts.removeAll(); delete _globals; _globals = NULL; @@ -162,7 +162,7 @@ CScScript *CScEngine::runScript(const char *filename, CBScriptHolder *owner) { script->_globals->setProp("self", &val); script->_globals->setProp("this", &val); - _scripts.Add(script); + _scripts.add(script); Game->getDebugMgr()->onScriptInit(script); return script; @@ -245,18 +245,18 @@ byte *CScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool i ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::tick() { - if (_scripts.GetSize() == 0) + if (_scripts.getSize() == 0) return STATUS_OK; // resolve waiting scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { switch (_scripts[i]->_state) { case SCRIPT_WAITING: { /* bool obj_found=false; - for(int j=0; j_regObjects.GetSize(); j++) + for(int j=0; j_regObjects.getSize(); j++) { if(Game->_regObjects[j] == _scripts[i]->_waitObject) { @@ -307,7 +307,7 @@ ERRORCODE CScEngine::tick() { // execute scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { // skip paused scripts if (_scripts[i]->_state == SCRIPT_PAUSED) continue; @@ -346,7 +346,7 @@ ERRORCODE CScEngine::tick() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::tickUnbreakable() { // execute unbreakable scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (!_scripts[i]->_unbreakable) continue; while (_scripts[i]->_state == SCRIPT_RUNNING) { @@ -365,12 +365,12 @@ ERRORCODE CScEngine::tickUnbreakable() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::removeFinishedScripts() { // remove finished scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR) { if (!_scripts[i]->_thread && _scripts[i]->_owner) _scripts[i]->_owner->removeScript(_scripts[i]); Game->getDebugMgr()->onScriptShutdown(_scripts[i]); delete _scripts[i]; - _scripts.RemoveAt(i); + _scripts.removeAt(i); i--; } } @@ -382,7 +382,7 @@ ERRORCODE CScEngine::removeFinishedScripts() { int CScEngine::getNumScripts(int *running, int *waiting, int *persistent) { int numRunning = 0, numWaiting = 0, numPersistent = 0, numTotal = 0; - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i]->_state == SCRIPT_FINISHED) continue; switch (_scripts[i]->_state) { case SCRIPT_RUNNING: @@ -425,7 +425,7 @@ ERRORCODE CScEngine::emptyScriptCache() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::resetObject(CBObject *Object) { // terminate all scripts waiting for this object - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i]->_state == SCRIPT_WAITING && _scripts[i]->_waitObject == Object) { if (!Game->_compatKillMethodThreads) resetScript(_scripts[i]); @@ -439,7 +439,7 @@ ERRORCODE CScEngine::resetObject(CBObject *Object) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::resetScript(CScScript *script) { // terminate all scripts waiting for this script - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i]->_state == SCRIPT_WAITING_SCRIPT && _scripts[i]->_waitScript == script) { _scripts[i]->finish(); } @@ -462,10 +462,10 @@ ERRORCODE CScEngine::persist(CBPersistMgr *persistMgr) { ////////////////////////////////////////////////////////////////////////// void CScEngine::editorCleanup() { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i]->_owner == NULL && (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR)) { delete _scripts[i]; - _scripts.RemoveAt(i); + _scripts.removeAt(i); i--; } } @@ -474,7 +474,7 @@ void CScEngine::editorCleanup() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::pauseAll() { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i] != _currentScript) _scripts[i]->pause(); } @@ -484,7 +484,7 @@ ERRORCODE CScEngine::pauseAll() { ////////////////////////////////////////////////////////////////////////// ERRORCODE CScEngine::resumeAll() { - for (int i = 0; i < _scripts.GetSize(); i++) + for (int i = 0; i < _scripts.getSize(); i++) _scripts[i]->resume(); return STATUS_OK; @@ -493,7 +493,7 @@ ERRORCODE CScEngine::resumeAll() { ////////////////////////////////////////////////////////////////////////// bool CScEngine::isValidScript(CScScript *script) { - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i] == script) return true; } return false; @@ -511,13 +511,13 @@ ERRORCODE CScEngine::dbgSendScripts(IWmeDebugClient *client) { _globals->dbgSendVariables(client, WME_DBGVAR_GLOBAL, NULL, 0); // process normal scripts first - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i]->_thread || _scripts[i]->_methodThread) continue; _scripts[i]->dbgSendScript(client); } // and threads later - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { if (_scripts[i]->_thread || _scripts[i]->_methodThread) _scripts[i]->dbgSendScript(client); } @@ -530,7 +530,7 @@ ERRORCODE CScEngine::addBreakpoint(const char *scriptFilename, int line) { if (!Game->getDebugMgr()->_enabled) return STATUS_OK; CScBreakpoint *bp = NULL; - for (int i = 0; i < _breakpoints.GetSize(); i++) { + for (int i = 0; i < _breakpoints.getSize(); i++) { if (scumm_stricmp(_breakpoints[i]->_filename.c_str(), scriptFilename) == 0) { bp = _breakpoints[i]; break; @@ -538,13 +538,13 @@ ERRORCODE CScEngine::addBreakpoint(const char *scriptFilename, int line) { } if (bp == NULL) { bp = new CScBreakpoint(scriptFilename); - _breakpoints.Add(bp); + _breakpoints.add(bp); } - for (int i = 0; i < bp->_lines.GetSize(); i++) { + for (int i = 0; i < bp->_lines.getSize(); i++) { if (bp->_lines[i] == line) return STATUS_OK; } - bp->_lines.Add(line); + bp->_lines.add(line); // refresh changes refreshScriptBreakpoints(); @@ -556,14 +556,14 @@ ERRORCODE CScEngine::addBreakpoint(const char *scriptFilename, int line) { ERRORCODE CScEngine::removeBreakpoint(const char *scriptFilename, int line) { if (!Game->getDebugMgr()->_enabled) return STATUS_OK; - for (int i = 0; i < _breakpoints.GetSize(); i++) { + for (int i = 0; i < _breakpoints.getSize(); i++) { if (scumm_stricmp(_breakpoints[i]->_filename.c_str(), scriptFilename) == 0) { - for (int j = 0; j < _breakpoints[i]->_lines.GetSize(); j++) { + for (int j = 0; j < _breakpoints[i]->_lines.getSize(); j++) { if (_breakpoints[i]->_lines[j] == line) { - _breakpoints[i]->_lines.RemoveAt(j); - if (_breakpoints[i]->_lines.GetSize() == 0) { + _breakpoints[i]->_lines.removeAt(j); + if (_breakpoints[i]->_lines.getSize() == 0) { delete _breakpoints[i]; - _breakpoints.RemoveAt(i); + _breakpoints.removeAt(i); } // refresh changes refreshScriptBreakpoints(); @@ -581,7 +581,7 @@ ERRORCODE CScEngine::removeBreakpoint(const char *scriptFilename, int line) { ERRORCODE CScEngine::refreshScriptBreakpoints() { if (!Game->getDebugMgr()->_enabled) return STATUS_OK; - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { refreshScriptBreakpoints(_scripts[i]); } return STATUS_OK; @@ -593,13 +593,13 @@ ERRORCODE CScEngine::refreshScriptBreakpoints(CScScript *script) { if (!script || !script->_filename) return STATUS_FAILED; - for (int i = 0; i < _breakpoints.GetSize(); i++) { + for (int i = 0; i < _breakpoints.getSize(); i++) { if (scumm_stricmp(_breakpoints[i]->_filename.c_str(), script->_filename) == 0) { - script->_breakpoints.Copy(_breakpoints[i]->_lines); + script->_breakpoints.copy(_breakpoints[i]->_lines); return STATUS_OK; } } - if (script->_breakpoints.GetSize() > 0) script->_breakpoints.RemoveAll(); + if (script->_breakpoints.getSize() > 0) script->_breakpoints.removeAll(); return STATUS_OK; } @@ -613,8 +613,8 @@ ERRORCODE CScEngine::saveBreakpoints() { char key[100]; int count = 0; - for (int i = 0; i < _breakpoints.GetSize(); i++) { - for (int j = 0; j < _breakpoints[i]->_lines.GetSize(); j++) { + for (int i = 0; i < _breakpoints.getSize(); i++) { + for (int j = 0; j < _breakpoints[i]->_lines.getSize(); j++) { count++; sprintf(key, "Breakpoint%d", count); sprintf(text, "%s:%d", _breakpoints[i]->_filename.c_str(), _breakpoints[i]->_lines[j]); diff --git a/engines/wintermute/Base/scriptables/ScEngine.h b/engines/wintermute/Base/scriptables/ScEngine.h index d4112be47b..d439ab8eab 100644 --- a/engines/wintermute/Base/scriptables/ScEngine.h +++ b/engines/wintermute/Base/scriptables/ScEngine.h @@ -72,7 +72,7 @@ public: } ~CScBreakpoint() { - _lines.RemoveAll(); + _lines.removeAll(); } Common::String _filename; diff --git a/engines/wintermute/Base/scriptables/ScScript.cpp b/engines/wintermute/Base/scriptables/ScScript.cpp index ebb68654fd..40803cded6 100644 --- a/engines/wintermute/Base/scriptables/ScScript.cpp +++ b/engines/wintermute/Base/scriptables/ScScript.cpp @@ -1029,7 +1029,7 @@ ERRORCODE CScScript::executeInstruction() { _currentLine = newLine; if (Game->getDebugMgr()->_enabled) { Game->getDebugMgr()->onScriptChangeLine(this, _currentLine); - for (int i = 0; i < _breakpoints.GetSize(); i++) { + for (int i = 0; i < _breakpoints.getSize(); i++) { if (_breakpoints[i] == _currentLine) { Game->getDebugMgr()->onScriptHitBreakpoint(this); sleep(0); @@ -1268,7 +1268,7 @@ CScScript *CScScript::invokeEventHandler(const char *eventName, bool unbreakable ERRORCODE ret = thread->createThread(this, pos, eventName); if (DID_SUCCEED(ret)) { thread->_unbreakable = unbreakable; - _engine->_scripts.Add(thread); + _engine->_scripts.add(thread); Game->getDebugMgr()->onScriptEventThreadInit(thread, this, eventName); return thread; } else { @@ -1363,7 +1363,7 @@ ERRORCODE CScScript::copyParameters(CScStack *stack) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CScScript::finishThreads() { - for (int i = 0; i < _engine->_scripts.GetSize(); i++) { + for (int i = 0; i < _engine->_scripts.getSize(); i++) { CScScript *scr = _engine->_scripts[i]; if (scr->_thread && scr->_state != SCRIPT_FINISHED && scr->_owner == _owner && scumm_stricmp(scr->_filename, _filename) == 0) scr->finish(true); @@ -1417,12 +1417,12 @@ TScriptState CScScript::dbgGetState() { ////////////////////////////////////////////////////////////////////////// int CScScript::dbgGetNumBreakpoints() { - return _breakpoints.GetSize(); + return _breakpoints.getSize(); } ////////////////////////////////////////////////////////////////////////// int CScScript::dbgGetBreakpoint(int index) { - if (index >= 0 && index < _breakpoints.GetSize()) return _breakpoints[index]; + if (index >= 0 && index < _breakpoints.getSize()) return _breakpoints[index]; else return -1; } diff --git a/engines/wintermute/Base/scriptables/ScStack.cpp b/engines/wintermute/Base/scriptables/ScStack.cpp index 7bc44838f3..33fe9f44e8 100644 --- a/engines/wintermute/Base/scriptables/ScStack.cpp +++ b/engines/wintermute/Base/scriptables/ScStack.cpp @@ -44,13 +44,13 @@ CScStack::CScStack(CBGame *inGame): CBBase(inGame) { CScStack::~CScStack() { #if _DEBUG - //Game->LOG(0, "STAT: Stack size: %d, SP=%d", _values.GetSize(), _sP); + //Game->LOG(0, "STAT: Stack size: %d, SP=%d", _values.getSize(), _sP); #endif - for (int i = 0; i < _values.GetSize(); i++) { + for (int i = 0; i < _values.getSize(); i++) { delete _values[i]; } - _values.RemoveAll(); + _values.removeAll(); } @@ -69,13 +69,13 @@ CScValue *CScStack::pop() { void CScStack::push(CScValue *val) { _sP++; - if (_sP < _values.GetSize()) { + if (_sP < _values.getSize()) { _values[_sP]->cleanup(); _values[_sP]->copy(val); } else { CScValue *copyVal = new CScValue(Game); copyVal->copy(val); - _values.Add(copyVal); + _values.add(copyVal); } } @@ -84,9 +84,9 @@ void CScStack::push(CScValue *val) { CScValue *CScStack::getPushValue() { _sP++; - if (_sP >= _values.GetSize()) { + if (_sP >= _values.getSize()) { CScValue *val = new CScValue(Game); - _values.Add(val); + _values.add(val); } _values[_sP]->cleanup(); return _values[_sP]; @@ -96,7 +96,7 @@ CScValue *CScStack::getPushValue() { ////////////////////////////////////////////////////////////////////////// CScValue *CScStack::getTop() { - if (_sP < 0 || _sP >= _values.GetSize()) return NULL; + if (_sP < 0 || _sP >= _values.getSize()) return NULL; else return _values[_sP]; } @@ -104,7 +104,7 @@ CScValue *CScStack::getTop() { ////////////////////////////////////////////////////////////////////////// CScValue *CScStack::getAt(int index) { index = _sP - index; - if (index < 0 || index >= _values.GetSize()) return NULL; + if (index < 0 || index >= _values.getSize()) return NULL; else return _values[index]; } @@ -117,7 +117,7 @@ void CScStack::correctParams(uint32 expectedParams) { while (expectedParams < nuParams) { //Pop(); delete _values[_sP - expectedParams]; - _values.RemoveAt(_sP - expectedParams); + _values.removeAt(_sP - expectedParams); nuParams--; _sP--; } @@ -126,13 +126,13 @@ void CScStack::correctParams(uint32 expectedParams) { //Push(null_val); CScValue *nullVal = new CScValue(Game); nullVal->setNULL(); - _values.InsertAt(_sP - nuParams + 1, nullVal); + _values.insertAt(_sP - nuParams + 1, nullVal); nuParams++; _sP++; - if (_values.GetSize() > _sP + 1) { - delete _values[_values.GetSize() - 1]; - _values.RemoveAt(_values.GetSize() - 1); + if (_values.getSize() > _sP + 1) { + delete _values[_values.getSize() - 1]; + _values.removeAt(_values.getSize() - 1); } } } diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp index 930157ebf5..43e1262ce3 100644 --- a/engines/wintermute/UI/UIButton.cpp +++ b/engines/wintermute/UI/UIButton.cpp @@ -524,7 +524,7 @@ ERRORCODE CUIButton::saveAsText(CBDynBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n"); // scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } @@ -638,7 +638,7 @@ ERRORCODE CUIButton::display(int offsetX, int offsetY) { font->drawText((byte *)_text, offsetX + _posX + ((_press || _oneTimePress) ? 1 : 0), offsetY + _posY + text_offset + ((_press || _oneTimePress) ? 1 : 0), _width, _align); } - if (!_pixelPerfect || !_image) Game->_renderer->_rectList.Add(new CBActiveRect(Game, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); + if (!_pixelPerfect || !_image) Game->_renderer->_rectList.add(new CBActiveRect(Game, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); // reset unused sprites if (_image && _image != image) _image->reset(); diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp index 09ca50699e..778e084ab9 100644 --- a/engines/wintermute/UI/UIEdit.cpp +++ b/engines/wintermute/UI/UIEdit.cpp @@ -342,7 +342,7 @@ ERRORCODE CUIEdit::saveAsText(CBDynBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE"); // scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } @@ -673,7 +673,7 @@ ERRORCODE CUIEdit::display(int offsetX, int offsetY) { } - Game->_renderer->_rectList.Add(new CBActiveRect(Game, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); + Game->_renderer->_rectList.add(new CBActiveRect(Game, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); Game->_textEncoding = OrigEncoding; diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp index faaaf375c0..f30aca122c 100644 --- a/engines/wintermute/UI/UIEntity.cpp +++ b/engines/wintermute/UI/UIEntity.cpp @@ -194,7 +194,7 @@ ERRORCODE CUIEntity::saveAsText(CBDynBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n"); // scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp index 1a00748a98..7af29a9eac 100644 --- a/engines/wintermute/UI/UIObject.cpp +++ b/engines/wintermute/UI/UIObject.cpp @@ -229,7 +229,7 @@ ERRORCODE CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * // find directly if (val->isNative()) { CUIObject *widget = (CUIObject *)val->getNative(); - for (i = 0; i < win->_widgets.GetSize(); i++) { + for (i = 0; i < win->_widgets.getSize(); i++) { if (win->_widgets[i] == widget) { found = true; break; @@ -239,7 +239,7 @@ ERRORCODE CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * // find by name else { const char *findName = val->getString(); - for (i = 0; i < win->_widgets.GetSize(); i++) { + for (i = 0; i < win->_widgets.getSize(); i++) { if (scumm_stricmp(win->_widgets[i]->_name, findName) == 0) { found = true; break; @@ -249,13 +249,13 @@ ERRORCODE CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * if (found) { bool done = false; - for (int j = 0; j < win->_widgets.GetSize(); j++) { + for (int j = 0; j < win->_widgets.getSize(); j++) { if (win->_widgets[j] == this) { if (strcmp(name, "MoveAfter") == 0) i++; if (j >= i) j++; - win->_widgets.InsertAt(i, this); - win->_widgets.RemoveAt(j); + win->_widgets.insertAt(i, this); + win->_widgets.removeAt(j); done = true; stack->pushBool(true); @@ -278,10 +278,10 @@ ERRORCODE CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * if (_parent && _parent->_type == UI_WINDOW) { CUIWindow *win = (CUIWindow *)_parent; - for (int i = 0; i < win->_widgets.GetSize(); i++) { + for (int i = 0; i < win->_widgets.getSize(); i++) { if (win->_widgets[i] == this) { - win->_widgets.RemoveAt(i); - win->_widgets.InsertAt(0, this); + win->_widgets.removeAt(i); + win->_widgets.insertAt(0, this); break; } } @@ -299,10 +299,10 @@ ERRORCODE CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack * if (_parent && _parent->_type == UI_WINDOW) { CUIWindow *win = (CUIWindow *)_parent; - for (int i = 0; i < win->_widgets.GetSize(); i++) { + for (int i = 0; i < win->_widgets.getSize(); i++) { if (win->_widgets[i] == this) { - win->_widgets.RemoveAt(i); - win->_widgets.Add(this); + win->_widgets.removeAt(i); + win->_widgets.add(this); break; } } @@ -399,10 +399,10 @@ CScValue *CUIObject::scGetProperty(const char *name) { _scValue->setNULL(); if (_parent && _parent->_type == UI_WINDOW) { CUIWindow *win = (CUIWindow *)_parent; - for (int i = 0; i < win->_widgets.GetSize(); i++) { + for (int i = 0; i < win->_widgets.getSize(); i++) { if (win->_widgets[i] == this) { if (strcmp(name, "NextSibling") == 0) { - if (i < win->_widgets.GetSize() - 1) _scValue->setNative(win->_widgets[i + 1], true); + if (i < win->_widgets.getSize() - 1) _scValue->setNative(win->_widgets[i + 1], true); } else { if (i > 0) _scValue->setNative(win->_widgets[i - 1], true); } diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp index 884d241e07..44fb695687 100644 --- a/engines/wintermute/UI/UIText.cpp +++ b/engines/wintermute/UI/UIText.cpp @@ -87,7 +87,7 @@ ERRORCODE CUIText::display(int offsetX, int offsetY) { font->drawText((byte *)_text, offsetX + _posX, offsetY + _posY + textOffset, _width, _textAlign, _height); } - //Game->_renderer->_rectList.Add(new CBActiveRect(Game, this, NULL, OffsetX + _posX, OffsetY + _posY, _width, _height, 100, 100, false)); + //Game->_renderer->_rectList.add(new CBActiveRect(Game, this, NULL, OffsetX + _posX, OffsetY + _posY, _width, _height, 100, 100, false)); return STATUS_OK; } @@ -360,7 +360,7 @@ ERRORCODE CUIText::saveAsText(CBDynBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n"); // scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp index 5f63390519..cc8d966bc2 100644 --- a/engines/wintermute/UI/UIWindow.cpp +++ b/engines/wintermute/UI/UIWindow.cpp @@ -107,8 +107,8 @@ void CUIWindow::cleanup() { if (!_sharedFonts && _fontInactive) Game->_fontStorage->removeFont(_fontInactive); if (!_sharedImages && _imageInactive) delete _imageInactive; - for (int i = 0; i < _widgets.GetSize(); i++) delete _widgets[i]; - _widgets.RemoveAll(); + for (int i = 0; i < _widgets.getSize(); i++) delete _widgets[i]; + _widgets.removeAll(); } @@ -190,9 +190,9 @@ ERRORCODE CUIWindow::display(int offsetX, int offsetY) { } if (!_transparent && !image) - Game->_renderer->_rectList.Add(new CBActiveRect(Game, this, NULL, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false)); + Game->_renderer->_rectList.add(new CBActiveRect(Game, this, NULL, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false)); - for (int i = 0; i < _widgets.GetSize(); i++) { + for (int i = 0; i < _widgets.getSize(); i++) { _widgets[i]->display(_posX + offsetX, _posY + offsetY); } @@ -440,7 +440,7 @@ ERRORCODE CUIWindow::loadBuffer(byte *buffer, bool complete) { cmd = PARSERR_GENERIC; } else { btn->_parent = this; - _widgets.Add(btn); + _widgets.add(btn); } } break; @@ -453,7 +453,7 @@ ERRORCODE CUIWindow::loadBuffer(byte *buffer, bool complete) { cmd = PARSERR_GENERIC; } else { text->_parent = this; - _widgets.Add(text); + _widgets.add(text); } } break; @@ -466,7 +466,7 @@ ERRORCODE CUIWindow::loadBuffer(byte *buffer, bool complete) { cmd = PARSERR_GENERIC; } else { edit->_parent = this; - _widgets.Add(edit); + _widgets.add(edit); } } break; @@ -479,7 +479,7 @@ ERRORCODE CUIWindow::loadBuffer(byte *buffer, bool complete) { cmd = PARSERR_GENERIC; } else { win->_parent = this; - _widgets.Add(win); + _widgets.add(win); } } break; @@ -659,7 +659,7 @@ ERRORCODE CUIWindow::saveAsText(CBDynBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n"); // scripts - for (int i = 0; i < _scripts.GetSize(); i++) { + for (int i = 0; i < _scripts.getSize(); i++) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename); } @@ -669,7 +669,7 @@ ERRORCODE CUIWindow::saveAsText(CBDynBuffer *buffer, int indent) { CBBase::saveAsText(buffer, indent + 2); // controls - for (int i = 0; i < _widgets.GetSize(); i++) + for (int i = 0; i < _widgets.getSize(); i++) _widgets[i]->saveAsText(buffer, indent + 2); @@ -679,7 +679,7 @@ ERRORCODE CUIWindow::saveAsText(CBDynBuffer *buffer, int indent) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CUIWindow::enableWidget(const char *name, bool Enable) { - for (int i = 0; i < _widgets.GetSize(); i++) { + for (int i = 0; i < _widgets.getSize(); i++) { if (scumm_stricmp(_widgets[i]->_name, name) == 0) _widgets[i]->_disable = !Enable; } return STATUS_OK; @@ -688,7 +688,7 @@ ERRORCODE CUIWindow::enableWidget(const char *name, bool Enable) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CUIWindow::showWidget(const char *name, bool Visible) { - for (int i = 0; i < _widgets.GetSize(); i++) { + for (int i = 0; i < _widgets.getSize(); i++) { if (scumm_stricmp(_widgets[i]->_name, name) == 0) _widgets[i]->_visible = Visible; } return STATUS_OK; @@ -707,10 +707,10 @@ ERRORCODE CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack * CScValue *val = stack->pop(); if (val->getType() == VAL_INT) { int widget = val->getInt(); - if (widget < 0 || widget >= _widgets.GetSize()) stack->pushNULL(); + if (widget < 0 || widget >= _widgets.getSize()) stack->pushNULL(); else stack->pushNative(_widgets[widget], true); } else { - for (int i = 0; i < _widgets.GetSize(); i++) { + for (int i = 0; i < _widgets.getSize(); i++) { if (scumm_stricmp(_widgets[i]->_name, val->getString()) == 0) { stack->pushNative(_widgets[i], true); return STATUS_OK; @@ -845,7 +845,7 @@ ERRORCODE CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack * stack->pushNative(btn, true); btn->_parent = this; - _widgets.Add(btn); + _widgets.add(btn); return STATUS_OK; } @@ -862,7 +862,7 @@ ERRORCODE CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack * stack->pushNative(sta, true); sta->_parent = this; - _widgets.Add(sta); + _widgets.add(sta); return STATUS_OK; } @@ -879,7 +879,7 @@ ERRORCODE CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack * stack->pushNative(edi, true); edi->_parent = this; - _widgets.Add(edi); + _widgets.add(edi); return STATUS_OK; } @@ -896,7 +896,7 @@ ERRORCODE CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack * stack->pushNative(win, true); win->_parent = this; - _widgets.Add(win); + _widgets.add(win); return STATUS_OK; } @@ -909,10 +909,10 @@ ERRORCODE CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack * CScValue *val = stack->pop(); CUIObject *obj = (CUIObject *)val->getNative(); - for (int i = 0; i < _widgets.GetSize(); i++) { + for (int i = 0; i < _widgets.getSize(); i++) { if (_widgets[i] == obj) { delete _widgets[i]; - _widgets.RemoveAt(i); + _widgets.removeAt(i); if (val->getType() == VAL_VARIABLE_REF) val->setNULL(); } } @@ -940,7 +940,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) { // NumWidgets / NumControls (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "NumWidgets") == 0 || strcmp(name, "NumControls") == 0) { - _scValue->setInt(_widgets.GetSize()); + _scValue->setInt(_widgets.getSize()); return _scValue; } @@ -1192,7 +1192,7 @@ ERRORCODE CUIWindow::persist(CBPersistMgr *persistMgr) { ERRORCODE CUIWindow::moveFocus(bool forward) { int i; bool found = false; - for (i = 0; i < _widgets.GetSize(); i++) { + for (i = 0; i < _widgets.getSize(); i++) { if (_widgets[i] == _focusedWidget) { found = true; break; @@ -1201,14 +1201,14 @@ ERRORCODE CUIWindow::moveFocus(bool forward) { if (!found) _focusedWidget = NULL; if (!_focusedWidget) { - if (_widgets.GetSize() > 0) i = 0; + if (_widgets.getSize() > 0) i = 0; else return STATUS_OK; } int numTries = 0; bool done = false; - while (numTries <= _widgets.GetSize()) { + while (numTries <= _widgets.getSize()) { if (_widgets[i] != _focusedWidget && _widgets[i]->_canFocus && _widgets[i]->_visible && !_widgets[i]->_disable) { _focusedWidget = _widgets[i]; done = true; @@ -1217,10 +1217,10 @@ ERRORCODE CUIWindow::moveFocus(bool forward) { if (forward) { i++; - if (i >= _widgets.GetSize()) i = 0; + if (i >= _widgets.getSize()) i = 0; } else { i--; - if (i < 0) i = _widgets.GetSize() - 1; + if (i < 0) i = _widgets.getSize() - 1; } numTries++; } @@ -1294,7 +1294,7 @@ ERRORCODE CUIWindow::listen(CBScriptHolder *param1, uint32 param2) { ////////////////////////////////////////////////////////////////////////// void CUIWindow::makeFreezable(bool freezable) { - for (int i = 0; i < _widgets.GetSize(); i++) + for (int i = 0; i < _widgets.getSize(); i++) _widgets[i]->makeFreezable(freezable); CBObject::makeFreezable(freezable); @@ -1303,7 +1303,7 @@ void CUIWindow::makeFreezable(bool freezable) { ////////////////////////////////////////////////////////////////////////// ERRORCODE CUIWindow::getWindowObjects(CBArray &objects, bool interactiveOnly) { - for (int i = 0; i < _widgets.GetSize(); i++) { + for (int i = 0; i < _widgets.getSize(); i++) { CUIObject *control = _widgets[i]; if (control->_disable && interactiveOnly) continue; @@ -1314,11 +1314,11 @@ ERRORCODE CUIWindow::getWindowObjects(CBArray &objects case UI_BUTTON: case UI_EDIT: - objects.Add(control); + objects.add(control); break; default: - if (!interactiveOnly) objects.Add(control); + if (!interactiveOnly) objects.add(control); } } return STATUS_OK; diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h index 59d0241419..0c71b3ec6e 100644 --- a/engines/wintermute/coll_templ.h +++ b/engines/wintermute/coll_templ.h @@ -80,39 +80,39 @@ public: CBArray(); // Attributes - int GetSize() const; - int GetUpperBound() const; - void SetSize(int nNewSize, int nGrowBy = -1); + int getSize() const; + int getUpperBound() const; + void setSize(int nNewSize, int nGrowBy = -1); // Operations // Clean up - void FreeExtra(); - void RemoveAll(); + void freeExtra(); + void removeAll(); ERRORCODE persist(CBPersistMgr *persistMgr); // Accessing elements - TYPE GetAt(int nIndex) const; - void SetAt(int nIndex, ARG_TYPE newElement); - TYPE &ElementAt(int nIndex); + TYPE getAt(int nIndex) const; + void setAt(int nIndex, ARG_TYPE newElement); + TYPE &elementAt(int nIndex); // Direct Access to the element data (may return NULL) - const TYPE *GetData() const; - TYPE *GetData(); + const TYPE *getData() const; + TYPE *getData(); // Potentially growing the array - void SetAtGrow(int nIndex, ARG_TYPE newElement); - int Add(ARG_TYPE newElement); - int Append(const CBArray &src); - void Copy(const CBArray &src); + void setAtGrow(int nIndex, ARG_TYPE newElement); + int add(ARG_TYPE newElement); + int append(const CBArray &src); + void copy(const CBArray &src); // overloaded operator helpers TYPE operator[](int nIndex) const; TYPE &operator[](int nIndex); // Operations that move elements around - void InsertAt(int nIndex, ARG_TYPE newElement, int nCount = 1); - void RemoveAt(int nIndex, int nCount = 1); - void InsertAt(int nStartIndex, CBArray *pNewArray); + void insertAt(int nIndex, ARG_TYPE newElement, int nCount = 1); + void removeAt(int nIndex, int nCount = 1); + void insertAt(int nStartIndex, CBArray *pNewArray); // Implementation protected: @@ -129,50 +129,50 @@ public: // CBArray inline functions ///////////////////////////////////////////////////////////////////////////// template -inline int CBArray::GetSize() const { +inline int CBArray::getSize() const { return _nSize; } template -inline int CBArray::GetUpperBound() const { +inline int CBArray::getUpperBound() const { return _nSize - 1; } template -inline void CBArray::RemoveAll() { - SetSize(0, -1); +inline void CBArray::removeAll() { + setSize(0, -1); } template -inline TYPE CBArray::GetAt(int nIndex) const { +inline TYPE CBArray::getAt(int nIndex) const { return _pData[nIndex]; } template -inline void CBArray::SetAt(int nIndex, ARG_TYPE newElement) { +inline void CBArray::setAt(int nIndex, ARG_TYPE newElement) { _pData[nIndex] = newElement; } template -inline TYPE &CBArray::ElementAt(int nIndex) { +inline TYPE &CBArray::elementAt(int nIndex) { return _pData[nIndex]; } template -inline const TYPE *CBArray::GetData() const { +inline const TYPE *CBArray::getData() const { return (const TYPE *)_pData; } template -inline TYPE *CBArray::GetData() { +inline TYPE *CBArray::getData() { return (TYPE *)_pData; } template -inline int CBArray::Add(ARG_TYPE newElement) { +inline int CBArray::add(ARG_TYPE newElement) { int nIndex = _nSize; - SetAtGrow(nIndex, newElement); + setAtGrow(nIndex, newElement); return nIndex; } template inline TYPE CBArray::operator[](int nIndex) const { - return GetAt(nIndex); + return getAt(nIndex); } template inline TYPE &CBArray::operator[](int nIndex) { - return ElementAt(nIndex); + return elementAt(nIndex); } ///////////////////////////////////////////////////////////////////////////// @@ -195,7 +195,7 @@ CBArray::~CBArray() { ///////////////////////////////////////////////////////////////////////////// template -void CBArray::SetSize(int nNewSize, int nGrowBy) { +void CBArray::setSize(int nNewSize, int nGrowBy) { if (nGrowBy != -1) _nGrowBy = nGrowBy; // set new size @@ -255,23 +255,23 @@ void CBArray::SetSize(int nNewSize, int nGrowBy) { ///////////////////////////////////////////////////////////////////////////// template -int CBArray::Append(const CBArray &src) { +int CBArray::append(const CBArray &src) { int nOldSize = _nSize; - SetSize(_nSize + src._nSize); + setSize(_nSize + src._nSize); DCCopyElements(_pData + nOldSize, src._pData, src._nSize); return nOldSize; } ///////////////////////////////////////////////////////////////////////////// template -void CBArray::Copy(const CBArray &src) { - SetSize(src._nSize); +void CBArray::copy(const CBArray &src) { + setSize(src._nSize); DCCopyElements(_pData, src._pData, src._nSize); } ///////////////////////////////////////////////////////////////////////////// template -void CBArray::FreeExtra() { +void CBArray::freeExtra() { if (_nSize != _nMaxSize) { // shrink to desired size TYPE *pNewData = NULL; @@ -290,22 +290,22 @@ void CBArray::FreeExtra() { ///////////////////////////////////////////////////////////////////////////// template -void CBArray::SetAtGrow(int nIndex, ARG_TYPE newElement) { +void CBArray::setAtGrow(int nIndex, ARG_TYPE newElement) { if (nIndex >= _nSize) - SetSize(nIndex + 1, -1); + setSize(nIndex + 1, -1); _pData[nIndex] = newElement; } ///////////////////////////////////////////////////////////////////////////// template -void CBArray::InsertAt(int nIndex, ARG_TYPE newElement, int nCount /*=1*/) { +void CBArray::insertAt(int nIndex, ARG_TYPE newElement, int nCount /*=1*/) { if (nIndex >= _nSize) { // adding after the end of the array - SetSize(nIndex + nCount, -1); // grow so nIndex is valid + setSize(nIndex + nCount, -1); // grow so nIndex is valid } else { // inserting in the middle of the array int nOldSize = _nSize; - SetSize(_nSize + nCount, -1); // grow it to new size + setSize(_nSize + nCount, -1); // grow it to new size // destroy intial data before copying over it DCDestructElements(&_pData[nOldSize], nCount); // shift old data up to fill gap @@ -323,7 +323,7 @@ void CBArray::InsertAt(int nIndex, ARG_TYPE newElement, int nCou ///////////////////////////////////////////////////////////////////////////// template -void CBArray::RemoveAt(int nIndex, int nCount) { +void CBArray::removeAt(int nIndex, int nCount) { // just remove a range int nMoveCount = _nSize - (nIndex + nCount); DCDestructElements(&_pData[nIndex], nCount); @@ -335,11 +335,11 @@ void CBArray::RemoveAt(int nIndex, int nCount) { ///////////////////////////////////////////////////////////////////////////// template -void CBArray::InsertAt(int nStartIndex, CBArray *pNewArray) { +void CBArray::insertAt(int nStartIndex, CBArray *pNewArray) { if (pNewArray->GetSize() > 0) { InsertAt(nStartIndex, pNewArray->GetAt(0), pNewArray->GetSize()); for (int i = 0; i < pNewArray->GetSize(); i++) - SetAt(nStartIndex + i, pNewArray->GetAt(i)); + setAt(nStartIndex + i, pNewArray->GetAt(i)); } } @@ -349,19 +349,19 @@ template ERRORCODE CBArray::persist(CBPersistMgr *persistMgr) { int i, j; if (persistMgr->_saving) { - j = GetSize(); + j = getSize(); persistMgr->transfer("ArraySize", &j); for (i = 0; i < j; i++) { - ARG_TYPE obj = GetAt(i); + ARG_TYPE obj = getAt(i); persistMgr->transfer("", &obj); } } else { - SetSize(0, -1); + setSize(0, -1); persistMgr->transfer("ArraySize", &j); for (i = 0; i < j; i++) { ARG_TYPE obj; persistMgr->transfer("", &obj); - Add(obj); + add(obj); } } return STATUS_OK; diff --git a/engines/wintermute/video/VidPlayer.cpp b/engines/wintermute/video/VidPlayer.cpp index 7fa8e6e218..eed2ddce86 100644 --- a/engines/wintermute/video/VidPlayer.cpp +++ b/engines/wintermute/video/VidPlayer.cpp @@ -114,8 +114,8 @@ ERRORCODE CVidPlayer::cleanup() { SAFE_DELETE_ARRAY(_filename); - for (int i = 0; i < _subtitles.GetSize(); i++) delete _subtitles[i]; - _subtitles.RemoveAll(); + for (int i = 0; i < _subtitles.getSize(); i++) delete _subtitles[i]; + _subtitles.removeAll(); return SetDefaults(); #endif @@ -242,10 +242,10 @@ ERRORCODE CVidPlayer::update() { // process subtitles _showSubtitle = false; - while (_currentSubtitle < _subtitles.GetSize()) { + while (_currentSubtitle < _subtitles.getSize()) { int End = _subtitles[_currentSubtitle]->m_EndFrame; - bool NextFrameOK = (_currentSubtitle < _subtitles.GetSize() - 1 && _subtitles[_currentSubtitle + 1]->_startFrame <= sample); + bool NextFrameOK = (_currentSubtitle < _subtitles.getSize() - 1 && _subtitles[_currentSubtitle + 1]->_startFrame <= sample); if (sample > End) { if (NextFrameOK) { @@ -455,7 +455,7 @@ ERRORCODE CVidPlayer::loadSubtitles(const char *filename, const char *SubtitleFi } Text[TextLength] = '\0'; - if (Start != -1 && TextLength > 0) _subtitles.Add(new CVidSubtitle(Game, Text, Start, End)); + if (Start != -1 && TextLength > 0) _subtitles.add(new CVidSubtitle(Game, Text, Start, End)); delete [] Text; -- cgit v1.2.3