aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Ad
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/Ad')
-rw-r--r--engines/wintermute/Ad/AdActor.cpp44
-rw-r--r--engines/wintermute/Ad/AdEntity.cpp8
-rw-r--r--engines/wintermute/Ad/AdGame.cpp182
-rw-r--r--engines/wintermute/Ad/AdInventory.cpp18
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.cpp6
-rw-r--r--engines/wintermute/Ad/AdItem.cpp4
-rw-r--r--engines/wintermute/Ad/AdLayer.cpp32
-rw-r--r--engines/wintermute/Ad/AdObject.cpp58
-rw-r--r--engines/wintermute/Ad/AdPath.cpp12
-rw-r--r--engines/wintermute/Ad/AdRegion.cpp10
-rw-r--r--engines/wintermute/Ad/AdResponseBox.cpp44
-rw-r--r--engines/wintermute/Ad/AdScene.cpp226
-rw-r--r--engines/wintermute/Ad/AdSceneState.cpp8
-rw-r--r--engines/wintermute/Ad/AdSentence.cpp2
-rw-r--r--engines/wintermute/Ad/AdTalkDef.cpp8
-rw-r--r--engines/wintermute/Ad/AdTalkHolder.cpp44
-rw-r--r--engines/wintermute/Ad/AdWaypointGroup.cpp12
17 files changed, 359 insertions, 359 deletions
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<CAdSpriteSet *, CAdSpriteSet *> 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 **)&params)) > 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<CUIObject *, CUIObject *> 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<CUIObject *, CUIObject *> 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<CUIObject *, CUIObject *> &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<CAdObject *, CAdObject *> 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<CAdObject *, CAdObject *> 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<CAdObject *, CAdObject *> &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<CAdObject *, CAdObject *> 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<CAdObject *, CAdObject *> &objects,
// objects outside any region
CBArray<CAdObject *, CAdObject *> 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<CAdObject *, CAd
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->_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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 02:57:50 +0000