diff options
Diffstat (limited to 'engines/wintermute/ad')
26 files changed, 2267 insertions, 976 deletions
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp index fe1948d3a8..d1e03eac3a 100644 --- a/engines/wintermute/ad/ad_actor.cpp +++ b/engines/wintermute/ad/ad_actor.cpp @@ -129,7 +129,9 @@ bool AdActor::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ACTOR file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing ACTOR file '%s'", filename);
+ }
delete[] buffer;
@@ -235,7 +237,9 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_X:
@@ -255,7 +259,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_FONT:
- SetFont((char *)params);
+ setFont((char *)params);
break;
case TOKEN_SCALABLE:
@@ -285,44 +289,62 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { delete _walkSprite;
_walkSprite = NULL;
spr = new AdSpriteSet(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texWalkLifeTime, CACHE_HALF))) cmd = PARSERR_GENERIC;
- else _walkSprite = spr;
+ if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texWalkLifeTime, CACHE_HALF))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _walkSprite = spr;
+ }
break;
case TOKEN_TALK:
spr = new AdSpriteSet(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC;
- else _talkSprites.add(spr);
+ if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texTalkLifeTime))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _talkSprites.add(spr);
+ }
break;
case TOKEN_TALK_SPECIAL:
spr = new AdSpriteSet(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC;
- else _talkSpritesEx.add(spr);
+ if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texTalkLifeTime))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _talkSpritesEx.add(spr);
+ }
break;
case TOKEN_STAND:
delete _standSprite;
_standSprite = NULL;
spr = new AdSpriteSet(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texStandLifeTime))) cmd = PARSERR_GENERIC;
- else _standSprite = spr;
+ if (!spr || DID_FAIL(spr->loadBuffer(params, true, adGame->_texStandLifeTime))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _standSprite = spr;
+ }
break;
case TOKEN_TURN_LEFT:
delete _turnLeftSprite;
_turnLeftSprite = NULL;
spr = new AdSpriteSet(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadBuffer(params, true))) cmd = PARSERR_GENERIC;
- else _turnLeftSprite = spr;
+ if (!spr || DID_FAIL(spr->loadBuffer(params, true))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _turnLeftSprite = spr;
+ }
break;
case TOKEN_TURN_RIGHT:
delete _turnRightSprite;
_turnRightSprite = NULL;
spr = new AdSpriteSet(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadBuffer(params, true))) cmd = PARSERR_GENERIC;
- else _turnRightSprite = spr;
+ if (!spr || DID_FAIL(spr->loadBuffer(params, true))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _turnRightSprite = spr;
+ }
break;
case TOKEN_SCRIPT:
@@ -426,9 +448,12 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_ANIMATION: {
- AdSpriteSet *Anim = new AdSpriteSet(_gameRef, this);
- if (!Anim || DID_FAIL(Anim->loadBuffer(params, false))) cmd = PARSERR_GENERIC;
- else _anims.add(Anim);
+ AdSpriteSet *anim = new AdSpriteSet(_gameRef, this);
+ if (!anim || DID_FAIL(anim->loadBuffer(params, false))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _anims.add(anim);
+ }
}
break;
}
@@ -438,7 +463,9 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) { return STATUS_FAILED;
}
if (cmd == PARSERR_GENERIC) {
- if (spr) delete spr;
+ if (spr) {
+ delete spr;
+ }
_gameRef->LOG(0, "Error loading ACTOR definition");
return STATUS_FAILED;
}
@@ -482,7 +509,9 @@ void AdActor::turnTo(TDirection dir) { //////////////////////////////////////////////////////////////////////////
void AdActor::goTo(int x, int y, TDirection afterWalkDir) {
_afterWalkDir = afterWalkDir;
- if (x == _targetPoint->x && y == _targetPoint->y && _state == STATE_FOLLOWING_PATH) return;
+ if (x == _targetPoint->x && y == _targetPoint->y && _state == STATE_FOLLOWING_PATH) {
+ return;
+ }
_path->reset();
_path->setReady(false);
@@ -499,11 +528,16 @@ void AdActor::goTo(int x, int y, TDirection afterWalkDir) { //////////////////////////////////////////////////////////////////////////
bool AdActor::display() {
- if (_active) updateSounds();
+ if (_active) {
+ updateSounds();
+ }
uint32 alpha;
- if (_alphaColor != 0) alpha = _alphaColor;
- else alpha = _shadowable ? ((AdGame *)_gameRef)->_scene->getAlphaAt(_posX, _posY, true) : 0xFFFFFFFF;
+ if (_alphaColor != 0) {
+ alpha = _alphaColor;
+ } else {
+ alpha = _shadowable ? ((AdGame *)_gameRef)->_scene->getAlphaAt(_posX, _posY, true) : 0xFFFFFFFF;
+ }
float scaleX, scaleY;
getScale(&scaleX, &scaleY);
@@ -511,15 +545,24 @@ bool AdActor::display() { float rotate;
if (_rotatable) {
- if (_rotateValid) rotate = _rotate;
- else rotate = ((AdGame *)_gameRef)->_scene->getRotationAt(_posX, _posY) + _relativeRotate;
- } else rotate = 0.0f;
+ if (_rotateValid) {
+ rotate = _rotate;
+ } else {
+ rotate = ((AdGame *)_gameRef)->_scene->getRotationAt(_posX, _posY) + _relativeRotate;
+ }
+ } else {
+ rotate = 0.0f;
+ }
- if (_active) displaySpriteAttachments(true);
+ if (_active) {
+ displaySpriteAttachments(true);
+ }
if (_currentSprite && _active) {
bool reg = _registrable;
- if (_ignoreItems && ((AdGame *)_gameRef)->_selectedItem) reg = false;
+ if (_ignoreItems && ((AdGame *)_gameRef)->_selectedItem) {
+ reg = false;
+ }
_currentSprite->display(_posX,
_posY,
@@ -532,8 +575,12 @@ bool AdActor::display() { }
- if (_active) displaySpriteAttachments(false);
- if (_active && _partEmitter) _partEmitter->display();
+ if (_active) {
+ displaySpriteAttachments(false);
+ }
+ if (_active && _partEmitter) {
+ _partEmitter->display();
+ }
return STATUS_OK;
@@ -567,17 +614,22 @@ bool AdActor::update() { _currentSprite = _animSprite2;
}
- if (_sentence && _state != STATE_TALKING) _sentence->finish();
+ if (_sentence && _state != STATE_TALKING) {
+ _sentence->finish();
+ }
// default: stand animation
if (!_currentSprite) {
- if (_sprite) _currentSprite = _sprite;
- else {
+ if (_sprite) {
+ _currentSprite = _sprite;
+ } else {
if (_standSprite) {
_currentSprite = _standSprite->getSprite(_dir);
} else {
- AdSpriteSet *Anim = getAnimByName(_idleAnimName);
- if (Anim) _currentSprite = Anim->getSprite(_dir);
+ AdSpriteSet *anim = getAnimByName(_idleAnimName);
+ if (anim) {
+ _currentSprite = anim->getSprite(_dir);
+ }
}
}
}
@@ -598,8 +650,11 @@ bool AdActor::update() { //////////////////////////////////////////////////////////////////////////
case STATE_TURNING_LEFT:
if (_tempSprite2 == NULL || _tempSprite2->_finished) {
- if (_dir > 0) _dir = (TDirection)(_dir - 1);
- else _dir = (TDirection)(NUM_DIRECTIONS - 1);
+ if (_dir > 0) {
+ _dir = (TDirection)(_dir - 1);
+ } else {
+ _dir = (TDirection)(NUM_DIRECTIONS - 1);
+ }
if (_dir == _targetDir) {
_tempSprite2 = NULL;
@@ -609,17 +664,23 @@ bool AdActor::update() { if (_turnLeftSprite) {
_tempSprite2 = _turnLeftSprite->getSprite(_dir);
} else {
- AdSpriteSet *Anim = getAnimByName(_turnLeftAnimName);
- if (Anim) _tempSprite2 = Anim->getSprite(_dir);
+ AdSpriteSet *anim = getAnimByName(_turnLeftAnimName);
+ if (anim) {
+ _tempSprite2 = anim->getSprite(_dir);
+ }
}
if (_tempSprite2) {
_tempSprite2->reset();
- if (_tempSprite2->_looping) _tempSprite2->_looping = false;
+ if (_tempSprite2->_looping) {
+ _tempSprite2->_looping = false;
+ }
}
_currentSprite = _tempSprite2;
}
- } else _currentSprite = _tempSprite2;
+ } else {
+ _currentSprite = _tempSprite2;
+ }
break;
@@ -628,7 +689,9 @@ bool AdActor::update() { if (_tempSprite2 == NULL || _tempSprite2->_finished) {
_dir = (TDirection)(_dir + 1);
- if ((int)_dir >= (int)NUM_DIRECTIONS) _dir = (TDirection)(0);
+ if ((int)_dir >= (int)NUM_DIRECTIONS) {
+ _dir = (TDirection)(0);
+ }
if (_dir == _targetDir) {
_tempSprite2 = NULL;
@@ -638,32 +701,41 @@ bool AdActor::update() { if (_turnRightSprite) {
_tempSprite2 = _turnRightSprite->getSprite(_dir);
} else {
- AdSpriteSet *Anim = getAnimByName(_turnRightAnimName);
- if (Anim) _tempSprite2 = Anim->getSprite(_dir);
+ AdSpriteSet *anim = getAnimByName(_turnRightAnimName);
+ if (anim) {
+ _tempSprite2 = anim->getSprite(_dir);
+ }
}
if (_tempSprite2) {
_tempSprite2->reset();
- if (_tempSprite2->_looping) _tempSprite2->_looping = false;
+ if (_tempSprite2->_looping) {
+ _tempSprite2->_looping = false;
+ }
}
_currentSprite = _tempSprite2;
}
- } else _currentSprite = _tempSprite2;
+ } else {
+ _currentSprite = _tempSprite2;
+ }
break;
//////////////////////////////////////////////////////////////////////////
case STATE_SEARCHING_PATH:
// keep asking scene for the path
- if (((AdGame *)_gameRef)->_scene->getPath(BasePoint(_posX, _posY), *_targetPoint, _path, this))
+ if (((AdGame *)_gameRef)->_scene->getPath(BasePoint(_posX, _posY), *_targetPoint, _path, this)) {
_state = STATE_WAITING_PATH;
+ }
break;
//////////////////////////////////////////////////////////////////////////
case STATE_WAITING_PATH:
// wait until the scene finished the path
- if (_path->_ready) followPath();
+ if (_path->_ready) {
+ followPath();
+ }
break;
@@ -676,7 +748,9 @@ bool AdActor::update() { //////////////////////////////////////////////////////////////////////////
case STATE_TALKING: {
_sentence->update(_dir);
- if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite;
+ if (_sentence->_currentSprite) {
+ _tempSprite2 = _sentence->_currentSprite;
+ }
bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime);
if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ TimeIsUp)) {
@@ -703,13 +777,16 @@ bool AdActor::update() { //////////////////////////////////////////////////////////////////////////
case STATE_READY:
if (!_animSprite && !_animSprite2) {
- if (_sprite) _currentSprite = _sprite;
- else {
+ if (_sprite) {
+ _currentSprite = _sprite;
+ } else {
if (_standSprite) {
_currentSprite = _standSprite->getSprite(_dir);
} else {
- AdSpriteSet *Anim = getAnimByName(_idleAnimName);
- if (Anim) _currentSprite = Anim->getSprite(_dir);
+ AdSpriteSet *anim = getAnimByName(_idleAnimName);
+ if (anim) {
+ _currentSprite = anim->getSprite(_dir);
+ }
}
}
}
@@ -745,7 +822,9 @@ void AdActor::followPath() { // skip current position
_path->getFirst();
while (_path->getCurrent() != NULL) {
- if (_path->getCurrent()->x != _posX || _path->getCurrent()->y != _posY) break;
+ if (_path->getCurrent()->x != _posX || _path->getCurrent()->y != _posY) {
+ break;
+ }
_path->getNext();
}
@@ -754,8 +833,11 @@ void AdActor::followPath() { _state = STATE_FOLLOWING_PATH;;
initLine(BasePoint(_posX, _posY), *_path->getCurrent());
} else {
- if (_afterWalkDir != DI_NONE) turnTo(_afterWalkDir);
- else _state = STATE_READY;
+ if (_afterWalkDir != DI_NONE) {
+ turnTo(_afterWalkDir);
+ } else {
+ _state = STATE_READY;
+ }
}
}
@@ -765,14 +847,20 @@ void AdActor::getNextStep() { if (_walkSprite) {
_currentSprite = _walkSprite->getSprite(_dir);
} else {
- AdSpriteSet *Anim = getAnimByName(_walkAnimName);
- if (Anim) _currentSprite = Anim->getSprite(_dir);
+ AdSpriteSet *anim = getAnimByName(_walkAnimName);
+ if (anim) {
+ _currentSprite = anim->getSprite(_dir);
+ }
}
- if (!_currentSprite) return;
+ if (!_currentSprite) {
+ return;
+ }
_currentSprite->GetCurrentFrame(_zoomable ? ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY) : 100, _zoomable ? ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY) : 100);
- if (!_currentSprite->_changed) return;
+ if (!_currentSprite->_changed) {
+ return;
+ }
int maxStepX, maxStepY;
@@ -813,12 +901,15 @@ void AdActor::getNextStep() { _posY = _targetPoint->y;
_path->reset();
- if (_afterWalkDir != DI_NONE) turnTo(_afterWalkDir);
- else {
+ if (_afterWalkDir != DI_NONE) {
+ turnTo(_afterWalkDir);
+ } else {
_state = _nextState;
_nextState = STATE_READY;
}
- } else initLine(BasePoint(_posX, _posY), *_path->getCurrent());
+ } else {
+ initLine(BasePoint(_posX, _posY), *_path->getCurrent());
+ }
}
}
@@ -853,7 +944,9 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, int X = stack->pop()->getInt();
int Y = stack->pop()->getInt();
goTo(X, Y);
- if (strcmp(name, "GoToAsync") != 0) script->waitForExclusive(this);
+ if (strcmp(name, "GoToAsync") != 0) {
+ script->waitForExclusive(this);
+ }
stack->pushNULL();
return STATUS_OK;
}
@@ -863,22 +956,27 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "GoToObject") == 0 || strcmp(name, "GoToObjectAsync") == 0) {
stack->correctParams(1);
- ScValue *Val = stack->pop();
- if (!Val->isNative()) {
+ ScValue *val = stack->pop();
+ if (!val->isNative()) {
script->runtimeError("actor.%s method accepts an entity refrence only", name);
stack->pushNULL();
return STATUS_OK;
}
- AdObject *Obj = (AdObject *)Val->getNative();
- if (!Obj || Obj->_type != OBJECT_ENTITY) {
+ AdObject *obj = (AdObject *)val->getNative();
+ if (!obj || obj->_type != OBJECT_ENTITY) {
script->runtimeError("actor.%s method accepts an entity refrence only", name);
stack->pushNULL();
return STATUS_OK;
}
- AdEntity *Ent = (AdEntity *)Obj;
- if (Ent->_walkToX == 0 && Ent->_walkToY == 0) goTo(Ent->_posX, Ent->_posY);
- else goTo(Ent->_walkToX, Ent->_walkToY, Ent->_walkToDir);
- if (strcmp(name, "GoToObjectAsync") != 0) script->waitForExclusive(this);
+ AdEntity *ent = (AdEntity *)obj;
+ if (ent->_walkToX == 0 && ent->_walkToY == 0) {
+ goTo(ent->_posX, ent->_posY);
+ } else {
+ goTo(ent->_walkToX, ent->_walkToY, ent->_walkToDir);
+ }
+ if (strcmp(name, "GoToObjectAsync") != 0) {
+ script->waitForExclusive(this);
+ }
stack->pushNULL();
return STATUS_OK;
}
@@ -898,11 +996,15 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, dir = (int)angleToDirection(angle);
}
// otherwise turn to direction
- else dir = val->getInt();
+ else {
+ dir = val->getInt();
+ }
if (dir >= 0 && dir < NUM_DIRECTIONS) {
turnTo((TDirection)dir);
- if (strcmp(name, "TurnToAsync") != 0) script->waitForExclusive(this);
+ if (strcmp(name, "TurnToAsync") != 0) {
+ script->waitForExclusive(this);
+ }
}
stack->pushNULL();
return STATUS_OK;
@@ -937,9 +1039,15 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, for (int i = 0; i < _anims.getSize(); i++) {
if (scumm_stricmp(_anims[i]->getName(), AnimName) == 0) {
// invalidate sprites in use
- if (_anims[i]->containsSprite(_tempSprite2)) _tempSprite2 = NULL;
- if (_anims[i]->containsSprite(_currentSprite)) _currentSprite = NULL;
- if (_anims[i]->containsSprite(_animSprite2)) _animSprite2 = NULL;
+ if (_anims[i]->containsSprite(_tempSprite2)) {
+ _tempSprite2 = NULL;
+ }
+ if (_anims[i]->containsSprite(_currentSprite)) {
+ _currentSprite = NULL;
+ }
+ if (_anims[i]->containsSprite(_animSprite2)) {
+ _animSprite2 = NULL;
+ }
delete _anims[i];
_anims[i] = NULL;
@@ -960,9 +1068,9 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *AnimName = stack->pop()->getString();
stack->pushBool(getAnimByName(AnimName) != NULL);
return STATUS_OK;
+ } else {
+ return AdTalkHolder::scCallMethod(script, stack, thisStack, name);
}
-
- else return AdTalkHolder::scCallMethod(script, stack, thisStack, name);
}
@@ -1022,9 +1130,9 @@ ScValue *AdActor::scGetProperty(const char *name) { else if (strcmp(name, "TurnRightAnimName") == 0) {
_scValue->setString(_turnRightAnimName);
return _scValue;
+ } else {
+ return AdTalkHolder::scGetProperty(name);
}
-
- else return AdTalkHolder::scGetProperty(name);
}
@@ -1035,7 +1143,9 @@ bool AdActor::scSetProperty(const char *name, ScValue *value) { //////////////////////////////////////////////////////////////////////////
if (strcmp(name, "Direction") == 0) {
int dir = value->getInt();
- if (dir >= 0 && dir < NUM_DIRECTIONS) _dir = (TDirection)dir;
+ if (dir >= 0 && dir < NUM_DIRECTIONS) {
+ _dir = (TDirection)dir;
+ }
return STATUS_OK;
}
@@ -1043,8 +1153,11 @@ bool AdActor::scSetProperty(const char *name, ScValue *value) { // TalkAnimName
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "TalkAnimName") == 0) {
- if (value->isNULL()) _talkAnimName = "talk";
- else _talkAnimName = value->getString();
+ if (value->isNULL()) {
+ _talkAnimName = "talk";
+ } else {
+ _talkAnimName = value->getString();
+ }
return STATUS_OK;
}
@@ -1052,8 +1165,11 @@ bool AdActor::scSetProperty(const char *name, ScValue *value) { // WalkAnimName
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "WalkAnimName") == 0) {
- if (value->isNULL()) _walkAnimName = "walk";
- else _walkAnimName = value->getString();
+ if (value->isNULL()) {
+ _walkAnimName = "walk";
+ } else {
+ _walkAnimName = value->getString();
+ }
return STATUS_OK;
}
@@ -1061,8 +1177,11 @@ bool AdActor::scSetProperty(const char *name, ScValue *value) { // IdleAnimName
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "IdleAnimName") == 0) {
- if (value->isNULL()) _idleAnimName = "idle";
- else _idleAnimName = value->getString();
+ if (value->isNULL()) {
+ _idleAnimName = "idle";
+ } else {
+ _idleAnimName = value->getString();
+ }
return STATUS_OK;
}
@@ -1070,8 +1189,11 @@ bool AdActor::scSetProperty(const char *name, ScValue *value) { // TurnLeftAnimName
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "TurnLeftAnimName") == 0) {
- if (value->isNULL()) _turnLeftAnimName = "turnleft";
- else _turnLeftAnimName = value->getString();
+ if (value->isNULL()) {
+ _turnLeftAnimName = "turnleft";
+ } else {
+ _turnLeftAnimName = value->getString();
+ }
return STATUS_OK;
}
@@ -1079,12 +1201,15 @@ bool AdActor::scSetProperty(const char *name, ScValue *value) { // TurnRightAnimName
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "TurnRightAnimName") == 0) {
- if (value->isNULL()) _turnRightAnimName = "turnright";
- else _turnRightAnimName = value->getString();
+ if (value->isNULL()) {
+ _turnRightAnimName = "turnright";
+ } else {
+ _turnRightAnimName = value->getString();
+ }
return STATUS_OK;
+ } else {
+ return AdTalkHolder::scSetProperty(name, value);
}
-
- else return AdTalkHolder::scSetProperty(name, value);
}
@@ -1107,37 +1232,46 @@ BaseSprite *AdActor::getTalkStance(const char *stance) { _gameRef->LOG(res, "AdActor::GetTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", getName(), _forcedTalkAnimName);
delete _animSprite;
_animSprite = NULL;
- } else return _animSprite;
+ } else {
+ return _animSprite;
+ }
}
}
// old way
- if (_talkSprites.getSize() > 0 || _talkSpritesEx.getSize() > 0)
+ if (_talkSprites.getSize() > 0 || _talkSpritesEx.getSize() > 0) {
return getTalkStanceOld(stance);
+ }
// new way
BaseSprite *ret = NULL;
// do we have an animation with this name?
- AdSpriteSet *Anim = getAnimByName(stance);
- if (Anim) ret = Anim->getSprite(_dir);
+ AdSpriteSet *anim = getAnimByName(stance);
+ if (anim) {
+ ret = anim->getSprite(_dir);
+ }
// not - get a random talk
if (!ret) {
- BaseArray<AdSpriteSet *, AdSpriteSet *> TalkAnims;
+ BaseArray<AdSpriteSet *, AdSpriteSet *> talkAnims;
for (int i = 0; i < _anims.getSize(); i++) {
- if (_talkAnimName.compareToIgnoreCase(_anims[i]->getName()) == 0)
- TalkAnims.add(_anims[i]);
+ if (_talkAnimName.compareToIgnoreCase(_anims[i]->getName()) == 0) {
+ talkAnims.add(_anims[i]);
+ }
}
- if (TalkAnims.getSize() > 0) {
- int rnd = g_wintermute->randInt(0, TalkAnims.getSize() - 1);
- ret = TalkAnims[rnd]->getSprite(_dir);
+ 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);
- else {
- Anim = getAnimByName(_idleAnimName);
- if (Anim) ret = Anim->getSprite(_dir);
+ if (_standSprite) {
+ ret = _standSprite->getSprite(_dir);
+ } else {
+ anim = getAnimByName(_idleAnimName);
+ if (anim) {
+ ret = anim->getSprite(_dir);
+ }
}
}
}
@@ -1169,8 +1303,9 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) { // not a valid stance? get a random one
if (ret == NULL) {
- if (_talkSprites.getSize() < 1) ret = _standSprite->getSprite(_dir);
- else {
+ if (_talkSprites.getSize() < 1) {
+ ret = _standSprite->getSprite(_dir);
+ } else {
// TODO: remember last
int rnd = g_wintermute->randInt(0, _talkSprites.getSize() - 1);
ret = _talkSprites[rnd]->getSprite(_dir);
@@ -1218,14 +1353,23 @@ bool AdActor::persist(BasePersistenceManager *persistMgr) { TDirection AdActor::angleToDirection(int angle) {
TDirection ret = DI_DOWN;;
- if (angle > -112 && angle <= -67) ret = DI_UP;
- else if (angle > -67 && angle <= -22) ret = DI_UPRIGHT;
- else if (angle > -22 && angle <= 22) ret = DI_RIGHT;
- else if (angle > 22 && angle <= 67) ret = DI_DOWNRIGHT;
- else if (angle > 67 && angle <= 112) ret = DI_DOWN;
- else if (angle > 112 && angle <= 157) ret = DI_DOWNLEFT;
- else if ((angle > 157 && angle <= 180) || (angle >= -180 && angle <= -157)) ret = DI_LEFT;
- else if (angle > -157 && angle <= -112) ret = DI_UPLEFT;
+ if (angle > -112 && angle <= -67) {
+ ret = DI_UP;
+ } else if (angle > -67 && angle <= -22) {
+ ret = DI_UPRIGHT;
+ } else if (angle > -22 && angle <= 22) {
+ ret = DI_RIGHT;
+ } else if (angle > 22 && angle <= 67) {
+ ret = DI_DOWNRIGHT;
+ } else if (angle > 67 && angle <= 112) {
+ ret = DI_DOWN;
+ } else if (angle > 112 && angle <= 157) {
+ ret = DI_DOWNLEFT;
+ } else if ((angle > 157 && angle <= 180) || (angle >= -180 && angle <= -157)) {
+ ret = DI_LEFT;
+ } else if (angle > -157 && angle <= -112) {
+ ret = DI_UPLEFT;
+ }
return ret;
}
@@ -1235,10 +1379,13 @@ TDirection AdActor::angleToDirection(int angle) { int AdActor::getHeight() {
// if no current sprite is set, set some
if (_currentSprite == NULL) {
- if (_standSprite) _currentSprite = _standSprite->getSprite(_dir);
- else {
- AdSpriteSet *Anim = getAnimByName(_idleAnimName);
- if (Anim) _currentSprite = Anim->getSprite(_dir);
+ if (_standSprite) {
+ _currentSprite = _standSprite->getSprite(_dir);
+ } else {
+ AdSpriteSet *anim = getAnimByName(_idleAnimName);
+ if (anim) {
+ _currentSprite = anim->getSprite(_dir);
+ }
}
}
// and get height
@@ -1249,8 +1396,9 @@ int AdActor::getHeight() { //////////////////////////////////////////////////////////////////////////
AdSpriteSet *AdActor::getAnimByName(const Common::String &animName) {
for (int i = 0; i < _anims.getSize(); i++) {
- if (animName.compareToIgnoreCase(_anims[i]->getName()) == 0)
+ if (animName.compareToIgnoreCase(_anims[i]->getName()) == 0) {
return _anims[i];
+ }
}
return NULL;
}
@@ -1278,11 +1426,13 @@ bool AdActor::mergeAnims(const char *animsFilename) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_ANIMATION: {
- AdSpriteSet *Anim = new AdSpriteSet(_gameRef, this);
- if (!Anim || DID_FAIL(Anim->loadBuffer(params, false))) {
+ AdSpriteSet *anim = new AdSpriteSet(_gameRef, this);
+ if (!anim || DID_FAIL(anim->loadBuffer(params, false))) {
cmd = PARSERR_GENERIC;
Ret = STATUS_FAILED;
- } else _anims.add(Anim);
+ } else {
+ _anims.add(anim);
+ }
}
break;
}
@@ -1294,9 +1444,9 @@ bool AdActor::mergeAnims(const char *animsFilename) { //////////////////////////////////////////////////////////////////////////
bool AdActor::playAnim(const char *filename) {
// if we have an anim with this name, use it
- AdSpriteSet *Anim = getAnimByName(filename);
- if (Anim) {
- _animSprite2 = Anim->getSprite(_dir);
+ AdSpriteSet *anim = getAnimByName(filename);
+ if (anim) {
+ _animSprite2 = anim->getSprite(_dir);
if (_animSprite2) {
_animSprite2->reset();
_state = STATE_PLAYING_ANIM_SET;
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp index 98fb296bf5..aa30a0096c 100644 --- a/engines/wintermute/ad/ad_entity.cpp +++ b/engines/wintermute/ad/ad_entity.cpp @@ -94,7 +94,9 @@ bool AdEntity::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ENTITY file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing ENTITY file '%s'", filename);
+ }
delete[] buffer;
@@ -212,7 +214,9 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_X:
@@ -227,22 +231,31 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { delete _sprite;
_sprite = NULL;
spr = new BaseSprite(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadFile((char *)params))) cmd = PARSERR_GENERIC;
- else _sprite = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprite = spr;
+ }
}
break;
case TOKEN_TALK: {
spr = new BaseSprite(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC;
- else _talkSprites.add(spr);
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, adGame->_texTalkLifeTime))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _talkSprites.add(spr);
+ }
}
break;
case TOKEN_TALK_SPECIAL: {
spr = new BaseSprite(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, adGame->_texTalkLifeTime))) cmd = PARSERR_GENERIC;
- else _talkSpritesEx.add(spr);
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, adGame->_texTalkLifeTime))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _talkSpritesEx.add(spr);
+ }
}
break;
@@ -259,7 +272,7 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_FONT:
- SetFont((char *)params);
+ setFont((char *)params);
break;
case TOKEN_SCALABLE:
@@ -316,11 +329,14 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_REGION: {
- if (_region) _gameRef->unregisterObject(_region);
+ if (_region) {
+ _gameRef->unregisterObject(_region);
+ }
_region = NULL;
BaseRegion *rgn = new BaseRegion(_gameRef);
- if (!rgn || DID_FAIL(rgn->loadBuffer(params, false))) cmd = PARSERR_GENERIC;
- else {
+ if (!rgn || DID_FAIL(rgn->loadBuffer(params, false))) {
+ cmd = PARSERR_GENERIC;
+ } else {
_region = rgn;
_gameRef->registerObject(_region);
}
@@ -379,10 +395,15 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { _sprite = NULL;
if (_gameRef->_editorMode) {
spr = new BaseSprite(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadFile("entity_sound.sprite"))) cmd = PARSERR_GENERIC;
- else _sprite = spr;
+ if (!spr || DID_FAIL(spr->loadFile("entity_sound.sprite"))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprite = spr;
+ }
+ }
+ if (_gameRef->_editorMode) {
+ _editorOnly = true;
}
- if (_gameRef->_editorMode) _editorOnly = true;
_zoomable = false;
_rotatable = false;
_registrable = _gameRef->_editorMode;
@@ -443,8 +464,12 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { case TOKEN_WALK_TO_DIR: {
int i;
parser.scanStr((char *)params, "%d", &i);
- if (i < 0) i = 0;
- if (i >= NUM_DIRECTIONS) i = DI_NONE;
+ if (i < 0) {
+ i = 0;
+ }
+ if (i >= NUM_DIRECTIONS) {
+ i = DI_NONE;
+ }
_walkToDir = (TDirection)i;
}
break;
@@ -456,7 +481,9 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { }
if (cmd == PARSERR_GENERIC) {
_gameRef->LOG(0, "Error loading ENTITY definition");
- if (spr) delete spr;
+ if (spr) {
+ delete spr;
+ }
return STATUS_FAILED;
}
@@ -472,7 +499,9 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) { _alphaColor = BYTETORGBA(ar, ag, ab, alpha);
_state = STATE_READY;
- if (_item && ((AdGame *)_gameRef)->isItemTaken(_item)) _active = false;
+ if (_item && ((AdGame *)_gameRef)->isItemTaken(_item)) {
+ _active = false;
+ }
return STATUS_OK;
}
@@ -483,43 +512,55 @@ bool AdEntity::display() { if (_active) {
updateSounds();
- uint32 Alpha;
- if (_alphaColor != 0) Alpha = _alphaColor;
- else Alpha = _shadowable ? ((AdGame *)_gameRef)->_scene->getAlphaAt(_posX, _posY) : 0xFFFFFFFF;
+ uint32 alpha;
+ if (_alphaColor != 0) {
+ alpha = _alphaColor;
+ } else {
+ alpha = _shadowable ? ((AdGame *)_gameRef)->_scene->getAlphaAt(_posX, _posY) : 0xFFFFFFFF;
+ }
- float ScaleX, ScaleY;
- getScale(&ScaleX, &ScaleY);
+ float scaleX, scaleY;
+ getScale(&scaleX, &scaleY);
- float Rotate;
+ float rotate;
if (_rotatable) {
- if (_rotateValid) Rotate = _rotate;
- else Rotate = ((AdGame *)_gameRef)->_scene->getRotationAt(_posX, _posY) + _relativeRotate;
- } else Rotate = 0.0f;
+ if (_rotateValid) {
+ rotate = _rotate;
+ } else {
+ rotate = ((AdGame *)_gameRef)->_scene->getRotationAt(_posX, _posY) + _relativeRotate;
+ }
+ } else {
+ rotate = 0.0f;
+ }
- bool Reg = _registrable;
- if (_ignoreItems && ((AdGame *)_gameRef)->_selectedItem) Reg = false;
+ bool reg = _registrable;
+ if (_ignoreItems && ((AdGame *)_gameRef)->_selectedItem) {
+ reg = false;
+ }
- if (_region && (Reg || _editorAlwaysRegister)) {
+ if (_region && (reg || _editorAlwaysRegister)) {
_gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, _registerAlias, _region, _gameRef->_offsetX, _gameRef->_offsetY));
}
displaySpriteAttachments(true);
if (_theora && (_theora->isPlaying() || _theora->isPaused())) {
- _theora->display(Alpha);
+ _theora->display(alpha);
} else if (_currentSprite) {
_currentSprite->display(_posX,
_posY,
- (Reg || _editorAlwaysRegister) ? _registerAlias : NULL,
- ScaleX,
- ScaleY,
- Alpha,
- Rotate,
+ (reg || _editorAlwaysRegister) ? _registerAlias : NULL,
+ scaleX,
+ scaleY,
+ alpha,
+ rotate,
_blendMode);
}
displaySpriteAttachments(false);
- if (_partEmitter) _partEmitter->display(_region);
+ if (_partEmitter) {
+ _partEmitter->display(_region);
+ }
}
return STATUS_OK;
@@ -541,10 +582,14 @@ bool AdEntity::update() { _currentSprite = _animSprite;
}
- if (_sentence && _state != STATE_TALKING) _sentence->finish();
+ if (_sentence && _state != STATE_TALKING) {
+ _sentence->finish();
+ }
// default: stand animation
- if (!_currentSprite) _currentSprite = _sprite;
+ if (!_currentSprite) {
+ _currentSprite = _sprite;
+ }
switch (_state) {
//////////////////////////////////////////////////////////////////////////
@@ -554,14 +599,17 @@ bool AdEntity::update() { //////////////////////////////////////////////////////////////////////////
case STATE_READY:
- if (!_animSprite)
+ if (!_animSprite) {
_currentSprite = _sprite;
+ }
break;
//////////////////////////////////////////////////////////////////////////
case STATE_TALKING: {
_sentence->update();
- if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite;
+ if (_sentence->_currentSprite) {
+ _tempSprite2 = _sentence->_currentSprite;
+ }
bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime);
if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ TimeIsUp)) {
@@ -630,8 +678,11 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack if (strcmp(name, "StopSound") == 0 && _subtype == ENTITY_SOUND) {
stack->correctParams(0);
- if (DID_FAIL(stopSFX(false))) stack->pushBool(false);
- else stack->pushBool(true);
+ if (DID_FAIL(stopSFX(false))) {
+ stack->pushBool(false);
+ } else {
+ stack->pushBool(true);
+ }
return STATUS_OK;
}
@@ -648,7 +699,9 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack delete _theora;
_theora = new VideoTheoraPlayer(_gameRef);
if (_theora && DID_SUCCEED(_theora->initialize(filename))) {
- if (!valAlpha->isNULL()) _theora->setAlphaImage(valAlpha->getString());
+ if (!valAlpha->isNULL()) {
+ _theora->setAlphaImage(valAlpha->getString());
+ }
_theora->play(VID_PLAY_POS, 0, 0, false, false, looping, startTime, _scale >= 0.0f ? _scale : -1.0f, _sFXVolume);
//if (_scale>=0) _theora->_playZoom = _scale;
stack->pushBool(true);
@@ -670,7 +723,9 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack delete _theora;
_theora = NULL;
stack->pushBool(true);
- } else stack->pushBool(false);
+ } else {
+ stack->pushBool(false);
+ }
return STATUS_OK;
}
@@ -680,8 +735,11 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "IsTheoraPlaying") == 0) {
stack->correctParams(0);
- if (_theora && _theora->isPlaying()) stack->pushBool(true);
- else stack->pushBool(false);
+ if (_theora && _theora->isPlaying()) {
+ stack->pushBool(true);
+ } else {
+ stack->pushBool(false);
+ }
return STATUS_OK;
}
@@ -694,7 +752,9 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack if (_theora && _theora->isPlaying()) {
_theora->pause();
stack->pushBool(true);
- } else stack->pushBool(false);
+ } else {
+ stack->pushBool(false);
+ }
return STATUS_OK;
}
@@ -707,7 +767,9 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack if (_theora && _theora->isPaused()) {
_theora->resume();
stack->pushBool(true);
- } else stack->pushBool(false);
+ } else {
+ stack->pushBool(false);
+ }
return STATUS_OK;
}
@@ -717,8 +779,11 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "IsTheoraPaused") == 0) {
stack->correctParams(0);
- if (_theora && _theora->isPaused()) stack->pushBool(true);
- else stack->pushBool(false);
+ if (_theora && _theora->isPaused()) {
+ stack->pushBool(true);
+ } else {
+ stack->pushBool(false);
+ }
return STATUS_OK;
}
@@ -733,8 +798,11 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _region = new BaseRegion(_gameRef);
_gameRef->registerObject(_region);
}
- if (_region) stack->pushNative(_region, true);
- else stack->pushNULL();
+ if (_region) {
+ stack->pushNative(_region, true);
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -748,12 +816,14 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack _gameRef->unregisterObject(_region);
_region = NULL;
stack->pushBool(true);
- } else stack->pushBool(false);
+ } else {
+ stack->pushBool(false);
+ }
return STATUS_OK;
+ } else {
+ return AdTalkHolder::scCallMethod(script, stack, thisStack, name);
}
-
- else return AdTalkHolder::scCallMethod(script, stack, thisStack, name);
}
@@ -773,8 +843,11 @@ ScValue *AdEntity::scGetProperty(const char *name) { // Item
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Item") == 0) {
- if (_item) _scValue->setString(_item);
- else _scValue->setNULL();
+ if (_item) {
+ _scValue->setString(_item);
+ } else {
+ _scValue->setNULL();
+ }
return _scValue;
}
@@ -783,10 +856,11 @@ ScValue *AdEntity::scGetProperty(const char *name) { // Subtype (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Subtype") == 0) {
- if (_subtype == ENTITY_SOUND)
+ if (_subtype == ENTITY_SOUND) {
_scValue->setString("sound");
- else
+ } else {
_scValue->setString("normal");
+ }
return _scValue;
}
@@ -819,12 +893,15 @@ ScValue *AdEntity::scGetProperty(const char *name) { // Region (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Region") == 0) {
- if (_region) _scValue->setNative(_region, true);
- else _scValue->setNULL();
+ if (_region) {
+ _scValue->setNative(_region, true);
+ } else {
+ _scValue->setNULL();
+ }
return _scValue;
+ } else {
+ return AdTalkHolder::scGetProperty(name);
}
-
- else return AdTalkHolder::scGetProperty(name);
}
@@ -860,11 +937,13 @@ bool AdEntity::scSetProperty(const char *name, ScValue *value) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "WalkToDirection") == 0) {
int dir = value->getInt();
- if (dir >= 0 && dir < NUM_DIRECTIONS) _walkToDir = (TDirection)dir;
+ if (dir >= 0 && dir < NUM_DIRECTIONS) {
+ _walkToDir = (TDirection)dir;
+ }
return STATUS_OK;
+ } else {
+ return AdTalkHolder::scSetProperty(name, value);
}
-
- else return AdTalkHolder::scSetProperty(name, value);
}
@@ -878,8 +957,9 @@ const char *AdEntity::scToString() { bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent, "ENTITY {\n");
buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", getName());
- if (_subtype == ENTITY_SOUND)
+ if (_subtype == ENTITY_SOUND) {
buffer->putTextIndent(indent + 2, "SUBTYPE=\"SOUND\"\n");
+ }
buffer->putTextIndent(indent + 2, "CAPTION=\"%s\"\n", getCaption());
buffer->putTextIndent(indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "X=%d\n", _posX);
@@ -888,23 +968,30 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "INTERACTIVE=%s\n", _registrable ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "COLORABLE=%s\n", _shadowable ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
- if (_ignoreItems)
+ if (_ignoreItems) {
buffer->putTextIndent(indent + 2, "IGNORE_ITEMS=%s\n", _ignoreItems ? "TRUE" : "FALSE");
- if (_rotatable)
+ }
+ if (_rotatable) {
buffer->putTextIndent(indent + 2, "ROTATABLE=%s\n", _rotatable ? "TRUE" : "FALSE");
+ }
- if (!_autoSoundPanning)
+ if (!_autoSoundPanning) {
buffer->putTextIndent(indent + 2, "SOUND_PANNING=%s\n", _autoSoundPanning ? "TRUE" : "FALSE");
+ }
- if (!_saveState)
+ if (!_saveState) {
buffer->putTextIndent(indent + 2, "SAVE_STATE=%s\n", _saveState ? "TRUE" : "FALSE");
+ }
- if (_item && _item[0] != '\0') buffer->putTextIndent(indent + 2, "ITEM=\"%s\"\n", _item);
+ if (_item && _item[0] != '\0') {
+ buffer->putTextIndent(indent + 2, "ITEM=\"%s\"\n", _item);
+ }
buffer->putTextIndent(indent + 2, "WALK_TO_X=%d\n", _walkToX);
buffer->putTextIndent(indent + 2, "WALK_TO_Y=%d\n", _walkToY);
- if (_walkToDir != DI_NONE)
+ if (_walkToDir != DI_NONE) {
buffer->putTextIndent(indent + 2, "WALK_TO_DIR=%d\n", (int)_walkToDir);
+ }
int i;
@@ -912,8 +999,9 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- if (_subtype == ENTITY_NORMAL && _sprite && _sprite->getFilename())
+ if (_subtype == ENTITY_NORMAL && _sprite && _sprite->getFilename()) {
buffer->putTextIndent(indent + 2, "SPRITE=\"%s\"\n", _sprite->getFilename());
+ }
if (_subtype == ENTITY_SOUND && _sFX && _sFX->_soundFilename) {
buffer->putTextIndent(indent + 2, "SOUND=\"%s\"\n", _sFX->_soundFilename);
@@ -922,29 +1010,39 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) { }
- if (RGBCOLGetR(_alphaColor) != 0 || RGBCOLGetG(_alphaColor) != 0 || RGBCOLGetB(_alphaColor) != 0)
+ if (RGBCOLGetR(_alphaColor) != 0 || RGBCOLGetG(_alphaColor) != 0 || RGBCOLGetB(_alphaColor) != 0) {
buffer->putTextIndent(indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", RGBCOLGetR(_alphaColor), RGBCOLGetG(_alphaColor), RGBCOLGetB(_alphaColor));
+ }
- if (RGBCOLGetA(_alphaColor) != 0)
+ if (RGBCOLGetA(_alphaColor) != 0) {
buffer->putTextIndent(indent + 2, "ALPHA = %d\n", RGBCOLGetA(_alphaColor));
+ }
- if (_scale >= 0)
+ if (_scale >= 0) {
buffer->putTextIndent(indent + 2, "SCALE = %d\n", (int)_scale);
+ }
- if (_relativeScale != 0)
+ if (_relativeScale != 0) {
buffer->putTextIndent(indent + 2, "RELATIVE_SCALE = %d\n", (int)_relativeScale);
+ }
- if (_font && _font->getFilename())
+ if (_font && _font->getFilename()) {
buffer->putTextIndent(indent + 2, "FONT=\"%s\"\n", _font->getFilename());
+ }
- if (_cursor && _cursor->getFilename())
+ if (_cursor && _cursor->getFilename()) {
buffer->putTextIndent(indent + 2, "CURSOR=\"%s\"\n", _cursor->getFilename());
+ }
AdTalkHolder::saveAsText(buffer, indent + 2);
- if (_region) _region->saveAsText(buffer, indent + 2);
+ if (_region) {
+ _region->saveAsText(buffer, indent + 2);
+ }
- if (_scProp) _scProp->saveAsText(buffer, indent + 2);
+ if (_scProp) {
+ _scProp->saveAsText(buffer, indent + 2);
+ }
AdObject::saveAsText(buffer, indent + 2);
@@ -959,7 +1057,9 @@ int AdEntity::getHeight() { if (_region && !_sprite) {
return _region->_rect.bottom - _region->_rect.top;
} else {
- if (_currentSprite == NULL) _currentSprite = _sprite;
+ if (_currentSprite == NULL) {
+ _currentSprite = _sprite;
+ }
return AdObject::getHeight();
}
}
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp index 259fc175ae..a6452e8837 100644 --- a/engines/wintermute/ad/ad_game.cpp +++ b/engines/wintermute/ad/ad_game.cpp @@ -142,7 +142,9 @@ bool AdGame::cleanup() { _scene = NULL;
// remove items
- for (i = 0; i < _items.getSize(); i++) _gameRef->unregisterObject(_items[i]);
+ for (i = 0; i < _items.getSize(); i++) {
+ _gameRef->unregisterObject(_items[i]);
+ }
_items.removeAll();
@@ -181,13 +183,19 @@ bool AdGame::cleanup() { delete _sceneViewport;
_sceneViewport = NULL;
- for (i = 0; i < _sceneStates.getSize(); i++) delete _sceneStates[i];
+ for (i = 0; i < _sceneStates.getSize(); i++) {
+ delete _sceneStates[i];
+ }
_sceneStates.removeAll();
- for (i = 0; i < _responsesBranch.getSize(); i++) delete _responsesBranch[i];
+ for (i = 0; i < _responsesBranch.getSize(); i++) {
+ delete _responsesBranch[i];
+ }
_responsesBranch.removeAll();
- for (i = 0; i < _responsesGame.getSize(); i++) delete _responsesGame[i];
+ for (i = 0; i < _responsesGame.getSize(); i++) {
+ delete _responsesGame[i];
+ }
_responsesGame.removeAll();
return BaseGame::cleanup();
@@ -207,9 +215,13 @@ bool AdGame::initLoop() { bool res;
res = BaseGame::initLoop();
- if (DID_FAIL(res)) return res;
+ if (DID_FAIL(res)) {
+ return res;
+ }
- if (_scene) res = _scene->initLoop();
+ if (_scene) {
+ res = _scene->initLoop();
+ }
_sentences.removeAll();
@@ -228,8 +240,10 @@ bool AdGame::addObject(AdObject *object) { bool AdGame::removeObject(AdObject *object) {
// in case the user called Scene.CreateXXX() and Game.DeleteXXX()
if (_scene) {
- bool Res = _scene->removeObject(object);
- if (DID_SUCCEED(Res)) return Res;
+ bool res = _scene->removeObject(object);
+ if (DID_SUCCEED(res)) {
+ return res;
+ }
}
for (int i = 0; i < _objects.getSize(); i++) {
@@ -253,23 +267,31 @@ bool AdGame::changeScene(const char *filename, bool fadeIn) { setPrevSceneName(_scene->getName());
setPrevSceneFilename(_scene->getFilename());
- if (!_tempDisableSaveState) _scene->saveState();
+ if (!_tempDisableSaveState) {
+ _scene->saveState();
+ }
_tempDisableSaveState = false;
}
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;
- if (_scene->_scProp) _scene->_scProp->cleanup();
+ if (_scene->_scProp) {
+ _scene->_scProp->cleanup();
+ }
bool ret;
if (_initialScene && _debugDebugMode && _debugStartupScene) {
_initialScene = false;
ret = _scene->loadFile(_debugStartupScene);
- } else ret = _scene->loadFile(filename);
+ } else {
+ ret = _scene->loadFile(filename);
+ }
if (DID_SUCCEED(ret)) {
// invalidate references to the original scene
@@ -280,9 +302,13 @@ bool AdGame::changeScene(const char *filename, bool fadeIn) { _scene->loadState();
}
- if (fadeIn) _gameRef->_transMgr->start(TRANSITION_FADE_IN);
+ if (fadeIn) {
+ _gameRef->_transMgr->start(TRANSITION_FADE_IN);
+ }
return ret;
- } else return STATUS_FAILED;
+ } else {
+ return STATUS_FAILED;
+ }
}
@@ -295,8 +321,11 @@ void AdGame::addSentence(AdSentence *sentence) { //////////////////////////////////////////////////////////////////////////
bool AdGame::displaySentences(bool frozen) {
for (int i = 0; i < _sentences.getSize(); i++) {
- if (frozen && _sentences[i]->_freezable) continue;
- else _sentences[i]->display();
+ if (frozen && _sentences[i]->_freezable) {
+ continue;
+ } else {
+ _sentences[i]->display();
+ }
}
return STATUS_OK;
}
@@ -307,7 +336,9 @@ void AdGame::finishSentences() { for (int i = 0; i < _sentences.getSize(); i++) {
if (_sentences[i]->CanSkip()) {
_sentences[i]->_duration = 0;
- if (_sentences[i]->_sound) _sentences[i]->_sound->stop();
+ if (_sentences[i]->_sound) {
+ _sentences[i]->_sound->stop();
+ }
}
}
}
@@ -330,7 +361,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, bool transIn = valFadeIn->isNULL() ? true : valFadeIn->getBool();
scheduleChangeScene(filename, transIn);
- if (transOut) _transMgr->start(TRANSITION_FADE_OUT, true);
+ if (transOut) {
+ _transMgr->start(TRANSITION_FADE_OUT, true);
+ }
stack->pushNULL();
@@ -383,7 +416,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
AdObject *obj = (AdObject *)val->getNative();
removeObject(obj);
- if (val->getType() == VAL_VARIABLE_REF) val->setNULL();
+ if (val->getType() == VAL_VARIABLE_REF) {
+ val->setNULL();
+ }
stack->pushNULL();
return STATUS_OK;
@@ -398,7 +433,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, AdEntity *ent = new AdEntity(_gameRef);
addObject(ent);
- if (!val->isNULL()) ent->setName(val->getString());
+ if (!val->isNULL()) {
+ ent->setName(val->getString());
+ }
stack->pushNative(ent, true);
return STATUS_OK;
}
@@ -412,7 +449,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, AdItem *item = new AdItem(_gameRef);
addItem(item);
- if (!val->isNULL()) item->setName(val->getString());
+ if (!val->isNULL()) {
+ item->setName(val->getString());
+ }
stack->pushNative(item, true);
return STATUS_OK;
}
@@ -425,8 +464,11 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
AdItem *item = NULL;
- if (val->isNative()) item = (AdItem *)val->getNative();
- else item = getItemByName(val->getString());
+ if (val->isNative()) {
+ item = (AdItem *)val->getNative();
+ } else {
+ item = getItemByName(val->getString());
+ }
if (item) {
deleteItem(item);
@@ -446,13 +488,18 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, AdItem *item = NULL;
if (val->isInt()) {
int index = val->getInt();
- if (index >= 0 && index < _items.getSize()) item = _items[index];
+ if (index >= 0 && index < _items.getSize()) {
+ item = _items[index];
+ }
} else {
item = getItemByName(val->getString());
}
- if (item) stack->pushNative(item, true);
- else stack->pushNULL();
+ if (item) {
+ stack->pushNative(item, true);
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -476,13 +523,24 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, res->_iD = id;
res->setText(text);
_stringTable->expand(&res->_text);
- if (!val1->isNULL()) res->setIcon(val1->getString());
- if (!val2->isNULL()) res->setIconHover(val2->getString());
- if (!val3->isNULL()) res->setIconPressed(val3->getString());
- if (!val4->isNULL()) res->setFont(val4->getString());
+ if (!val1->isNULL()) {
+ res->setIcon(val1->getString());
+ }
+ if (!val2->isNULL()) {
+ res->setIconHover(val2->getString());
+ }
+ if (!val3->isNULL()) {
+ res->setIconPressed(val3->getString());
+ }
+ if (!val4->isNULL()) {
+ res->setFont(val4->getString());
+ }
- if (strcmp(name, "AddResponseOnce") == 0) res->_responseType = RESPONSE_ONCE;
- else if (strcmp(name, "AddResponseOnceGame") == 0) res->_responseType = RESPONSE_ONCE_GAME;
+ if (strcmp(name, "AddResponseOnce") == 0) {
+ res->_responseType = RESPONSE_ONCE;
+ } else if (strcmp(name, "AddResponseOnceGame") == 0) {
+ res->_responseType = RESPONSE_ONCE_GAME;
+ }
_responseBox->_responses.add(res);
}
@@ -577,7 +635,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, Common::String branchName;
if (val->isNULL()) {
branchName.format("line%d", script->_currentLine);
- } else branchName = val->getString();
+ } else {
+ branchName = val->getString();
+ }
startDlgBranch(branchName.c_str(), script->_filename == NULL ? "" : script->_filename, script->_threadEvent == NULL ? "" : script->_threadEvent);
stack->pushNULL();
@@ -593,7 +653,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *branchName = NULL;
ScValue *val = stack->pop();
- if (!val->isNULL()) branchName = val->getString();
+ if (!val->isNULL()) {
+ branchName = val->getString();
+ }
endDlgBranch(branchName, script->_filename == NULL ? "" : script->_filename, script->_threadEvent == NULL ? "" : script->_threadEvent);
stack->pushNULL();
@@ -609,7 +671,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, if (_dlgPendingBranches.getSize() > 0) {
stack->pushString(_dlgPendingBranches[_dlgPendingBranches.getSize() - 1]);
- } else stack->pushNULL();
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -663,7 +727,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, }
}
}
- } else script->runtimeError("Game.IsItemTaken: item name expected");
+ } else {
+ script->runtimeError("Game.IsItemTaken: item name expected");
+ }
stack->pushBool(false);
return STATUS_OK;
@@ -674,10 +740,11 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "GetInventoryWindow") == 0) {
stack->correctParams(0);
- if (_inventoryBox && _inventoryBox->_window)
+ if (_inventoryBox && _inventoryBox->_window) {
stack->pushNative(_inventoryBox->_window, true);
- else
+ } else {
stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -687,10 +754,11 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "GetResponsesWindow") == 0 || strcmp(name, "GetResponseWindow") == 0) {
stack->correctParams(0);
- if (_responseBox && _responseBox->_window)
+ if (_responseBox && _responseBox->_window) {
stack->pushNative(_responseBox->_window, true);
- else
+ } else {
stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -781,11 +849,19 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, int width = stack->pop()->getInt();
int height = stack->pop()->getInt();
- if (width <= 0) width = _renderer->_width;
- if (height <= 0) height = _renderer->_height;
+ if (width <= 0) {
+ width = _renderer->_width;
+ }
+ if (height <= 0) {
+ height = _renderer->_height;
+ }
- if (!_sceneViewport) _sceneViewport = new BaseViewport(_gameRef);
- if (_sceneViewport) _sceneViewport->setRect(x, y, x + width, y + height);
+ if (!_sceneViewport) {
+ _sceneViewport = new BaseViewport(_gameRef);
+ }
+ if (_sceneViewport) {
+ _sceneViewport->setRect(x, y, x + width, y + height);
+ }
stack->pushBool(true);
@@ -793,7 +869,9 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, }
- else return BaseGame::scCallMethod(script, stack, thisStack, name);
+ else {
+ return BaseGame::scCallMethod(script, stack, thisStack, name);
+ }
}
@@ -812,8 +890,11 @@ ScValue *AdGame::scGetProperty(const char *name) { // Scene
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Scene") == 0) {
- if (_scene) _scValue->setNative(_scene, true);
- else _scValue->setNULL();
+ if (_scene) {
+ _scValue->setNative(_scene, true);
+ } else {
+ _scValue->setNULL();
+ }
return _scValue;
}
@@ -822,8 +903,11 @@ ScValue *AdGame::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "SelectedItem") == 0) {
//if (_selectedItem) _scValue->setString(_selectedItem->_name);
- if (_selectedItem) _scValue->setNative(_selectedItem, true);
- else _scValue->setNULL();
+ if (_selectedItem) {
+ _scValue->setNative(_selectedItem, true);
+ } else {
+ _scValue->setNULL();
+ }
return _scValue;
}
@@ -854,8 +938,11 @@ ScValue *AdGame::scGetProperty(const char *name) { // InventoryScrollOffset
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "InventoryScrollOffset") == 0) {
- if (_inventoryBox) _scValue->setInt(_inventoryBox->_scrollOffset);
- else _scValue->setInt(0);
+ if (_inventoryBox) {
+ _scValue->setInt(_inventoryBox->_scrollOffset);
+ } else {
+ _scValue->setInt(0);
+ }
return _scValue;
}
@@ -872,8 +959,11 @@ ScValue *AdGame::scGetProperty(const char *name) { // PrevScene / PreviousScene (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "PrevScene") == 0 || strcmp(name, "PreviousScene") == 0) {
- if (!_prevSceneName) _scValue->setString("");
- else _scValue->setString(_prevSceneName);
+ if (!_prevSceneName) {
+ _scValue->setString("");
+ } else {
+ _scValue->setString(_prevSceneName);
+ }
return _scValue;
}
@@ -881,8 +971,11 @@ ScValue *AdGame::scGetProperty(const char *name) { // PrevSceneFilename / PreviousSceneFilename (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "PrevSceneFilename") == 0 || strcmp(name, "PreviousSceneFilename") == 0) {
- if (!_prevSceneFilename) _scValue->setString("");
- else _scValue->setString(_prevSceneFilename);
+ if (!_prevSceneFilename) {
+ _scValue->setString("");
+ } else {
+ _scValue->setString(_prevSceneFilename);
+ }
return _scValue;
}
@@ -890,8 +983,11 @@ ScValue *AdGame::scGetProperty(const char *name) { // LastResponse (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "LastResponse") == 0) {
- if (!_responseBox || !_responseBox->_lastResponseText) _scValue->setString("");
- else _scValue->setString(_responseBox->_lastResponseText);
+ if (!_responseBox || !_responseBox->_lastResponseText) {
+ _scValue->setString("");
+ } else {
+ _scValue->setString(_responseBox->_lastResponseText);
+ }
return _scValue;
}
@@ -899,8 +995,11 @@ ScValue *AdGame::scGetProperty(const char *name) { // LastResponseOrig (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "LastResponseOrig") == 0) {
- if (!_responseBox || !_responseBox->_lastResponseTextOrig) _scValue->setString("");
- else _scValue->setString(_responseBox->_lastResponseTextOrig);
+ if (!_responseBox || !_responseBox->_lastResponseTextOrig) {
+ _scValue->setString("");
+ } else {
+ _scValue->setString(_responseBox->_lastResponseTextOrig);
+ }
return _scValue;
}
@@ -908,8 +1007,11 @@ ScValue *AdGame::scGetProperty(const char *name) { // InventoryObject
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "InventoryObject") == 0) {
- if (_inventoryOwner == _invObject) _scValue->setNative(this, true);
- else _scValue->setNative(_inventoryOwner, true);
+ if (_inventoryOwner == _invObject) {
+ _scValue->setNative(this, true);
+ } else {
+ _scValue->setNative(_inventoryOwner, true);
+ }
return _scValue;
}
@@ -942,12 +1044,17 @@ ScValue *AdGame::scGetProperty(const char *name) { // StartupScene
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "StartupScene") == 0) {
- if (!_startupScene) _scValue->setNULL();
- else _scValue->setString(_startupScene);
+ if (!_startupScene) {
+ _scValue->setNULL();
+ } else {
+ _scValue->setString(_startupScene);
+ }
return _scValue;
}
- else return BaseGame::scGetProperty(name);
+ else {
+ return BaseGame::scGetProperty(name);
+ }
}
@@ -958,8 +1065,9 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { // SelectedItem
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "SelectedItem") == 0) {
- if (value->isNULL()) _selectedItem = NULL;
- else {
+ if (value->isNULL()) {
+ _selectedItem = NULL;
+ } else {
if (value->isNative()) {
_selectedItem = NULL;
for (int i = 0; i < _items.getSize(); i++) {
@@ -989,7 +1097,9 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { // InventoryVisible
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "InventoryVisible") == 0) {
- if (_inventoryBox) _inventoryBox->_visible = value->getBool();
+ if (_inventoryBox) {
+ _inventoryBox->_visible = value->getBool();
+ }
return STATUS_OK;
}
@@ -997,16 +1107,24 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { // InventoryObject
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "InventoryObject") == 0) {
- if (_inventoryOwner && _inventoryBox) _inventoryOwner->getInventory()->_scrollOffset = _inventoryBox->_scrollOffset;
+ if (_inventoryOwner && _inventoryBox) {
+ _inventoryOwner->getInventory()->_scrollOffset = _inventoryBox->_scrollOffset;
+ }
- if (value->isNULL()) _inventoryOwner = _invObject;
- else {
- BaseObject *Obj = (BaseObject *)value->getNative();
- if (Obj == this) _inventoryOwner = _invObject;
- else if (_gameRef->validObject(Obj)) _inventoryOwner = (AdObject *)Obj;
+ if (value->isNULL()) {
+ _inventoryOwner = _invObject;
+ } else {
+ BaseObject *obj = (BaseObject *)value->getNative();
+ if (obj == this) {
+ _inventoryOwner = _invObject;
+ } else if (_gameRef->validObject(obj)) {
+ _inventoryOwner = (AdObject *)obj;
+ }
}
- if (_inventoryOwner && _inventoryBox) _inventoryBox->_scrollOffset = _inventoryOwner->getInventory()->_scrollOffset;
+ if (_inventoryOwner && _inventoryBox) {
+ _inventoryBox->_scrollOffset = _inventoryOwner->getInventory()->_scrollOffset;
+ }
return STATUS_OK;
}
@@ -1015,7 +1133,9 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { // InventoryScrollOffset
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "InventoryScrollOffset") == 0) {
- if (_inventoryBox) _inventoryBox->_scrollOffset = value->getInt();
+ if (_inventoryBox) {
+ _inventoryBox->_scrollOffset = value->getInt();
+ }
return STATUS_OK;
}
@@ -1023,10 +1143,14 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { // TalkSkipButton
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "TalkSkipButton") == 0) {
- int Val = value->getInt();
- if (Val < 0) Val = 0;
- if (Val > TALK_SKIP_NONE) Val = TALK_SKIP_NONE;
- _talkSkipButton = (TTalkSkipButton)Val;
+ int val = value->getInt();
+ if (val < 0) {
+ val = 0;
+ }
+ if (val > TALK_SKIP_NONE) {
+ val = TALK_SKIP_NONE;
+ }
+ _talkSkipButton = (TTalkSkipButton)val;
return STATUS_OK;
}
@@ -1037,12 +1161,16 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) { if (value == NULL) {
delete[] _startupScene;
_startupScene = NULL;
- } else BaseUtils::setString(&_startupScene, value->getString());
+ } else {
+ BaseUtils::setString(&_startupScene, value->getString());
+ }
return STATUS_OK;
}
- else return BaseGame::scSetProperty(name, value);
+ else {
+ return BaseGame::scSetProperty(name, value);
+ }
}
@@ -1075,7 +1203,9 @@ bool AdGame::ExternalCall(ScScript *script, ScStack *stack, ScStack *thisStack, //////////////////////////////////////////////////////////////////////////
// call parent
- else return BaseGame::ExternalCall(script, stack, thisStack, name);
+ else {
+ return BaseGame::ExternalCall(script, stack, thisStack, name);
+ }
return STATUS_OK;
@@ -1084,7 +1214,9 @@ bool AdGame::ExternalCall(ScScript *script, ScStack *stack, ScStack *thisStack, //////////////////////////////////////////////////////////////////////////
bool AdGame::showCursor() {
- if (_cursorHidden) return STATUS_OK;
+ if (_cursorHidden) {
+ return STATUS_OK;
+ }
if (_selectedItem && _gameRef->_state == GAME_RUNNING && _stateEx == GAME_NORMAL && _interactive) {
if (_selectedItem->_cursorCombined) {
@@ -1093,12 +1225,17 @@ bool AdGame::showCursor() { _lastCursor = origLastCursor;
}
if (_activeObject && _selectedItem->_cursorHover && _activeObject->getExtendedFlag("usable")) {
- if (!_smartItemCursor || _activeObject->canHandleEvent(_selectedItem->getName()))
+ if (!_smartItemCursor || _activeObject->canHandleEvent(_selectedItem->getName())) {
return drawCursor(_selectedItem->_cursorHover);
- else
+ } else {
return drawCursor(_selectedItem->_cursorNormal);
- } else return drawCursor(_selectedItem->_cursorNormal);
- } else return BaseGame::showCursor();
+ }
+ } else {
+ return drawCursor(_selectedItem->_cursorNormal);
+ }
+ } else {
+ return BaseGame::showCursor();
+ }
}
@@ -1114,7 +1251,9 @@ bool AdGame::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing GAME file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing GAME file '%s'", filename);
+ }
delete[] buffer;
@@ -1162,7 +1301,9 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_GAME:
- if (DID_FAIL(BaseGame::loadBuffer(params, false))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(BaseGame::loadBuffer(params, false))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_AD_GAME:
@@ -1171,9 +1312,9 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { case TOKEN_RESPONSE_BOX:
delete _responseBox;
_responseBox = new AdResponseBox(_gameRef);
- if (_responseBox && !DID_FAIL(_responseBox->loadFile((char *)params2)))
+ if (_responseBox && !DID_FAIL(_responseBox->loadFile((char *)params2))) {
registerObject(_responseBox);
- else {
+ } else {
delete _responseBox;
_responseBox = NULL;
cmd = PARSERR_GENERIC;
@@ -1183,9 +1324,9 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { case TOKEN_INVENTORY_BOX:
delete _inventoryBox;
_inventoryBox = new AdInventoryBox(_gameRef);
- if (_inventoryBox && !DID_FAIL(_inventoryBox->loadFile((char *)params2)))
+ if (_inventoryBox && !DID_FAIL(_inventoryBox->loadFile((char *)params2))) {
registerObject(_inventoryBox);
- else {
+ } else {
delete _inventoryBox;
_inventoryBox = NULL;
cmd = PARSERR_GENERIC;
@@ -1203,16 +1344,24 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_TALK_SKIP_BUTTON:
- if (scumm_stricmp((char *)params2, "right") == 0) _talkSkipButton = TALK_SKIP_RIGHT;
- else if (scumm_stricmp((char *)params2, "both") == 0) _talkSkipButton = TALK_SKIP_BOTH;
- else _talkSkipButton = TALK_SKIP_LEFT;
+ if (scumm_stricmp((char *)params2, "right") == 0) {
+ _talkSkipButton = TALK_SKIP_RIGHT;
+ } else if (scumm_stricmp((char *)params2, "both") == 0) {
+ _talkSkipButton = TALK_SKIP_BOTH;
+ } else {
+ _talkSkipButton = TALK_SKIP_LEFT;
+ }
break;
case TOKEN_SCENE_VIEWPORT: {
Rect32 rc;
parser.scanStr((char *)params2, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
- if (!_sceneViewport) _sceneViewport = new BaseViewport(_gameRef);
- if (_sceneViewport) _sceneViewport->setRect(rc.left, rc.top, rc.right, rc.bottom);
+ if (!_sceneViewport) {
+ _sceneViewport = new BaseViewport(_gameRef);
+ }
+ if (_sceneViewport) {
+ _sceneViewport->setRect(rc.left, rc.top, rc.right, rc.bottom);
+ }
}
break;
@@ -1252,7 +1401,9 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) { //////////////////////////////////////////////////////////////////////////
bool AdGame::persist(BasePersistenceManager *persistMgr) {
- if (!persistMgr->getIsSaving()) cleanup();
+ if (!persistMgr->getIsSaving()) {
+ cleanup();
+ }
BaseGame::persist(persistMgr);
_dlgPendingBranches.persist(persistMgr);
@@ -1292,7 +1443,9 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) { _speechDirs.persist(persistMgr);
persistMgr->transfer(TMEMBER(_smartItemCursor));
- if (!persistMgr->getIsSaving()) _initialScene = false;
+ if (!persistMgr->getIsSaving()) {
+ _initialScene = false;
+ }
persistMgr->transfer(TMEMBER(_startupScene));
@@ -1304,7 +1457,9 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
bool AdGame::loadGame(const char *filename) {
bool ret = BaseGame::loadGame(filename);
- if (DID_SUCCEED(ret)) SystemClassRegistry::getInstance()->enumInstances(afterLoadRegion, "AdRegion", NULL);
+ if (DID_SUCCEED(ret)) {
+ SystemClassRegistry::getInstance()->enumInstances(afterLoadRegion, "AdRegion", NULL);
+ }
return ret;
}
@@ -1327,7 +1482,9 @@ void AdGame::setPrevSceneName(const char *name) { _prevSceneName = NULL;
if (name) {
_prevSceneName = new char[strlen(name) + 1];
- if (_prevSceneName) strcpy(_prevSceneName, name);
+ if (_prevSceneName) {
+ strcpy(_prevSceneName, name);
+ }
}
}
@@ -1338,7 +1495,9 @@ void AdGame::setPrevSceneFilename(const char *name) { _prevSceneFilename = NULL;
if (name) {
_prevSceneFilename = new char[strlen(name) + 1];
- if (_prevSceneFilename) strcpy(_prevSceneFilename, name);
+ if (_prevSceneFilename) {
+ strcpy(_prevSceneFilename, name);
+ }
}
}
@@ -1348,8 +1507,9 @@ bool AdGame::scheduleChangeScene(const char *filename, bool fadeIn) { delete[] _scheduledScene;
_scheduledScene = NULL;
- if (_scene && !_scene->_initialized) return changeScene(filename, fadeIn);
- else {
+ if (_scene && !_scene->_initialized) {
+ return changeScene(filename, fadeIn);
+ } else {
_scheduledScene = new char [strlen(filename) + 1];
strcpy(_scheduledScene, filename);
@@ -1364,8 +1524,12 @@ bool AdGame::scheduleChangeScene(const char *filename, bool fadeIn) { bool AdGame::getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *extMinor) {
BaseGame::getVersion(verMajor, verMinor, NULL, NULL);
- if (extMajor) *extMajor = 0;
- if (extMinor) *extMinor = 0;
+ if (extMajor) {
+ *extMajor = 0;
+ }
+ if (extMinor) {
+ *extMinor = 0;
+ }
return STATUS_OK;
}
@@ -1384,7 +1548,9 @@ bool AdGame::loadItemsFile(const char *filename, bool merge) { //_filename = new char [strlen(filename)+1];
//strcpy(_filename, filename);
- if (DID_FAIL(ret = loadItemsBuffer(buffer, merge))) _gameRef->LOG(0, "Error parsing ITEMS file '%s'", filename);
+ if (DID_FAIL(ret = loadItemsBuffer(buffer, merge))) {
+ _gameRef->LOG(0, "Error parsing ITEMS file '%s'", filename);
+ }
delete[] buffer;
@@ -1404,7 +1570,9 @@ bool AdGame::loadItemsBuffer(byte *buffer, bool merge) { BaseParser parser(_gameRef);
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) {
@@ -1414,8 +1582,10 @@ bool AdGame::loadItemsBuffer(byte *buffer, bool merge) { if (item && !DID_FAIL(item->loadBuffer(params, false))) {
// delete item with the same name, if exists
if (merge) {
- AdItem *PrevItem = getItemByName(item->getName());
- if (PrevItem) deleteItem(PrevItem);
+ AdItem *prevItem = getItemByName(item->getName());
+ if (prevItem) {
+ deleteItem(prevItem);
+ }
}
addItem(item);
} else {
@@ -1446,7 +1616,9 @@ AdSceneState *AdGame::getSceneState(const char *filename, bool saving) { char *filenameCor = new char[strlen(filename) + 1];
strcpy(filenameCor, filename);
for (uint32 i = 0; i < strlen(filenameCor); i++) {
- if (filenameCor[i] == '/') filenameCor[i] = '\\';
+ if (filenameCor[i] == '/') {
+ filenameCor[i] = '\\';
+ }
}
for (int i = 0; i < _sceneStates.getSize(); i++) {
@@ -1512,14 +1684,18 @@ bool AdGame::windowScriptMethodHook(UIWindow *win, ScScript *script, ScStack *st ScValue *val = stack->pop();
UIEntity *ent = new UIEntity(_gameRef);
- if (!val->isNULL()) ent->setName(val->getString());
+ if (!val->isNULL()) {
+ ent->setName(val->getString());
+ }
stack->pushNative(ent, true);
ent->_parent = win;
win->_widgets.add(ent);
return STATUS_OK;
- } else return STATUS_FAILED;
+ } else {
+ return STATUS_FAILED;
+ }
}
@@ -1550,7 +1726,9 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const }
}
- if (name == NULL) return STATUS_OK;
+ if (name == NULL) {
+ return STATUS_OK;
+ }
int startIndex = -1;
@@ -1571,11 +1749,15 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const // dialogue is over, forget selected responses
if (_dlgPendingBranches.getSize() == 0) {
- for (int i = 0; i < _responsesBranch.getSize(); i++) delete _responsesBranch[i];
+ for (int i = 0; i < _responsesBranch.getSize(); i++) {
+ delete _responsesBranch[i];
+ }
_responsesBranch.removeAll();
}
- if (deleteName) delete[] name;
+ if (deleteName) {
+ delete[] name;
+ }
return STATUS_OK;
}
@@ -1595,10 +1777,12 @@ bool AdGame::clearBranchResponses(char *name) { //////////////////////////////////////////////////////////////////////////
-bool AdGame::addBranchResponse(int ID) {
- if (branchResponseUsed(ID)) return STATUS_OK;
+bool AdGame::addBranchResponse(int id) {
+ if (branchResponseUsed(id)) {
+ return STATUS_OK;
+ }
AdResponseContext *r = new AdResponseContext(_gameRef);
- r->_iD = ID;
+ r->_id = id;
r->setContext(_dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL);
_responsesBranch.add(r);
return STATUS_OK;
@@ -1606,11 +1790,13 @@ bool AdGame::addBranchResponse(int ID) { //////////////////////////////////////////////////////////////////////////
-bool AdGame::branchResponseUsed(int ID) {
- char *Context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
+bool AdGame::branchResponseUsed(int id) {
+ 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;
+ if (_responsesBranch[i]->_id == id) {
+ if ((context == NULL && _responsesBranch[i]->_context == NULL) || scumm_stricmp(context, _responsesBranch[i]->_context) == 0) {
+ return true;
+ }
}
}
return false;
@@ -1618,10 +1804,12 @@ bool AdGame::branchResponseUsed(int ID) { //////////////////////////////////////////////////////////////////////////
-bool AdGame::addGameResponse(int ID) {
- if (gameResponseUsed(ID)) return STATUS_OK;
+bool AdGame::addGameResponse(int id) {
+ if (gameResponseUsed(id)) {
+ return STATUS_OK;
+ }
AdResponseContext *r = new AdResponseContext(_gameRef);
- r->_iD = ID;
+ r->_id = id;
r->setContext(_dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL);
_responsesGame.add(r);
return STATUS_OK;
@@ -1629,12 +1817,14 @@ bool AdGame::addGameResponse(int ID) { //////////////////////////////////////////////////////////////////////////
-bool AdGame::gameResponseUsed(int ID) {
- char *Context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
+bool AdGame::gameResponseUsed(int id) {
+ char *context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
for (int i = 0; i < _responsesGame.getSize(); i++) {
- AdResponseContext *RespContext = _responsesGame[i];
- if (RespContext->_iD == ID) {
- if ((Context == NULL && RespContext->_context == NULL) || ((Context != NULL && RespContext->_context != NULL) && scumm_stricmp(Context, RespContext->_context) == 0)) return true;
+ AdResponseContext *respContext = _responsesGame[i];
+ if (respContext->_id == id) {
+ if ((context == NULL && respContext->_context == NULL) || ((context != NULL && respContext->_context != NULL) && scumm_stricmp(context, respContext->_context) == 0)) {
+ return true;
+ }
}
}
return false;
@@ -1642,14 +1832,12 @@ bool AdGame::gameResponseUsed(int ID) { //////////////////////////////////////////////////////////////////////////
-bool AdGame::resetResponse(int ID) {
- char *Context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
-
- int i;
+bool AdGame::resetResponse(int id) {
+ char *context = _dlgPendingBranches.getSize() > 0 ? _dlgPendingBranches[_dlgPendingBranches.getSize() - 1] : NULL;
- 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) {
+ for (int 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);
break;
@@ -1657,9 +1845,9 @@ bool AdGame::resetResponse(int ID) { }
}
- 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) {
+ 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) {
delete _responsesBranch[i];
_responsesBranch.removeAt(i);
break;
@@ -1673,19 +1861,27 @@ bool AdGame::resetResponse(int ID) { //////////////////////////////////////////////////////////////////////////
bool AdGame::displayContent(bool doUpdate, bool displayAll) {
// init
- if (doUpdate) initLoop();
+ if (doUpdate) {
+ initLoop();
+ }
// fill black
_renderer->fill(0, 0, 0);
- if (!_editorMode) _renderer->setScreenViewport();
+ if (!_editorMode) {
+ _renderer->setScreenViewport();
+ }
// playing exclusive video?
if (_videoPlayer->isPlaying()) {
- if (doUpdate) _videoPlayer->update();
+ if (doUpdate) {
+ _videoPlayer->update();
+ }
_videoPlayer->display();
} else if (_theoraPlayer) {
if (_theoraPlayer->isPlaying()) {
- if (doUpdate) _theoraPlayer->update();
+ if (doUpdate) {
+ _theoraPlayer->update();
+ }
_theoraPlayer->display();
}
if (_theoraPlayer->isFinished()) {
@@ -1695,7 +1891,9 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) { } else {
// process scripts
- if (doUpdate) _scEngine->tick();
+ if (doUpdate) {
+ _scEngine->tick();
+ }
Point32 p;
getMousePos(&p);
@@ -1706,9 +1904,15 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) { // display in-game windows
displayWindows(true);
- if (_inventoryBox) _inventoryBox->display();
- if (_stateEx == GAME_WAITING_RESPONSE) _responseBox->display();
- if (_indicatorDisplay) displayIndicator();
+ if (_inventoryBox) {
+ _inventoryBox->display();
+ }
+ if (_stateEx == GAME_WAITING_RESPONSE) {
+ _responseBox->display();
+ }
+ if (_indicatorDisplay) {
+ displayIndicator();
+ }
if (doUpdate || displayAll) {
@@ -1722,7 +1926,9 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) { showCursor();
- if (_fader) _fader->display();
+ if (_fader) {
+ _fader->display();
+ }
_transMgr->update();
}
@@ -1741,7 +1947,9 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) { //////////////////////////////////////////////////////////////////////////
bool AdGame::registerInventory(AdInventory *inv) {
for (int i = 0; i < _inventories.getSize(); i++) {
- if (_inventories[i] == inv) return STATUS_OK;
+ if (_inventories[i] == inv) {
+ return STATUS_OK;
+ }
}
registerObject(inv);
_inventories.add(inv);
@@ -1778,7 +1986,9 @@ bool AdGame::isItemTaken(char *itemName) { //////////////////////////////////////////////////////////////////////////
AdItem *AdGame::getItemByName(const char *name) {
for (int i = 0; i < _items.getSize(); i++) {
- if (scumm_stricmp(_items[i]->getName(), name) == 0) return _items[i];
+ if (scumm_stricmp(_items[i]->getName(), name) == 0) {
+ return _items[i];
+ }
}
return NULL;
}
@@ -1806,19 +2016,27 @@ bool AdGame::resetContent() { }
// clear scene states
- for (int i = 0; i < _sceneStates.getSize(); i++) delete _sceneStates[i];
+ 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];
+ 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];
+ for (int i = 0; i < _responsesGame.getSize(); i++) {
+ delete _responsesGame[i];
+ }
_responsesGame.removeAll();
// reload inventory items
- if (_itemsFile) loadItemsFile(_itemsFile);
+ if (_itemsFile) {
+ loadItemsFile(_itemsFile);
+ }
_tempDisableSaveState = true;
@@ -1828,9 +2046,13 @@ bool AdGame::resetContent() { //////////////////////////////////////////////////////////////////////////
bool AdGame::deleteItem(AdItem *item) {
- if (!item) return STATUS_FAILED;
+ if (!item) {
+ return STATUS_FAILED;
+ }
- if (_selectedItem == item) _selectedItem = NULL;
+ if (_selectedItem == item) {
+ _selectedItem = NULL;
+ }
_scene->handleItemAssociations(item->getName(), false);
// remove from all inventories
@@ -1853,12 +2075,15 @@ bool AdGame::deleteItem(AdItem *item) { //////////////////////////////////////////////////////////////////////////
bool AdGame::addSpeechDir(const char *dir) {
- if (!dir || dir[0] == '\0') return STATUS_FAILED;
+ if (!dir || dir[0] == '\0') {
+ return STATUS_FAILED;
+ }
char *temp = new char[strlen(dir) + 2];
strcpy(temp, dir);
- if (temp[strlen(temp) - 1] != '\\' && temp[strlen(temp) - 1] != '/')
+ if (temp[strlen(temp) - 1] != '\\' && temp[strlen(temp) - 1] != '/') {
strcat(temp, "\\");
+ }
for (int i = 0; i < _speechDirs.getSize(); i++) {
if (scumm_stricmp(_speechDirs[i], temp) == 0) {
@@ -1874,26 +2099,28 @@ bool AdGame::addSpeechDir(const char *dir) { //////////////////////////////////////////////////////////////////////////
bool AdGame::removeSpeechDir(const char *dir) {
- if (!dir || dir[0] == '\0') return STATUS_FAILED;
+ if (!dir || dir[0] == '\0') {
+ return STATUS_FAILED;
+ }
char *temp = new char[strlen(dir) + 2];
strcpy(temp, dir);
- if (temp[strlen(temp) - 1] != '\\' && temp[strlen(temp) - 1] != '/')
+ if (temp[strlen(temp) - 1] != '\\' && temp[strlen(temp) - 1] != '/') {
strcat(temp, "\\");
+ }
- bool Found = false;
+ bool found = false;
for (int i = 0; i < _speechDirs.getSize(); i++) {
if (scumm_stricmp(_speechDirs[i], temp) == 0) {
delete[] _speechDirs[i];
_speechDirs.removeAt(i);
- Found = true;
+ found = true;
break;
}
}
delete[] temp;
- if (Found) return STATUS_OK;
- else return STATUS_FAILED;
+ return found;
}
@@ -1903,12 +2130,14 @@ char *AdGame::findSpeechFile(char *stringID) { for (int i = 0; i < _speechDirs.getSize(); i++) {
sprintf(ret, "%s%s.ogg", _speechDirs[i], stringID);
- if (_fileManager->hasFile(ret))
+ if (_fileManager->hasFile(ret)) {
return ret;
+ }
sprintf(ret, "%s%s.wav", _speechDirs[i], stringID);
- if (_fileManager->hasFile(ret))
+ if (_fileManager->hasFile(ret)) {
return ret;
+ }
}
delete[] ret;
return NULL;
@@ -1925,7 +2154,9 @@ bool AdGame::validMouse() { //////////////////////////////////////////////////////////////////////////
bool AdGame::onMouseLeftDown() {
- if (!validMouse()) return STATUS_OK;
+ if (!validMouse()) {
+ return STATUS_OK;
+ }
if (_state == GAME_RUNNING && !_interactive) {
if (_talkSkipButton == TALK_SKIP_LEFT || _talkSkipButton == TALK_SKIP_BOTH) {
finishSentences();
@@ -1933,7 +2164,9 @@ bool AdGame::onMouseLeftDown() { return STATUS_OK;
}
- if (_activeObject) _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT);
+ if (_activeObject) {
+ _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT);
+ }
bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("LeftClick"));
if (!handled) {
@@ -1944,7 +2177,9 @@ bool AdGame::onMouseLeftDown() { }
}
- if (_activeObject != NULL) _gameRef->_capturedObject = _gameRef->_activeObject;
+ if (_activeObject != NULL) {
+ _gameRef->_capturedObject = _gameRef->_activeObject;
+ }
_mouseLeftDown = true;
BasePlatform::setCapture(/*_renderer->_window*/);
@@ -1953,7 +2188,9 @@ bool AdGame::onMouseLeftDown() { //////////////////////////////////////////////////////////////////////////
bool AdGame::onMouseLeftUp() {
- if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);
+ if (_activeObject) {
+ _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);
+ }
BasePlatform::releaseCapture();
_capturedObject = NULL;
@@ -1972,11 +2209,17 @@ bool AdGame::onMouseLeftUp() { //////////////////////////////////////////////////////////////////////////
bool AdGame::onMouseLeftDblClick() {
- if (!validMouse()) return STATUS_OK;
+ if (!validMouse()) {
+ return STATUS_OK;
+ }
- if (_state == GAME_RUNNING && !_interactive) return STATUS_OK;
+ if (_state == GAME_RUNNING && !_interactive) {
+ return STATUS_OK;
+ }
- if (_activeObject) _activeObject->handleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_LEFT);
+ if (_activeObject) {
+ _activeObject->handleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_LEFT);
+ }
bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("LeftDoubleClick"));
if (!handled) {
@@ -1991,7 +2234,9 @@ bool AdGame::onMouseLeftDblClick() { //////////////////////////////////////////////////////////////////////////
bool AdGame::onMouseRightDown() {
- if (!validMouse()) return STATUS_OK;
+ if (!validMouse()) {
+ return STATUS_OK;
+ }
if (_state == GAME_RUNNING && !_interactive) {
if (_talkSkipButton == TALK_SKIP_RIGHT || _talkSkipButton == TALK_SKIP_BOTH) {
finishSentences();
@@ -1999,9 +2244,13 @@ bool AdGame::onMouseRightDown() { return STATUS_OK;
}
- if ((_state == GAME_RUNNING && !_interactive) || _stateEx == GAME_WAITING_RESPONSE) return STATUS_OK;
+ if ((_state == GAME_RUNNING && !_interactive) || _stateEx == GAME_WAITING_RESPONSE) {
+ return STATUS_OK;
+ }
- if (_activeObject) _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT);
+ if (_activeObject) {
+ _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT);
+ }
bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("RightClick"));
if (!handled) {
@@ -2016,7 +2265,9 @@ bool AdGame::onMouseRightDown() { //////////////////////////////////////////////////////////////////////////
bool AdGame::onMouseRightUp() {
- if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT);
+ if (_activeObject) {
+ _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT);
+ }
bool handled = _state == GAME_RUNNING && DID_SUCCEED(applyEvent("RightRelease"));
if (!handled) {
@@ -2045,8 +2296,9 @@ bool AdGame::displayDebugInfo() { //////////////////////////////////////////////////////////////////////////
bool AdGame::onScriptShutdown(ScScript *script) {
- if (_responseBox && _responseBox->_waitingScript == script)
+ if (_responseBox && _responseBox->_waitingScript == script) {
_responseBox->_waitingScript = NULL;
+ }
return STATUS_OK;
}
diff --git a/engines/wintermute/ad/ad_inventory.cpp b/engines/wintermute/ad/ad_inventory.cpp index d79d171d02..aa6e0b6f0b 100644 --- a/engines/wintermute/ad/ad_inventory.cpp +++ b/engines/wintermute/ad/ad_inventory.cpp @@ -50,10 +50,14 @@ AdInventory::~AdInventory() { //////////////////////////////////////////////////////////////////////////
bool AdInventory::insertItem(const char *name, const char *insertAfter) {
- if (name == NULL) return STATUS_FAILED;
+ if (name == NULL) {
+ return STATUS_FAILED;
+ }
AdItem *item = ((AdGame *)_gameRef)->getItemByName(name);
- if (item == NULL) return STATUS_FAILED;
+ if (item == NULL) {
+ return STATUS_FAILED;
+ }
int insertIndex = -1;
for (int i = 0; i < _takenItems.getSize(); i++) {
@@ -62,12 +66,17 @@ bool AdInventory::insertItem(const char *name, const char *insertAfter) { i--;
continue;
}
- if (insertAfter && scumm_stricmp(_takenItems[i]->getName(), insertAfter) == 0) insertIndex = i + 1;
+ if (insertAfter && scumm_stricmp(_takenItems[i]->getName(), insertAfter) == 0) {
+ insertIndex = i + 1;
+ }
}
- 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;
}
@@ -75,11 +84,15 @@ bool AdInventory::insertItem(const char *name, const char *insertAfter) { //////////////////////////////////////////////////////////////////////////
bool AdInventory::removeItem(const char *name) {
- if (name == NULL) return STATUS_FAILED;
+ if (name == NULL) {
+ return STATUS_FAILED;
+ }
for (int i = 0; i < _takenItems.getSize(); i++) {
if (scumm_stricmp(_takenItems[i]->getName(), name) == 0) {
- if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i])((AdGame *)_gameRef)->_selectedItem = NULL;
+ if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i]) {
+ ((AdGame *)_gameRef)->_selectedItem = NULL;
+ }
_takenItems.removeAt(i);
return STATUS_OK;
}
@@ -92,11 +105,15 @@ bool AdInventory::removeItem(const char *name) { //////////////////////////////////////////////////////////////////////////
bool AdInventory::removeItem(AdItem *item) {
- if (item == NULL) return STATUS_FAILED;
+ if (item == NULL) {
+ return STATUS_FAILED;
+ }
for (int i = 0; i < _takenItems.getSize(); i++) {
if (_takenItems[i] == item) {
- if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i])((AdGame *)_gameRef)->_selectedItem = NULL;
+ if (((AdGame *)_gameRef)->_selectedItem == _takenItems[i]) {
+ ((AdGame *)_gameRef)->_selectedItem = NULL;
+ }
_takenItems.removeAt(i);
return STATUS_OK;
}
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp index 60607c71c6..b8a3f1da22 100644 --- a/engines/wintermute/ad/ad_inventory_box.cpp +++ b/engines/wintermute/ad/ad_inventory_box.cpp @@ -86,7 +86,9 @@ bool AdInventoryBox::listen(BaseScriptHolder *param1, uint32 param2) { _scrollOffset = MAX(_scrollOffset, 0);
} else if (scumm_stricmp(obj->getName(), "next") == 0) {
_scrollOffset += _scrollBy;
- } else return BaseObject::listen(param1, param2);
+ } else {
+ return BaseObject::listen(param1, param2);
+ }
break;
default:
error("AdInventoryBox::Listen - Unhandled enum");
@@ -101,7 +103,9 @@ bool AdInventoryBox::listen(BaseScriptHolder *param1, uint32 param2) { bool AdInventoryBox::display() {
AdGame *adGame = (AdGame *)_gameRef;
- if (!_visible) return STATUS_OK;
+ if (!_visible) {
+ return STATUS_OK;
+ }
int itemsX, itemsY;
itemsX = (int)floor((float)((_itemsArea.right - _itemsArea.left + _spacing) / (_itemWidth + _spacing)));
@@ -130,7 +134,9 @@ bool AdInventoryBox::display() { }
// display items
- if (_window && _window->_alphaColor != 0) _gameRef->_renderer->_forceAlphaColor = _window->_alphaColor;
+ if (_window && _window->_alphaColor != 0) {
+ _gameRef->_renderer->_forceAlphaColor = _window->_alphaColor;
+ }
int yyy = rect.top;
for (int j = 0; j < itemsY; j++) {
int xxx = rect.left;
@@ -148,7 +154,9 @@ bool AdInventoryBox::display() { }
yyy += (_itemHeight + _spacing);
}
- if (_window && _window->_alphaColor != 0) _gameRef->_renderer->_forceAlphaColor = 0;
+ if (_window && _window->_alphaColor != 0) {
+ _gameRef->_renderer->_forceAlphaColor = 0;
+ }
return STATUS_OK;
}
@@ -166,7 +174,9 @@ bool AdInventoryBox::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing INVENTORY_BOX file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing INVENTORY_BOX file '%s'", filename);
+ }
delete[] buffer;
@@ -227,7 +237,9 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) { while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_NAME:
@@ -245,7 +257,9 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) { delete _window;
_window = NULL;
cmd = PARSERR_GENERIC;
- } else _gameRef->registerObject(_window);
+ } else {
+ _gameRef->registerObject(_window);
+ }
break;
case TOKEN_AREA:
@@ -308,8 +322,9 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) { if (_window) {
for (int i = 0; i < _window->_widgets.getSize(); i++) {
- if (!_window->_widgets[i]->_listenerObject)
+ if (!_window->_widgets[i]->_listenerObject) {
_window->_widgets[i]->setListener(this, _window->_widgets[i], 0);
+ }
}
}
@@ -337,7 +352,9 @@ bool AdInventoryBox::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n");
// window
- if (_window) _window->saveAsText(buffer, indent + 2);
+ if (_window) {
+ _window->saveAsText(buffer, indent + 2);
+ }
buffer->putTextIndent(indent + 2, "\n");
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp index cae974e152..c9e0d56b24 100644 --- a/engines/wintermute/ad/ad_item.cpp +++ b/engines/wintermute/ad/ad_item.cpp @@ -94,7 +94,9 @@ bool AdItem::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ITEM file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing ITEM file '%s'", filename);
+ }
delete[] buffer;
@@ -178,7 +180,9 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) { while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_NAME:
@@ -186,7 +190,7 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_FONT:
- SetFont((char *)params);
+ setFont((char *)params);
break;
case TOKEN_CAPTION:
@@ -230,9 +234,13 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_AMOUNT_ALIGN:
- if (scumm_stricmp((char *)params, "left") == 0) _amountAlign = TAL_LEFT;
- else if (scumm_stricmp((char *)params, "right") == 0) _amountAlign = TAL_RIGHT;
- else _amountAlign = TAL_CENTER;
+ if (scumm_stricmp((char *)params, "left") == 0) {
+ _amountAlign = TAL_LEFT;
+ } else if (scumm_stricmp((char *)params, "right") == 0) {
+ _amountAlign = TAL_RIGHT;
+ } else {
+ _amountAlign = TAL_CENTER;
+ }
break;
case TOKEN_AMOUNT_STRING:
@@ -241,15 +249,21 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) { case TOKEN_TALK: {
BaseSprite *spr = new BaseSprite(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, ((AdGame *)_gameRef)->_texTalkLifeTime))) cmd = PARSERR_GENERIC;
- else _talkSprites.add(spr);
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, ((AdGame *)_gameRef)->_texTalkLifeTime))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _talkSprites.add(spr);
+ }
}
break;
case TOKEN_TALK_SPECIAL: {
BaseSprite *spr = new BaseSprite(_gameRef, this);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, ((AdGame *)_gameRef)->_texTalkLifeTime))) cmd = PARSERR_GENERIC;
- else _talkSpritesEx.add(spr);
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, ((AdGame *)_gameRef)->_texTalkLifeTime))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _talkSpritesEx.add(spr);
+ }
}
break;
@@ -331,10 +345,14 @@ bool AdItem::update() { _currentSprite = _animSprite;
}
- if (_sentence && _state != STATE_TALKING) _sentence->finish();
+ if (_sentence && _state != STATE_TALKING) {
+ _sentence->finish();
+ }
// default: stand animation
- if (!_currentSprite) _currentSprite = _sprite;
+ if (!_currentSprite) {
+ _currentSprite = _sprite;
+ }
switch (_state) {
//////////////////////////////////////////////////////////////////////////
@@ -345,15 +363,20 @@ bool AdItem::update() { //////////////////////////////////////////////////////////////////////////
case STATE_READY:
if (!_animSprite) {
- if (_gameRef->_activeObject == this && _spriteHover) _currentSprite = _spriteHover;
- else _currentSprite = _sprite;
+ if (_gameRef->_activeObject == this && _spriteHover) {
+ _currentSprite = _spriteHover;
+ } else {
+ _currentSprite = _sprite;
+ }
}
break;
//////////////////////////////////////////////////////////////////////////
case STATE_TALKING: {
_sentence->update();
- if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite;
+ if (_sentence->_currentSprite) {
+ _tempSprite2 = _sentence->_currentSprite;
+ }
bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime);
if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ TimeIsUp)) {
@@ -396,9 +419,11 @@ bool AdItem::display(int x, int y) { _posY = y;
bool ret;
- if (_currentSprite)
+ if (_currentSprite) {
ret = _currentSprite->draw(x, y, this, 100, 100, _alphaColor);
- else ret = STATUS_OK;
+ } else {
+ ret = STATUS_OK;
+ }
if (_displayAmount) {
int amountX = x;
@@ -412,8 +437,9 @@ bool AdItem::display(int x, int y) { BaseFont *font = _font ? _font : _gameRef->_systemFont;
if (font) {
- if (_amountString) font->drawText((byte *)_amountString, amountX, amountY, width, _amountAlign);
- else {
+ if (_amountString) {
+ font->drawText((byte *)_amountString, amountX, amountY, width, _amountAlign);
+ } else {
char Str[256];
sprintf(Str, "%d", _amount);
font->drawText((byte *)Str, amountX, amountY, width, _amountAlign);
@@ -436,7 +462,9 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(1);
bool setCurrent = false;
- if (_currentSprite && _currentSprite == _spriteHover) setCurrent = true;
+ if (_currentSprite && _currentSprite == _spriteHover) {
+ setCurrent = true;
+ }
const char *filename = stack->pop()->getString();
@@ -448,7 +476,9 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, script->runtimeError("Item.SetHoverSprite failed for file '%s'", filename);
} else {
_spriteHover = spr;
- if (setCurrent) _currentSprite = _spriteHover;
+ if (setCurrent) {
+ _currentSprite = _spriteHover;
+ }
stack->pushBool(true);
}
return STATUS_OK;
@@ -460,8 +490,11 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "GetHoverSprite") == 0) {
stack->correctParams(0);
- if (!_spriteHover || !_spriteHover->getFilename()) stack->pushNULL();
- else stack->pushString(_spriteHover->getFilename());
+ if (!_spriteHover || !_spriteHover->getFilename()) {
+ stack->pushNULL();
+ } else {
+ stack->pushString(_spriteHover->getFilename());
+ }
return STATUS_OK;
}
@@ -470,8 +503,11 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "GetHoverSpriteObject") == 0) {
stack->correctParams(0);
- if (!_spriteHover) stack->pushNULL();
- else stack->pushNative(_spriteHover, true);
+ if (!_spriteHover) {
+ stack->pushNULL();
+ } else {
+ stack->pushNative(_spriteHover, true);
+ }
return STATUS_OK;
}
@@ -502,8 +538,11 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "GetNormalCursor") == 0) {
stack->correctParams(0);
- if (!_cursorNormal || !_cursorNormal->getFilename()) stack->pushNULL();
- else stack->pushString(_cursorNormal->getFilename());
+ if (!_cursorNormal || !_cursorNormal->getFilename()) {
+ stack->pushNULL();
+ } else {
+ stack->pushString(_cursorNormal->getFilename());
+ }
return STATUS_OK;
}
@@ -513,8 +552,11 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "GetNormalCursorObject") == 0) {
stack->correctParams(0);
- if (!_cursorNormal) stack->pushNULL();
- else stack->pushNative(_cursorNormal, true);
+ if (!_cursorNormal) {
+ stack->pushNULL();
+ } else {
+ stack->pushNative(_cursorNormal, true);
+ }
return STATUS_OK;
}
@@ -545,8 +587,11 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "GetHoverCursor") == 0) {
stack->correctParams(0);
- if (!_cursorHover || !_cursorHover->getFilename()) stack->pushNULL();
- else stack->pushString(_cursorHover->getFilename());
+ if (!_cursorHover || !_cursorHover->getFilename()) {
+ stack->pushNULL();
+ } else {
+ stack->pushString(_cursorHover->getFilename());
+ }
return STATUS_OK;
}
@@ -556,12 +601,15 @@ bool AdItem::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "GetHoverCursorObject") == 0) {
stack->correctParams(0);
- if (!_cursorHover) stack->pushNULL();
- else stack->pushNative(_cursorHover, true);
+ if (!_cursorHover) {
+ stack->pushNULL();
+ } else {
+ stack->pushNative(_cursorHover, true);
+ }
return STATUS_OK;
+ } else {
+ return AdTalkHolder::scCallMethod(script, stack, thisStack, name);
}
-
- else return AdTalkHolder::scCallMethod(script, stack, thisStack, name);
}
@@ -629,8 +677,11 @@ ScValue *AdItem::scGetProperty(const char *name) { // AmountString
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "AmountString") == 0) {
- if (!_amountString) _scValue->setNULL();
- else _scValue->setString(_amountString);
+ if (!_amountString) {
+ _scValue->setNULL();
+ } else {
+ _scValue->setString(_amountString);
+ }
return _scValue;
}
@@ -640,9 +691,9 @@ ScValue *AdItem::scGetProperty(const char *name) { else if (strcmp(name, "CursorCombined") == 0) {
_scValue->setBool(_cursorCombined);
return _scValue;
+ } else {
+ return AdTalkHolder::scGetProperty(name);
}
-
- else return AdTalkHolder::scGetProperty(name);
}
@@ -715,9 +766,9 @@ bool AdItem::scSetProperty(const char *name, ScValue *value) { else if (strcmp(name, "CursorCombined") == 0) {
_cursorCombined = value->getBool();
return STATUS_OK;
+ } else {
+ return AdTalkHolder::scSetProperty(name, value);
}
-
- else return AdTalkHolder::scSetProperty(name, value);
}
@@ -750,9 +801,13 @@ bool AdItem::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
bool AdItem::getExtendedFlag(const char *flagName) {
- if (!flagName) return false;
- else if (strcmp(flagName, "usable") == 0) return true;
- else return AdObject::getExtendedFlag(flagName);
+ if (!flagName) {
+ return false;
+ } else if (strcmp(flagName, "usable") == 0) {
+ return true;
+ } else {
+ return AdObject::getExtendedFlag(flagName);
+ }
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp index 0a93edfb35..6c9e6381b2 100644 --- a/engines/wintermute/ad/ad_layer.cpp +++ b/engines/wintermute/ad/ad_layer.cpp @@ -53,8 +53,9 @@ AdLayer::AdLayer(BaseGame *inGame): BaseObject(inGame) { //////////////////////////////////////////////////////////////////////////
AdLayer::~AdLayer() {
- for (int i = 0; i < _nodes.getSize(); i++)
+ for (int i = 0; i < _nodes.getSize(); i++) {
delete _nodes[i];
+ }
_nodes.removeAll();
}
@@ -71,7 +72,9 @@ bool AdLayer::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing LAYER file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing LAYER file '%s'", filename);
+ }
delete[] buffer;
@@ -131,7 +134,9 @@ bool AdLayer::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_NAME:
@@ -181,7 +186,9 @@ bool AdLayer::loadBuffer(byte *buffer, bool complete) { case TOKEN_ENTITY: {
AdEntity *entity = new AdEntity(_gameRef);
AdSceneNode *node = new AdSceneNode(_gameRef);
- if (entity) entity->_zoomable = false; // scene entites default to NOT zoom
+ if (entity) {
+ entity->_zoomable = false; // scene entites default to NOT zoom
+ }
if (!entity || !node || DID_FAIL(entity->loadBuffer(params, false))) {
cmd = PARSERR_GENERIC;
delete entity;
@@ -233,8 +240,9 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
int node = -1;
- if (val->_type == VAL_INT) node = val->getInt();
- else { // get by name
+ if (val->_type == VAL_INT) {
+ node = val->getInt();
+ } else { // get by name
for (int i = 0; i < _nodes.getSize(); i++) {
if ((_nodes[i]->_type == OBJECT_ENTITY && scumm_stricmp(_nodes[i]->_entity->getName(), val->getString()) == 0) ||
(_nodes[i]->_type == OBJECT_REGION && scumm_stricmp(_nodes[i]->_region->getName(), val->getString()) == 0)) {
@@ -244,8 +252,9 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, }
}
- if (node < 0 || node >= _nodes.getSize()) stack->pushNULL();
- else {
+ if (node < 0 || node >= _nodes.getSize()) {
+ stack->pushNULL();
+ } else {
switch (_nodes[node]->_type) {
case OBJECT_ENTITY:
stack->pushNative(_nodes[node]->_entity, true);
@@ -270,12 +279,16 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, AdSceneNode *node = new AdSceneNode(_gameRef);
if (strcmp(name, "AddRegion") == 0) {
AdRegion *region = new AdRegion(_gameRef);
- if (!val->isNULL()) region->setName(val->getString());
+ if (!val->isNULL()) {
+ region->setName(val->getString());
+ }
node->setRegion(region);
stack->pushNative(region, true);
} else {
AdEntity *entity = new AdEntity(_gameRef);
- if (!val->isNULL()) entity->setName(val->getString());
+ if (!val->isNULL()) {
+ entity->setName(val->getString());
+ }
node->setEntity(entity);
stack->pushNative(entity, true);
}
@@ -294,18 +307,27 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, AdSceneNode *node = new AdSceneNode(_gameRef);
if (strcmp(name, "InsertRegion") == 0) {
AdRegion *region = new AdRegion(_gameRef);
- if (!val->isNULL()) region->setName(val->getString());
+ if (!val->isNULL()) {
+ region->setName(val->getString());
+ }
node->setRegion(region);
stack->pushNative(region, true);
} else {
AdEntity *entity = new AdEntity(_gameRef);
- if (!val->isNULL()) entity->setName(val->getString());
+ if (!val->isNULL()) {
+ entity->setName(val->getString());
+ }
node->setEntity(entity);
stack->pushNative(entity, true);
}
- if (index < 0) index = 0;
- if (index <= _nodes.getSize() - 1) _nodes.insertAt(index, node);
- else _nodes.add(node);
+ if (index < 0) {
+ index = 0;
+ }
+ if (index <= _nodes.getSize() - 1) {
+ _nodes.insertAt(index, node);
+ } else {
+ _nodes.add(node);
+ }
return STATUS_OK;
}
@@ -347,9 +369,9 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, }
stack->pushBool(true);
return STATUS_OK;
+ } else {
+ return BaseObject::scCallMethod(script, stack, thisStack, name);
}
-
- else return BaseObject::scCallMethod(script, stack, thisStack, name);
}
@@ -411,9 +433,9 @@ ScValue *AdLayer::scGetProperty(const char *name) { else if (strcmp(name, "Active") == 0) {
_scValue->setBool(_active);
return _scValue;
+ } else {
+ return BaseObject::scGetProperty(name);
}
-
- else return BaseObject::scGetProperty(name);
}
@@ -440,7 +462,9 @@ bool AdLayer::scSetProperty(const char *name, ScValue *value) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Width") == 0) {
_width = value->getInt();
- if (_width < 0) _width = 0;
+ if (_width < 0) {
+ _width = 0;
+ }
return STATUS_OK;
}
@@ -449,7 +473,9 @@ bool AdLayer::scSetProperty(const char *name, ScValue *value) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Height") == 0) {
_height = value->getInt();
- if (_height < 0) _height = 0;
+ if (_height < 0) {
+ _height = 0;
+ }
return STATUS_OK;
}
@@ -460,11 +486,13 @@ bool AdLayer::scSetProperty(const char *name, ScValue *value) { bool b = value->getBool();
if (b == false && _main) {
_gameRef->LOG(0, "Warning: cannot deactivate scene's main layer");
- } else _active = b;
+ } else {
+ _active = b;
+ }
return STATUS_OK;
+ } else {
+ return BaseObject::scSetProperty(name, value);
}
-
- else return BaseObject::scSetProperty(name, value);
}
@@ -484,8 +512,9 @@ bool AdLayer::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "HEIGHT=%d\n", _height);
buffer->putTextIndent(indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
- if (_closeUp)
+ if (_closeUp) {
buffer->putTextIndent(indent + 2, "CLOSE_UP=%s\n", _closeUp ? "TRUE" : "FALSE");
+ }
int i;
@@ -493,7 +522,9 @@ bool AdLayer::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- if (_scProp) _scProp->saveAsText(buffer, indent + 2);
+ if (_scProp) {
+ _scProp->saveAsText(buffer, indent + 2);
+ }
for (i = 0; i < _nodes.getSize(); i++) {
switch (_nodes[i]->_type) {
diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp index 444373ea75..5a58dba5b1 100644 --- a/engines/wintermute/ad/ad_node_state.cpp +++ b/engines/wintermute/ad/ad_node_state.cpp @@ -44,8 +44,9 @@ IMPLEMENT_PERSISTENT(AdNodeState, false) AdNodeState::AdNodeState(BaseGame *inGame): BaseClass(inGame) {
_name = NULL;
_active = false;
- for (int i = 0; i < 7; i++)
+ for (int i = 0; i < 7; i++) {
_caption[i] = NULL;
+ }
_alphaColor = 0;
_filename = NULL;
_cursor = NULL;
@@ -100,8 +101,9 @@ bool AdNodeState::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_filename));
persistMgr->transfer(TMEMBER(_cursor));
persistMgr->transfer(TMEMBER(_alphaColor));
- for (int i = 0; i < 7; i++)
+ for (int i = 0; i < 7; i++) {
persistMgr->transfer(TMEMBER(_caption[i]));
+ }
return STATUS_OK;
}
@@ -109,10 +111,12 @@ bool AdNodeState::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
void AdNodeState::setCaption(const char *caption, int caseVal) {
- if (caseVal == 0)
+ if (caseVal == 0) {
caseVal = 1;
- if (caseVal < 1 || caseVal > 7)
+ }
+ if (caseVal < 1 || caseVal > 7) {
return;
+ }
delete[] _caption[caseVal - 1];
_caption[caseVal - 1] = new char[strlen(caption) + 1];
@@ -125,44 +129,61 @@ void AdNodeState::setCaption(const char *caption, int caseVal) { //////////////////////////////////////////////////////////////////////////
char *AdNodeState::getCaption(int caseVal) {
- if (caseVal == 0) caseVal = 1;
- if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == NULL)
+ if (caseVal == 0) {
+ caseVal = 1;
+ }
+ if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == NULL) {
return "";
- else
+ } else {
return _caption[caseVal - 1];
+ }
}
//////////////////////////////////////////////////////////////////////////
bool AdNodeState::transferEntity(AdEntity *entity, bool includingSprites, bool saving) {
- if (!entity) return STATUS_FAILED;
+ if (!entity) {
+ return STATUS_FAILED;
+ }
// HACK!
- if (this->_gameRef != entity->_gameRef)
+ if (this->_gameRef != entity->_gameRef) {
this->_gameRef = entity->_gameRef;
+ }
if (saving) {
for (int i = 0; i < 7; i++) {
- if (entity->_caption[i]) setCaption(entity->_caption[i], i);
+ if (entity->_caption[i]) {
+ setCaption(entity->_caption[i], i);
+ }
}
if (!entity->_region && entity->_sprite && entity->_sprite->getFilename()) {
- if (includingSprites) setFilename(entity->_sprite->getFilename());
- else setFilename("");
+ if (includingSprites) {
+ setFilename(entity->_sprite->getFilename());
+ } else {
+ setFilename("");
+ }
+ }
+ if (entity->_cursor && entity->_cursor->getFilename()) {
+ setCursor(entity->_cursor->getFilename());
}
- if (entity->_cursor && entity->_cursor->getFilename()) setCursor(entity->_cursor->getFilename());
_alphaColor = entity->_alphaColor;
_active = entity->_active;
} else {
for (int i = 0; i < 7; i++) {
- if (_caption[i]) entity->setCaption(_caption[i], i);
+ if (_caption[i]) {
+ entity->setCaption(_caption[i], i);
+ }
}
if (_filename && !entity->_region && includingSprites && strcmp(_filename, "") != 0) {
- if (!entity->_sprite || !entity->_sprite->getFilename() || scumm_stricmp(entity->_sprite->getFilename(), _filename) != 0)
+ if (!entity->_sprite || !entity->_sprite->getFilename() || scumm_stricmp(entity->_sprite->getFilename(), _filename) != 0) {
entity->setSprite(_filename);
+ }
}
if (_cursor) {
- if (!entity->_cursor || !entity->_cursor->getFilename() || scumm_stricmp(entity->_cursor->getFilename(), _cursor) != 0)
+ if (!entity->_cursor || !entity->_cursor->getFilename() || scumm_stricmp(entity->_cursor->getFilename(), _cursor) != 0) {
entity->setCursor(_cursor);
+ }
}
entity->_active = _active;
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp index fdbc987158..c6f0306cbb 100644 --- a/engines/wintermute/ad/ad_object.cpp +++ b/engines/wintermute/ad/ad_object.cpp @@ -94,7 +94,9 @@ AdObject::AdObject(BaseGame *inGame): BaseObject(inGame) { _inventory = NULL;
- for (int i = 0; i < MAX_NUM_REGIONS; i++) _currentRegions[i] = NULL;
+ for (int i = 0; i < MAX_NUM_REGIONS; i++) {
+ _currentRegions[i] = NULL;
+ }
_partEmitter = NULL;
_partFollowParent = false;
@@ -127,15 +129,18 @@ AdObject::~AdObject() { _tempSprite2 = NULL; // reference only
_stickRegion = NULL;
- if (_font) _gameRef->_fontStorage->removeFont(_font);
+ if (_font) {
+ _gameRef->_fontStorage->removeFont(_font);
+ }
if (_inventory) {
((AdGame *)_gameRef)->unregisterInventory(_inventory);
_inventory = NULL;
}
- if (_partEmitter)
+ if (_partEmitter) {
_gameRef->unregisterObject(_partEmitter);
+ }
for (int i = 0; i < _attachmentsPre.getSize(); i++) {
@@ -194,9 +199,12 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack //////////////////////////////////////////////////////////////////////////
if (strcmp(name, "PlayAnim") == 0 || strcmp(name, "PlayAnimAsync") == 0) {
stack->correctParams(1);
- if (DID_FAIL(playAnim(stack->pop()->getString()))) stack->pushBool(false);
- else {
- if (strcmp(name, "PlayAnimAsync") != 0) script->waitFor(this);
+ if (DID_FAIL(playAnim(stack->pop()->getString()))) {
+ stack->pushBool(false);
+ } else {
+ if (strcmp(name, "PlayAnimAsync") != 0) {
+ script->waitFor(this);
+ }
stack->pushBool(true);
}
return STATUS_OK;
@@ -226,12 +234,16 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "StopTalk") == 0 || strcmp(name, "StopTalking") == 0) {
stack->correctParams(0);
- if (_sentence) _sentence->finish();
+ if (_sentence) {
+ _sentence->finish();
+ }
if (_state == STATE_TALKING) {
_state = _nextState;
_nextState = STATE_READY;
stack->pushBool(true);
- } else stack->pushBool(false);
+ } else {
+ stack->pushBool(false);
+ }
return STATUS_OK;
}
@@ -265,15 +277,20 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack int align = 0;
ScValue *val = stack->pop();
- if (val->isNULL()) align = TAL_CENTER;
- else align = val->getInt();
+ if (val->isNULL()) {
+ align = TAL_CENTER;
+ } else {
+ align = val->getInt();
+ }
align = MIN(MAX(0, align), NUM_TEXT_ALIGN - 1);
const char *sound = soundVal->isNULL() ? NULL : soundVal->getString();
talk(text, sound, duration, stances, (TTextAlign)align);
- if (strcmp(name, "TalkAsync") != 0) script->waitForExclusive(this);
+ if (strcmp(name, "TalkAsync") != 0) {
+ script->waitForExclusive(this);
+ }
stack->pushNULL();
return STATUS_OK;
@@ -315,7 +332,9 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack }
- if (!regFound) _stickRegion = NULL;
+ if (!regFound) {
+ _stickRegion = NULL;
+ }
stack->pushBool(regFound);
return STATUS_OK;
}
@@ -327,8 +346,11 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack stack->correctParams(1);
ScValue *val = stack->pop();
- if (val->isNULL()) SetFont(NULL);
- else SetFont(val->getString());
+ if (val->isNULL()) {
+ setFont(NULL);
+ } else {
+ setFont(val->getString());
+ }
stack->pushNULL();
return STATUS_OK;
@@ -339,8 +361,11 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "GetFont") == 0) {
stack->correctParams(0);
- if (_font && _font->getFilename()) stack->pushString(_font->getFilename());
- else stack->pushNULL();
+ if (_font && _font->getFilename()) {
+ stack->pushString(_font->getFilename());
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -360,13 +385,16 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack const char *itemName = val->getString();
val = stack->pop();
const char *insertAfter = val->isNULL() ? NULL : val->getString();
- if (DID_FAIL(_inventory->insertItem(itemName, insertAfter))) script->runtimeError("Cannot add item '%s' to inventory", itemName);
- else {
+ if (DID_FAIL(_inventory->insertItem(itemName, insertAfter))) {
+ script->runtimeError("Cannot add item '%s' to inventory", itemName);
+ } else {
// hide associated entities
((AdGame *)_gameRef)->_scene->handleItemAssociations(itemName, false);
}
- } else script->runtimeError("TakeItem: item name expected");
+ } else {
+ script->runtimeError("TakeItem: item name expected");
+ }
stack->pushNULL();
return STATUS_OK;
@@ -385,12 +413,15 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack ScValue *val = stack->pop();
if (!val->isNULL()) {
- if (DID_FAIL(_inventory->removeItem(val->getString()))) script->runtimeError("Cannot remove item '%s' from inventory", val->getString());
- else {
+ if (DID_FAIL(_inventory->removeItem(val->getString()))) {
+ script->runtimeError("Cannot remove item '%s' from inventory", val->getString());
+ } else {
// show associated entities
((AdGame *)_gameRef)->_scene->handleItemAssociations(val->getString(), true);
}
- } else script->runtimeError("DropItem: item name expected");
+ } else {
+ script->runtimeError("DropItem: item name expected");
+ }
stack->pushNULL();
return STATUS_OK;
@@ -410,12 +441,16 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack ScValue *val = stack->pop();
if (val->_type == VAL_STRING) {
AdItem *item = ((AdGame *)_gameRef)->getItemByName(val->getString());
- if (item) stack->pushNative(item, true);
- else stack->pushNULL();
- } else if (val->isNULL() || val->getInt() < 0 || val->getInt() >= _inventory->_takenItems.getSize())
+ if (item) {
+ stack->pushNative(item, true);
+ } else {
+ stack->pushNULL();
+ }
+ } else if (val->isNULL() || val->getInt() < 0 || val->getInt() >= _inventory->_takenItems.getSize()) {
stack->pushNULL();
- else
+ } else {
stack->pushNative(_inventory->_takenItems[val->getInt()], true);
+ }
return STATUS_OK;
}
@@ -442,7 +477,9 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack return STATUS_OK;
}
}
- } else script->runtimeError("HasItem: item name expected");
+ } else {
+ script->runtimeError("HasItem: item name expected");
+ }
stack->pushBool(false);
return STATUS_OK;
@@ -458,8 +495,11 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack int offsetY = stack->pop()->getInt();
PartEmitter *emitter = createParticleEmitter(followParent, offsetX, offsetY);
- if (emitter) stack->pushNative(_partEmitter, true);
- else stack->pushNULL();
+ if (emitter) {
+ stack->pushNative(_partEmitter, true);
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -502,8 +542,11 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack 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);
}
@@ -572,11 +615,15 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack int index = val->getInt();
int currIndex = 0;
for (int i = 0; i < _attachmentsPre.getSize(); i++) {
- if (currIndex == index) ret = _attachmentsPre[i];
+ if (currIndex == index) {
+ ret = _attachmentsPre[i];
+ }
currIndex++;
}
for (int i = 0; i < _attachmentsPost.getSize(); i++) {
- if (currIndex == index) ret = _attachmentsPost[i];
+ if (currIndex == index) {
+ ret = _attachmentsPost[i];
+ }
currIndex++;
}
} else {
@@ -597,13 +644,16 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack }
}
- if (ret != NULL) stack->pushNative(ret, true);
- else stack->pushNULL();
+ if (ret != NULL) {
+ stack->pushNative(ret, true);
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
+ } else {
+ return BaseObject::scCallMethod(script, stack, thisStack, name);
}
-
- else return BaseObject::scCallMethod(script, stack, thisStack, name);
}
@@ -695,8 +745,11 @@ ScValue *AdObject::scGetProperty(const char *name) { // ParticleEmitter (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "ParticleEmitter") == 0) {
- if (_partEmitter) _scValue->setNative(_partEmitter, true);
- else _scValue->setNULL();
+ if (_partEmitter) {
+ _scValue->setNative(_partEmitter, true);
+ } else {
+ _scValue->setNULL();
+ }
return _scValue;
}
@@ -707,10 +760,9 @@ ScValue *AdObject::scGetProperty(const char *name) { else if (strcmp(name, "NumAttachments") == 0) {
_scValue->setInt(_attachmentsPre.getSize() + _attachmentsPost.getSize());
return _scValue;
+ } else {
+ return BaseObject::scGetProperty(name);
}
-
-
- else return BaseObject::scGetProperty(name);
}
@@ -779,9 +831,9 @@ bool AdObject::scSetProperty(const char *name, ScValue *value) { else if (strcmp(name, "SubtitlesPosXCenter") == 0) {
_subtitlesModXCenter = value->getBool();
return STATUS_OK;
+ } else {
+ return BaseObject::scSetProperty(name, value);
}
-
- else return BaseObject::scSetProperty(name, value);
}
@@ -792,8 +844,10 @@ const char *AdObject::scToString() { //////////////////////////////////////////////////////////////////////////
-bool AdObject::SetFont(const char *filename) {
- if (_font) _gameRef->_fontStorage->removeFont(_font);
+bool AdObject::setFont(const char *filename) {
+ if (_font) {
+ _gameRef->_fontStorage->removeFont(_font);
+ }
if (filename) {
_font = _gameRef->_fontStorage->addFont(filename);
return _font == NULL ? STATUS_FAILED : STATUS_OK;
@@ -806,8 +860,9 @@ bool AdObject::SetFont(const char *filename) { //////////////////////////////////////////////////////////////////////////
int AdObject::getHeight() {
- if (!_currentSprite) return 0;
- else {
+ if (!_currentSprite) {
+ return 0;
+ } else {
BaseFrame *frame = _currentSprite->_frames[_currentSprite->_currentFrame];
int ret = 0;
for (int i = 0; i < frame->_subframes.getSize(); i++) {
@@ -825,8 +880,12 @@ int AdObject::getHeight() { //////////////////////////////////////////////////////////////////////////
void AdObject::talk(const char *text, const char *sound, uint32 duration, const char *stances, TTextAlign Align) {
- if (!_sentence) _sentence = new AdSentence(_gameRef);
- if (!_sentence) return;
+ if (!_sentence) {
+ _sentence = new AdSentence(_gameRef);
+ }
+ if (!_sentence) {
+ return;
+ }
if (_forcedTalkAnimName && _forcedTalkAnimUsed) {
delete[] _forcedTalkAnimName;
@@ -855,7 +914,9 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const sound = ((AdGame *)_gameRef)->findSpeechFile(key);
delete[] key;
- if (sound) deleteSound = true;
+ if (sound) {
+ deleteSound = true;
+ }
}
}
@@ -865,10 +926,14 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const if (snd && DID_SUCCEED(snd->setSound(sound, Audio::Mixer::kSpeechSoundType, true))) {
_sentence->setSound(snd);
if (_sentence->_duration <= 0) {
- uint32 Length = snd->getLength();
- if (Length != 0) _sentence->_duration = Length;
+ uint32 length = snd->getLength();
+ if (length != 0) {
+ _sentence->_duration = length;
+ }
}
- } else delete snd;
+ } else {
+ delete snd;
+ }
}
// set duration by text length
@@ -888,11 +953,14 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const }
- if (_subtitlesWidth > 0) width = _subtitlesWidth;
- else {
+ if (_subtitlesWidth > 0) {
+ width = _subtitlesWidth;
+ } else {
if ((x < _gameRef->_renderer->_width / 4 || x > _gameRef->_renderer->_width * 0.75) && !_gameRef->_touchInterface) {
width = MAX(_gameRef->_renderer->_width / 4, MIN(x * 2, (_gameRef->_renderer->_width - x) * 2));
- } else width = _gameRef->_renderer->_width / 2;
+ } else {
+ width = _gameRef->_renderer->_width / 2;
+ }
}
height = _sentence->_font->getTextHeight((byte *)_sentence->_text, width);
@@ -905,8 +973,9 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const x = _subtitlesModX;
y = _subtitlesModY;
}
- if (_subtitlesModXCenter)
+ if (_subtitlesModXCenter) {
x = x - width / 2;
+ }
x = MIN(MAX(0, x), _gameRef->_renderer->_width - width);
@@ -931,7 +1000,9 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const _state = STATE_TALKING;
- if (deleteSound) delete[] sound;
+ if (deleteSound) {
+ delete[] sound;
+ }
}
@@ -983,7 +1054,9 @@ bool AdObject::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_inventory));
persistMgr->transfer(TMEMBER(_partEmitter));
- for (int i = 0; i < MAX_NUM_REGIONS; i++) persistMgr->transfer(TMEMBER(_currentRegions[i]));
+ for (int i = 0; i < MAX_NUM_REGIONS; i++) {
+ persistMgr->transfer(TMEMBER(_currentRegions[i]));
+ }
_attachmentsPre.persist(persistMgr);
_attachmentsPost.persist(persistMgr);
@@ -999,8 +1072,9 @@ bool AdObject::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
bool AdObject::updateSounds() {
- if (_sentence && _sentence->_sound)
+ if (_sentence && _sentence->_sound) {
updateOneSound(_sentence->_sound);
+ }
return BaseObject::updateSounds();
}
@@ -1017,17 +1091,24 @@ bool AdObject::resetSoundPan() { //////////////////////////////////////////////////////////////////////////
bool AdObject::getExtendedFlag(const char *flagName) {
- if (!flagName) return false;
- else if (strcmp(flagName, "usable") == 0) return true;
-
- else return BaseObject::getExtendedFlag(flagName);
+ if (!flagName) {
+ return false;
+ } else if (strcmp(flagName, "usable") == 0) {
+ return true;
+ } else {
+ return BaseObject::getExtendedFlag(flagName);
+ }
}
//////////////////////////////////////////////////////////////////////////
bool AdObject::saveAsText(BaseDynamicBuffer *buffer, int indent) {
- if (_blockRegion) _blockRegion->saveAsText(buffer, indent + 2, "BLOCKED_REGION");
- if (_wptGroup) _wptGroup->saveAsText(buffer, indent + 2);
+ if (_blockRegion) {
+ _blockRegion->saveAsText(buffer, indent + 2, "BLOCKED_REGION");
+ }
+ if (_wptGroup) {
+ _wptGroup->saveAsText(buffer, indent + 2);
+ }
BaseClass::saveAsText(buffer, indent + 2);
@@ -1039,11 +1120,13 @@ bool AdObject::saveAsText(BaseDynamicBuffer *buffer, int indent) { bool AdObject::updateBlockRegion() {
AdGame *adGame = (AdGame *)_gameRef;
if (adGame->_scene) {
- if (_blockRegion && _currentBlockRegion)
+ if (_blockRegion && _currentBlockRegion) {
_currentBlockRegion->mimic(_blockRegion, _zoomable ? adGame->_scene->getScaleAt(_posY) : 100.0f, _posX, _posY);
+ }
- if (_wptGroup && _currentWptGroup)
+ if (_wptGroup && _currentWptGroup) {
_currentWptGroup->mimic(_wptGroup, _zoomable ? adGame->_scene->getScaleAt(_posY) : 100.0f, _posX, _posY);
+ }
}
return STATUS_OK;
}
@@ -1064,7 +1147,9 @@ bool AdObject::afterMove() { ((AdGame *)_gameRef)->_scene->getRegionsAt(_posX, _posY, newRegions, MAX_NUM_REGIONS);
for (int i = 0; i < MAX_NUM_REGIONS; i++) {
- if (!newRegions[i]) break;
+ if (!newRegions[i]) {
+ break;
+ }
bool regFound = false;
for (int j = 0; j < MAX_NUM_REGIONS; j++) {
if (_currentRegions[j] == newRegions[i]) {
@@ -1073,7 +1158,9 @@ bool AdObject::afterMove() { break;
}
}
- if (!regFound) newRegions[i]->applyEvent("ActorEntry");
+ if (!regFound) {
+ newRegions[i]->applyEvent("ActorEntry");
+ }
}
for (int i = 0; i < MAX_NUM_REGIONS; i++) {
@@ -1088,7 +1175,9 @@ bool AdObject::afterMove() { //////////////////////////////////////////////////////////////////////////
bool AdObject::invalidateCurrRegions() {
- for (int i = 0; i < MAX_NUM_REGIONS; i++) _currentRegions[i] = NULL;
+ for (int i = 0; i < MAX_NUM_REGIONS; i++) {
+ _currentRegions[i] = NULL;
+ }
return STATUS_OK;
}
@@ -1099,8 +1188,11 @@ bool AdObject::getScale(float *scaleX, float *scaleY) { if (_scaleX >= 0 || _scaleY >= 0) {
*scaleX = _scaleX < 0 ? 100 : _scaleX;
*scaleY = _scaleY < 0 ? 100 : _scaleY;
- } else if (_scale >= 0) *scaleX = *scaleY = _scale;
- else *scaleX = *scaleY = ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY) + _relativeScale;
+ } else if (_scale >= 0) {
+ *scaleX = *scaleY = _scale;
+ } else {
+ *scaleX = *scaleY = ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY) + _relativeScale;
+ }
} else {
*scaleX = *scaleY = 100;
}
@@ -1134,7 +1226,9 @@ bool AdObject::displaySpriteAttachments(bool preDisplay) { //////////////////////////////////////////////////////////////////////////
bool AdObject::displaySpriteAttachment(AdObject *attachment) {
- if (!attachment->_active) return STATUS_OK;
+ if (!attachment->_active) {
+ return STATUS_OK;
+ }
float scaleX, scaleY;
getScale(&scaleX, &scaleY);
@@ -1188,7 +1282,9 @@ PartEmitter *AdObject::createParticleEmitter(bool followParent, int offsetX, int //////////////////////////////////////////////////////////////////////////
bool AdObject::updatePartEmitter() {
- if (!_partEmitter) return STATUS_FAILED;
+ if (!_partEmitter) {
+ return STATUS_FAILED;
+ }
if (_partFollowParent) {
float scaleX, scaleY;
diff --git a/engines/wintermute/ad/ad_object.h b/engines/wintermute/ad/ad_object.h index f26a29c8b2..58cb15fde3 100644 --- a/engines/wintermute/ad/ad_object.h +++ b/engines/wintermute/ad/ad_object.h @@ -73,7 +73,7 @@ public: virtual void talk(const char *text, const char *sound = NULL, uint32 duration = 0, const char *stances = NULL, TTextAlign align = TAL_CENTER);
virtual int getHeight();
AdSentence *_sentence;
- bool SetFont(const char *filename);
+ bool setFont(const char *filename);
virtual bool update();
virtual bool display();
bool _drawn;
diff --git a/engines/wintermute/ad/ad_path.cpp b/engines/wintermute/ad/ad_path.cpp index f7832d621d..89be10f0fb 100644 --- a/engines/wintermute/ad/ad_path.cpp +++ b/engines/wintermute/ad/ad_path.cpp @@ -48,8 +48,9 @@ AdPath::~AdPath() { //////////////////////////////////////////////////////////////////////////
void AdPath::reset() {
- for (int i = 0; i < _points.getSize(); i++)
+ for (int i = 0; i < _points.getSize(); i++) {
delete _points[i];
+ }
_points.removeAll();
_currIndex = -1;
@@ -62,22 +63,30 @@ BasePoint *AdPath::getFirst() { if (_points.getSize() > 0) {
_currIndex = 0;
return _points[_currIndex];
- } else return NULL;
+ } else {
+ return NULL;
+ }
}
//////////////////////////////////////////////////////////////////////////
BasePoint *AdPath::getNext() {
_currIndex++;
- if (_currIndex < _points.getSize()) return _points[_currIndex];
- else return NULL;
+ if (_currIndex < _points.getSize()) {
+ return _points[_currIndex];
+ } else {
+ return NULL;
+ }
}
//////////////////////////////////////////////////////////////////////////
BasePoint *AdPath::getCurrent() {
- if (_currIndex >= 0 && _currIndex < _points.getSize()) return _points[_currIndex];
- else return NULL;
+ if (_currIndex >= 0 && _currIndex < _points.getSize()) {
+ return _points[_currIndex];
+ } else {
+ return NULL;
+ }
}
diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp index eec25b2aaa..6b104d51ad 100644 --- a/engines/wintermute/ad/ad_region.cpp +++ b/engines/wintermute/ad/ad_region.cpp @@ -64,7 +64,9 @@ bool AdRegion::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing REGION file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing REGION file '%s'", filename);
+ }
delete[] buffer;
@@ -126,7 +128,9 @@ bool AdRegion::loadBuffer(byte *buffer, bool complete) { buffer = params;
}
- for (int i = 0; i < _points.getSize(); i++) delete _points[i];
+ for (int i = 0; i < _points.getSize(); i++) {
+ delete _points[i];
+ }
_points.removeAll();
int ar = 255, ag = 255, ab = 255, alpha = 255;
@@ -134,7 +138,9 @@ bool AdRegion::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_NAME:
@@ -285,9 +291,9 @@ ScValue *AdRegion::scGetProperty(const char *name) { else if (strcmp(name, "AlphaColor") == 0) {
_scValue->setInt((int)_alpha);
return _scValue;
+ } else {
+ return BaseRegion::scGetProperty(name);
}
-
- else return BaseRegion::scGetProperty(name);
}
@@ -331,9 +337,9 @@ bool AdRegion::scSetProperty(const char *name, ScValue *value) { else if (strcmp(name, "AlphaColor") == 0) {
_alpha = (uint32)value->getInt();
return STATUS_OK;
+ } else {
+ return BaseRegion::scSetProperty(name, value);
}
-
- else return BaseRegion::scSetProperty(name, value);
}
@@ -361,7 +367,9 @@ bool AdRegion::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- if (_scProp) _scProp->saveAsText(buffer, indent + 2);
+ if (_scProp) {
+ _scProp->saveAsText(buffer, indent + 2);
+ }
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/ad_response.cpp b/engines/wintermute/ad/ad_response.cpp index fbfe828330..e954b0d44d 100644 --- a/engines/wintermute/ad/ad_response.cpp +++ b/engines/wintermute/ad/ad_response.cpp @@ -59,7 +59,9 @@ AdResponse::~AdResponse() { _icon = NULL;
_iconHover = NULL;
_iconPressed = NULL;
- if (_font) _gameRef->_fontStorage->removeFont(_font);
+ if (_font) {
+ _gameRef->_fontStorage->removeFont(_font);
+ }
}
@@ -85,7 +87,9 @@ bool AdResponse::setIcon(const char *filename) { //////////////////////////////////////////////////////////////////////////
bool AdResponse::setFont(const char *filename) {
- if (_font) _gameRef->_fontStorage->removeFont(_font);
+ if (_font) {
+ _gameRef->_fontStorage->removeFont(_font);
+ }
_font = _gameRef->_fontStorage->addFont(filename);
if (!_font) {
_gameRef->LOG(0, "AdResponse::setFont failed for file '%s'", filename);
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp index 22b40f3ea4..fe37002abb 100644 --- a/engines/wintermute/ad/ad_response_box.cpp +++ b/engines/wintermute/ad/ad_response_box.cpp @@ -81,8 +81,12 @@ AdResponseBox::~AdResponseBox() { delete[] _lastResponseTextOrig;
_lastResponseTextOrig = NULL;
- if (_font) _gameRef->_fontStorage->removeFont(_font);
- if (_fontHover) _gameRef->_fontStorage->removeFont(_fontHover);
+ if (_font) {
+ _gameRef->_fontStorage->removeFont(_font);
+ }
+ if (_fontHover) {
+ _gameRef->_fontStorage->removeFont(_fontHover);
+ }
clearResponses();
clearButtons();
@@ -137,12 +141,19 @@ bool AdResponseBox::createButtons() { // iconic
if (_responses[i]->_icon) {
btn->_image = _responses[i]->_icon;
- if (_responses[i]->_iconHover) btn->_imageHover = _responses[i]->_iconHover;
- if (_responses[i]->_iconPressed) btn->_imagePress = _responses[i]->_iconPressed;
+ if (_responses[i]->_iconHover) {
+ btn->_imageHover = _responses[i]->_iconHover;
+ }
+ if (_responses[i]->_iconPressed) {
+ btn->_imagePress = _responses[i]->_iconPressed;
+ }
btn->setCaption(_responses[i]->_text);
- if (_cursor) btn->_cursor = _cursor;
- else if (_gameRef->_activeCursor) btn->_cursor = _gameRef->_activeCursor;
+ if (_cursor) {
+ btn->_cursor = _cursor;
+ } else if (_gameRef->_activeCursor) {
+ btn->_cursor = _gameRef->_activeCursor;
+ }
}
// textual
else {
@@ -152,21 +163,27 @@ bool AdResponseBox::createButtons() { btn->_fontPress = btn->_fontHover;
btn->_align = _align;
- if (_gameRef->_touchInterface)
+ if (_gameRef->_touchInterface) {
btn->_fontHover = btn->_font;
+ }
- if (_responses[i]->_font) btn->_font = _responses[i]->_font;
+ if (_responses[i]->_font) {
+ btn->_font = _responses[i]->_font;
+ }
btn->_width = _responseArea.right - _responseArea.left;
- if (btn->_width <= 0) btn->_width = _gameRef->_renderer->_width;
+ if (btn->_width <= 0) {
+ btn->_width = _gameRef->_renderer->_width;
+ }
}
btn->setName("response");
btn->correctSize();
// make the responses touchable
- if (_gameRef->_touchInterface)
+ if (_gameRef->_touchInterface) {
btn->_height = MAX(btn->_height, 50);
+ }
//btn->SetListener(this, btn, _responses[i]->_iD);
btn->setListener(this, btn, i);
@@ -197,7 +214,9 @@ bool AdResponseBox::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing RESPONSE_BOX file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing RESPONSE_BOX file '%s'", filename);
+ }
delete[] buffer;
@@ -253,7 +272,9 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_WINDOW:
@@ -263,19 +284,29 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) { delete _window;
_window = NULL;
cmd = PARSERR_GENERIC;
- } else if (_shieldWindow) _shieldWindow->_parent = _window;
+ } else if (_shieldWindow) {
+ _shieldWindow->_parent = _window;
+ }
break;
case TOKEN_FONT:
- if (_font) _gameRef->_fontStorage->removeFont(_font);
+ if (_font) {
+ _gameRef->_fontStorage->removeFont(_font);
+ }
_font = _gameRef->_fontStorage->addFont((char *)params);
- if (!_font) cmd = PARSERR_GENERIC;
+ if (!_font) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_FONT_HOVER:
- if (_fontHover) _gameRef->_fontStorage->removeFont(_fontHover);
+ if (_fontHover) {
+ _gameRef->_fontStorage->removeFont(_fontHover);
+ }
_fontHover = _gameRef->_fontStorage->addFont((char *)params);
- if (!_fontHover) cmd = PARSERR_GENERIC;
+ if (!_fontHover) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_AREA:
@@ -287,15 +318,23 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_TEXT_ALIGN:
- if (scumm_stricmp((char *)params, "center") == 0) _align = TAL_CENTER;
- else if (scumm_stricmp((char *)params, "right") == 0) _align = TAL_RIGHT;
- else _align = TAL_LEFT;
+ if (scumm_stricmp((char *)params, "center") == 0) {
+ _align = TAL_CENTER;
+ } else if (scumm_stricmp((char *)params, "right") == 0) {
+ _align = TAL_RIGHT;
+ } else {
+ _align = TAL_LEFT;
+ }
break;
case TOKEN_VERTICAL_ALIGN:
- if (scumm_stricmp((char *)params, "top") == 0) _verticalAlign = VAL_TOP;
- else if (scumm_stricmp((char *)params, "center") == 0) _verticalAlign = VAL_CENTER;
- else _verticalAlign = VAL_BOTTOM;
+ if (scumm_stricmp((char *)params, "top") == 0) {
+ _verticalAlign = VAL_TOP;
+ } else if (scumm_stricmp((char *)params, "center") == 0) {
+ _verticalAlign = VAL_CENTER;
+ } else {
+ _verticalAlign = VAL_BOTTOM;
+ }
break;
case TOKEN_SPACING:
@@ -324,8 +363,9 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) { if (_window) {
for (int i = 0; i < _window->_widgets.getSize(); i++) {
- if (!_window->_widgets[i]->_listenerObject)
+ if (!_window->_widgets[i]->_listenerObject) {
_window->_widgets[i]->setListener(this, _window->_widgets[i], 0);
+ }
}
}
@@ -339,13 +379,16 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "AREA { %d, %d, %d, %d }\n", _responseArea.left, _responseArea.top, _responseArea.right, _responseArea.bottom);
- if (_font && _font->getFilename())
+ if (_font && _font->getFilename()) {
buffer->putTextIndent(indent + 2, "FONT=\"%s\"\n", _font->getFilename());
- if (_fontHover && _fontHover->getFilename())
+ }
+ if (_fontHover && _fontHover->getFilename()) {
buffer->putTextIndent(indent + 2, "FONT_HOVER=\"%s\"\n", _fontHover->getFilename());
+ }
- if (_cursor && _cursor->getFilename())
+ if (_cursor && _cursor->getFilename()) {
buffer->putTextIndent(indent + 2, "CURSOR=\"%s\"\n", _cursor->getFilename());
+ }
buffer->putTextIndent(indent + 2, "HORIZONTAL=%s\n", _horizontal ? "TRUE" : "FALSE");
@@ -381,7 +424,9 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n");
// window
- if (_window) _window->saveAsText(buffer, indent + 2);
+ if (_window) {
+ _window->saveAsText(buffer, indent + 2);
+ }
buffer->putTextIndent(indent + 2, "\n");
@@ -409,18 +454,22 @@ bool AdResponseBox::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) {
case VAL_BOTTOM:
- if (yyy + total_height < rect.bottom)
+ if (yyy + total_height < rect.bottom) {
yyy = rect.bottom - total_height;
+ }
break;
case VAL_CENTER:
- if (yyy + total_height < rect.bottom)
+ if (yyy + total_height < rect.bottom) {
yyy += ((rect.bottom - rect.top) - total_height) / 2;
+ }
break;
case VAL_TOP:
@@ -467,7 +516,9 @@ bool AdResponseBox::display() { }
// display window
- if (_window) _window->display();
+ if (_window) {
+ _window->display();
+ }
// display response buttons
@@ -490,7 +541,9 @@ bool AdResponseBox::listen(BaseScriptHolder *param1, uint32 param2) { } else if (scumm_stricmp(obj->getName(), "next") == 0) {
_scrollOffset++;
} else if (scumm_stricmp(obj->getName(), "response") == 0) {
- if (_waitingScript) _waitingScript->_stack->pushInt(_responses[param2]->_iD);
+ if (_waitingScript) {
+ _waitingScript->_stack->pushInt(_responses[param2]->_iD);
+ }
handleResponse(_responses[param2]);
_waitingScript = NULL;
_gameRef->_state = GAME_RUNNING;
@@ -498,7 +551,9 @@ bool AdResponseBox::listen(BaseScriptHolder *param1, uint32 param2) { _ready = true;
invalidateButtons();
clearResponses();
- } else return BaseObject::listen(param1, param2);
+ } else {
+ return BaseObject::listen(param1, param2);
+ }
break;
default:
error("AdResponseBox::Listen - Unhandled enum");
@@ -597,13 +652,17 @@ BaseObject *AdResponseBox::getNextAccessObject(BaseObject *currObject) { BaseArray<UIObject *, UIObject *> objects;
getObjects(objects, true);
- if (objects.getSize() == 0) return NULL;
- else {
+ if (objects.getSize() == 0) {
+ return NULL;
+ } else {
if (currObject != NULL) {
for (int i = 0; i < objects.getSize(); i++) {
if (objects[i] == currObject) {
- if (i < objects.getSize() - 1) return objects[i + 1];
- else break;
+ if (i < objects.getSize() - 1) {
+ return objects[i + 1];
+ } else {
+ break;
+ }
}
}
}
@@ -617,13 +676,17 @@ BaseObject *AdResponseBox::getPrevAccessObject(BaseObject *currObject) { BaseArray<UIObject *, UIObject *> objects;
getObjects(objects, true);
- if (objects.getSize() == 0) return NULL;
- else {
+ if (objects.getSize() == 0) {
+ return NULL;
+ } else {
if (currObject != NULL) {
for (int i = objects.getSize() - 1; i >= 0; i--) {
if (objects[i] == currObject) {
- if (i > 0) return objects[i - 1];
- else break;
+ if (i > 0) {
+ return objects[i - 1];
+ } else {
+ break;
+ }
}
}
}
@@ -637,7 +700,9 @@ bool AdResponseBox::getObjects(BaseArray<UIObject *, UIObject *> &objects, bool for (int i = 0; i < _respButtons.getSize(); i++) {
objects.add(_respButtons[i]);
}
- if (_window) _window->getWindowObjects(objects, interactiveOnly);
+ if (_window) {
+ _window->getWindowObjects(objects, interactiveOnly);
+ }
return STATUS_OK;
}
diff --git a/engines/wintermute/ad/ad_response_context.cpp b/engines/wintermute/ad/ad_response_context.cpp index 8d966e7a3e..41359fc0f0 100644 --- a/engines/wintermute/ad/ad_response_context.cpp +++ b/engines/wintermute/ad/ad_response_context.cpp @@ -35,7 +35,7 @@ IMPLEMENT_PERSISTENT(AdResponseContext, false) //////////////////////////////////////////////////////////////////////////
AdResponseContext::AdResponseContext(BaseGame *inGame): BaseClass(inGame) {
- _iD = 0;
+ _id = 0;
_context = NULL;
}
@@ -51,7 +51,7 @@ AdResponseContext::~AdResponseContext() { bool AdResponseContext::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_gameRef));
persistMgr->transfer(TMEMBER(_context));
- persistMgr->transfer(TMEMBER(_iD));
+ persistMgr->transfer(TMEMBER(_id));
return STATUS_OK;
}
@@ -62,7 +62,9 @@ void AdResponseContext::setContext(const char *context) { _context = NULL;
if (context) {
_context = new char [strlen(context) + 1];
- if (_context) strcpy(_context, context);
+ if (_context) {
+ strcpy(_context, context);
+ }
}
}
diff --git a/engines/wintermute/ad/ad_response_context.h b/engines/wintermute/ad/ad_response_context.h index d0dc1546b7..d5c8bb3fa3 100644 --- a/engines/wintermute/ad/ad_response_context.h +++ b/engines/wintermute/ad/ad_response_context.h @@ -37,7 +37,7 @@ namespace WinterMute { class AdResponseContext : public BaseClass {
public:
void setContext(const char *context);
- int _iD;
+ int _id;
char *_context;
DECLARE_PERSISTENT(AdResponseContext, BaseClass)
AdResponseContext(BaseGame *inGame);
diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp index 72fcaeff28..f04d379e6b 100644 --- a/engines/wintermute/ad/ad_rot_level.cpp +++ b/engines/wintermute/ad/ad_rot_level.cpp @@ -63,7 +63,9 @@ bool AdRotLevel::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ROTATION_LEVEL file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing ROTATION_LEVEL file '%s'", filename);
+ }
delete[] buffer;
@@ -104,7 +106,9 @@ bool AdRotLevel::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_X:
diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp index c390c6dc08..f9da6bba4a 100644 --- a/engines/wintermute/ad/ad_scale_level.cpp +++ b/engines/wintermute/ad/ad_scale_level.cpp @@ -61,7 +61,9 @@ bool AdScaleLevel::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing SCALE_LEVEL file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing SCALE_LEVEL file '%s'", filename);
+ }
delete[] buffer;
@@ -102,7 +104,9 @@ bool AdScaleLevel::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_Y:
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp index 85c2341268..21f28b6247 100644 --- a/engines/wintermute/ad/ad_scene.cpp +++ b/engines/wintermute/ad/ad_scene.cpp @@ -148,31 +148,37 @@ void AdScene::cleanup() { _gameRef->unregisterObject(_fader);
_fader = NULL;
- for (i = 0; i < _layers.getSize(); i++)
+ for (i = 0; i < _layers.getSize(); i++) {
_gameRef->unregisterObject(_layers[i]);
+ }
_layers.removeAll();
- for (i = 0; i < _waypointGroups.getSize(); i++)
+ for (i = 0; i < _waypointGroups.getSize(); i++) {
_gameRef->unregisterObject(_waypointGroups[i]);
+ }
_waypointGroups.removeAll();
- for (i = 0; i < _scaleLevels.getSize(); i++)
+ for (i = 0; i < _scaleLevels.getSize(); i++) {
_gameRef->unregisterObject(_scaleLevels[i]);
+ }
_scaleLevels.removeAll();
- for (i = 0; i < _rotLevels.getSize(); i++)
+ for (i = 0; i < _rotLevels.getSize(); i++) {
_gameRef->unregisterObject(_rotLevels[i]);
+ }
_rotLevels.removeAll();
- for (i = 0; i < _pfPath.getSize(); i++)
+ for (i = 0; i < _pfPath.getSize(); i++) {
delete _pfPath[i];
+ }
_pfPath.removeAll();
_pfPointsNum = 0;
- for (i = 0; i < _objects.getSize(); i++)
+ for (i = 0; i < _objects.getSize(); i++) {
_gameRef->unregisterObject(_objects[i]);
+ }
_objects.removeAll();
delete _viewport;
@@ -184,8 +190,9 @@ void AdScene::cleanup() { //////////////////////////////////////////////////////////////////////////
bool AdScene::getPath(BasePoint source, BasePoint target, AdPath *path, BaseObject *requester) {
- if (!_pfReady) return false;
- else {
+ if (!_pfReady) {
+ return false;
+ } else {
_pfReady = false;
*_pfTarget = target;
_pfTargetPath = path;
@@ -258,10 +265,14 @@ bool AdScene::getPath(BasePoint source, BasePoint target, AdPath *path, BaseObje //////////////////////////////////////////////////////////////////////////
void AdScene::pfAddWaypointGroup(AdWaypointGroup *wpt, BaseObject *requester) {
- if (!wpt->_active) return;
+ if (!wpt->_active) {
+ return;
+ }
for (int i = 0; i < wpt->_points.getSize(); i++) {
- if (isBlockedAt(wpt->_points[i]->x, wpt->_points[i]->y, true, requester)) continue;
+ if (isBlockedAt(wpt->_points[i]->x, wpt->_points[i]->y, true, requester)) {
+ continue;
+ }
//_pfPath.add(new AdPathPoint(Wpt->_points[i]->x, Wpt->_points[i]->y, INT_MAX));
pfPointsAdd(wpt->_points[i]->x, wpt->_points[i]->y, INT_MAX);
@@ -286,7 +297,9 @@ float AdScene::getZoomAt(int x, int y) { }
}
}
- if (!found) ret = getScaleAt(y);
+ if (!found) {
+ ret = getScaleAt(y);
+ }
return ret;
}
@@ -294,17 +307,24 @@ float AdScene::getZoomAt(int x, int y) { //////////////////////////////////////////////////////////////////////////
uint32 AdScene::getAlphaAt(int x, int y, bool colorCheck) {
- if (!_gameRef->_debugDebugMode) colorCheck = false;
+ if (!_gameRef->_debugDebugMode) {
+ colorCheck = false;
+ }
uint32 ret;
- if (colorCheck) ret = 0xFFFF0000;
- else ret = 0xFFFFFFFF;
+ if (colorCheck) {
+ ret = 0xFFFF0000;
+ } else {
+ ret = 0xFFFFFFFF;
+ }
if (_mainLayer) {
for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
AdSceneNode *node = _mainLayer->_nodes[i];
if (node->_type == OBJECT_REGION && node->_region->_active && (colorCheck || !node->_region->_blocked) && node->_region->pointInRegion(x, y)) {
- if (!node->_region->_blocked) ret = node->_region->_alpha;
+ if (!node->_region->_blocked) {
+ ret = node->_region->_alpha;
+ }
break;
}
}
@@ -321,13 +341,17 @@ bool AdScene::isBlockedAt(int x, int y, bool checkFreeObjects, BaseObject *reque if (checkFreeObjects) {
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;
+ if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
+ return true;
+ }
}
}
AdGame *adGame = (AdGame *)_gameRef;
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;
+ if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
+ return true;
+ }
}
}
}
@@ -347,7 +371,9 @@ bool AdScene::isBlockedAt(int x, int y, bool checkFreeObjects, BaseObject *reque if (node->_region->_blocked) {
ret = true;
break;
- } else ret = false;
+ } else {
+ ret = false;
+ }
}
}
}
@@ -362,13 +388,17 @@ bool AdScene::isWalkableAt(int x, int y, bool checkFreeObjects, BaseObject *requ if (checkFreeObjects) {
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;
+ if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
+ return false;
+ }
}
}
AdGame *adGame = (AdGame *)_gameRef;
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;
+ if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) {
+ return false;
+ }
}
}
}
@@ -381,7 +411,9 @@ bool AdScene::isWalkableAt(int x, int y, bool checkFreeObjects, BaseObject *requ if (node->_region->_blocked) {
ret = false;
break;
- } else ret = true;
+ } else {
+ ret = true;
+ }
}
}
}
@@ -413,7 +445,9 @@ int AdScene::getPointsDist(BasePoint p1, BasePoint p2, BaseObject *requester) { y = y1;
for (xCount = x1; xCount < x2; xCount++) {
- if (isBlockedAt(xCount, (int)y, true, requester)) return -1;
+ if (isBlockedAt(xCount, (int)y, true, requester)) {
+ return -1;
+ }
y += yStep;
}
} else {
@@ -426,7 +460,9 @@ int AdScene::getPointsDist(BasePoint p1, BasePoint p2, BaseObject *requester) { x = x1;
for (yCount = y1; yCount < y2; yCount++) {
- if (isBlockedAt((int)x, yCount, true, requester)) return -1;
+ if (isBlockedAt((int)x, yCount, true, requester)) {
+ return -1;
+ }
x += xStep;
}
}
@@ -488,10 +524,14 @@ bool AdScene::initLoop() { PathFinderStep();
nu_steps++;
}
- if (nu_steps > 0) _gameRef->LOG(0, "STAT: PathFinder iterations in one loop: %d (%s) _pfMaxTime=%d", nu_steps, _pfReady ? "finished" : "not yet done", _pfMaxTime);
+ if (nu_steps > 0) {
+ _gameRef->LOG(0, "STAT: PathFinder iterations in one loop: %d (%s) _pfMaxTime=%d", nu_steps, _pfReady ? "finished" : "not yet done", _pfMaxTime);
+ }
#else
uint32 start = _gameRef->_currentTime;
- while (!_pfReady && g_system->getMillis() - start <= _pfMaxTime) pathFinderStep();
+ while (!_pfReady && g_system->getMillis() - start <= _pfMaxTime) {
+ pathFinderStep();
+ }
#endif
return STATUS_OK;
@@ -510,7 +550,9 @@ bool AdScene::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing SCENE file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing SCENE file '%s'", filename);
+ }
setFilename(filename);
@@ -622,7 +664,9 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_NAME:
@@ -815,8 +859,12 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { case TOKEN_VIEWPORT: {
Rect32 rc;
parser.scanStr((char *)params, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
- if (!_viewport) _viewport = new BaseViewport(_gameRef);
- if (_viewport) _viewport->setRect(rc.left, rc.top, rc.right, rc.bottom, true);
+ if (!_viewport) {
+ _viewport = new BaseViewport(_gameRef);
+ }
+ if (_viewport) {
+ _viewport->setRect(rc.left, rc.top, rc.right, rc.bottom, true);
+ }
}
case TOKEN_PERSISTENT_STATE:
@@ -838,7 +886,9 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { return STATUS_FAILED;
}
- if (_mainLayer == NULL) _gameRef->LOG(0, "Warning: scene '%s' has no main layer.", getFilename());
+ if (_mainLayer == NULL) {
+ _gameRef->LOG(0, "Warning: scene '%s' has no main layer.", getFilename());
+ }
sortScaleLevels();
@@ -852,7 +902,9 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) { //////////////////////////////////////////////////////////////////////////
bool AdScene::traverseNodes(bool doUpdate) {
- if (!_initialized) return STATUS_OK;
+ if (!_initialized) {
+ return STATUS_OK;
+ }
int j, k;
AdGame *adGame = (AdGame *)_gameRef;
@@ -860,13 +912,13 @@ bool AdScene::traverseNodes(bool doUpdate) { //////////////////////////////////////////////////////////////////////////
// prepare viewport
- bool PopViewport = false;
+ bool popViewport = false;
if (_viewport && !_gameRef->_editorMode) {
_gameRef->pushViewport(_viewport);
- PopViewport = true;
+ popViewport = true;
} else if (adGame->_sceneViewport && !_gameRef->_editorMode) {
_gameRef->pushViewport(adGame->_sceneViewport);
- PopViewport = true;
+ popViewport = true;
}
@@ -905,8 +957,12 @@ bool AdScene::traverseNodes(bool doUpdate) { }
}
- if (_offsetTop == _targetOffsetTop && _offsetLeft == _targetOffsetLeft) _ready = true;
- } else _ready = true; // not scrolling, i.e. always ready
+ if (_offsetTop == _targetOffsetTop && _offsetLeft == _targetOffsetLeft) {
+ _ready = true;
+ }
+ } else {
+ _ready = true; // not scrolling, i.e. always ready
+ }
}
@@ -939,12 +995,16 @@ bool AdScene::traverseNodes(bool doUpdate) { /* int MainOffsetY = 0; */
for (j = 0; j < _layers.getSize(); j++) {
- if (!_layers[j]->_active) continue;
+ if (!_layers[j]->_active) {
+ continue;
+ }
// make layer exclusive
if (!doUpdate) {
if (_layers[j]->_closeUp && !_gameRef->_editorMode) {
- if (!_shieldWindow) _shieldWindow = new UIWindow(_gameRef);
+ if (!_shieldWindow) {
+ _shieldWindow = new UIWindow(_gameRef);
+ }
if (_shieldWindow) {
_shieldWindow->_posX = _shieldWindow->_posY = 0;
_shieldWindow->_width = _gameRef->_renderer->_width;
@@ -979,16 +1039,25 @@ bool AdScene::traverseNodes(bool doUpdate) { if (node->_entity->_active && (_gameRef->_editorMode || !node->_entity->_editorOnly)) {
_gameRef->_renderer->setup2D();
- if (doUpdate) node->_entity->update();
- else node->_entity->display();
+ if (doUpdate) {
+ node->_entity->update();
+ } else {
+ node->_entity->display();
+ }
}
break;
case OBJECT_REGION: {
- if (node->_region->_blocked) break;
- if (node->_region->_decoration) break;
+ if (node->_region->_blocked) {
+ break;
+ }
+ if (node->_region->_decoration) {
+ break;
+ }
- if (!doUpdate) displayRegionContent(node->_region);
+ if (!doUpdate) {
+ displayRegionContent(node->_region);
+ }
}
break;
default:
@@ -1014,11 +1083,16 @@ bool AdScene::traverseNodes(bool doUpdate) { // display/update fader
if (_fader) {
- if (doUpdate) _fader->update();
- else _fader->display();
+ if (doUpdate) {
+ _fader->update();
+ } else {
+ _fader->display();
+ }
}
- if (PopViewport) _gameRef->popViewport();
+ if (popViewport) {
+ _gameRef->popViewport();
+ }
return STATUS_OK;
}
@@ -1037,7 +1111,9 @@ bool AdScene::updateFreeObjects() { // *** update all active objects
is3DSet = false;
for (int i = 0; i < adGame->_objects.getSize(); i++) {
- if (!adGame->_objects[i]->_active) continue;
+ if (!adGame->_objects[i]->_active) {
+ continue;
+ }
adGame->_objects[i]->update();
adGame->_objects[i]->_drawn = false;
@@ -1045,7 +1121,9 @@ bool AdScene::updateFreeObjects() { for (int i = 0; i < _objects.getSize(); i++) {
- if (!_objects[i]->_active) continue;
+ if (!_objects[i]->_active) {
+ continue;
+ }
_objects[i]->update();
_objects[i]->_drawn = false;
@@ -1090,11 +1168,15 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) { for (int i = 0; i < objects.getSize(); i++) {
obj = objects[i];
- if (display3DOnly && !obj->_is3D) continue;
+ if (display3DOnly && !obj->_is3D) {
+ continue;
+ }
_gameRef->_renderer->setup2D();
- if (_gameRef->_editorMode || !obj->_editorOnly) obj->display();
+ if (_gameRef->_editorMode || !obj->_editorOnly) {
+ obj->display();
+ }
obj->_drawn = true;
}
@@ -1119,9 +1201,13 @@ int AdScene::compareObjs(const void *obj1, const void *obj2) { AdObject *object1 = *(AdObject **)obj1;
AdObject *object2 = *(AdObject **)obj2;
- if (object1->_posY < object2->_posY) return -1;
- else if (object1->_posY > object2->_posY) return 1;
- else return 0;
+ if (object1->_posY < object2->_posY) {
+ return -1;
+ } else if (object1->_posY > object2->_posY) {
+ return 1;
+ } else {
+ return 0;
+ }
}
//////////////////////////////////////////////////////////////////////////
@@ -1154,7 +1240,9 @@ bool AdScene::displayRegionContentOld(AdRegion *region) { if (obj != NULL) {
_gameRef->_renderer->setup2D();
- if (_gameRef->_editorMode || !obj->_editorOnly) obj->display();
+ if (_gameRef->_editorMode || !obj->_editorOnly) {
+ obj->display();
+ }
obj->_drawn = true;
}
} while (obj != NULL);
@@ -1195,8 +1283,12 @@ void AdScene::scrollTo(int offsetX, int offsetY) { if (_gameRef->_mainObject && _gameRef->_mainObject->_is3D) {
- if (abs(origOffsetLeft - _targetOffsetLeft) < 5) _targetOffsetLeft = origOffsetLeft;
- if (abs(origOffsetTop - _targetOffsetTop) < 5) _targetOffsetTop = origOffsetTop;
+ if (abs(origOffsetLeft - _targetOffsetLeft) < 5) {
+ _targetOffsetLeft = origOffsetLeft;
+ }
+ if (abs(origOffsetTop - _targetOffsetTop) < 5) {
+ _targetOffsetTop = origOffsetTop;
+ }
//_targetOffsetTop = 0;
}
@@ -1206,13 +1298,17 @@ void AdScene::scrollTo(int offsetX, int offsetY) { //////////////////////////////////////////////////////////////////////////
void AdScene::scrollToObject(BaseObject *object) {
- if (object) scrollTo(object->_posX, object->_posY - object->getHeight() / 2);
+ if (object) {
+ scrollTo(object->_posX, object->_posY - object->getHeight() / 2);
+ }
}
//////////////////////////////////////////////////////////////////////////
void AdScene::skipToObject(BaseObject *object) {
- if (object) skipTo(object->_posX, object->_posY - object->getHeight() / 2);
+ if (object) {
+ skipTo(object->_posX, object->_posY - object->getHeight() / 2);
+ }
}
@@ -1279,7 +1375,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, AdEntity *ent = new AdEntity(_gameRef);
addObject(ent);
- if (!val->isNULL()) ent->setName(val->getString());
+ if (!val->isNULL()) {
+ ent->setName(val->getString());
+ }
stack->pushNative(ent, true);
return STATUS_OK;
}
@@ -1292,7 +1390,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
AdObject *obj = (AdObject *)val->getNative();
removeObject(obj);
- if (val->getType() == VAL_VARIABLE_REF) val->setNULL();
+ if (val->getType() == VAL_VARIABLE_REF) {
+ val->setNULL();
+ }
stack->pushNULL();
return STATUS_OK;
@@ -1326,7 +1426,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, } else {
scrollTo(val1->getInt(), val2->getInt());
}
- if (strcmp(name, "ScrollTo") == 0) script->waitForExclusive(this);
+ if (strcmp(name, "ScrollTo") == 0) {
+ script->waitForExclusive(this);
+ }
stack->pushNULL();
return STATUS_OK;
}
@@ -1339,19 +1441,24 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
if (val->isInt()) {
int layer = val->getInt();
- if (layer < 0 || layer >= _layers.getSize()) stack->pushNULL();
- else stack->pushNative(_layers[layer], true);
+ if (layer < 0 || layer >= _layers.getSize()) {
+ stack->pushNULL();
+ } else {
+ stack->pushNative(_layers[layer], true);
+ }
} else {
- const char *LayerName = val->getString();
- bool LayerFound = false;
+ const char *layerName = val->getString();
+ bool layerFound = false;
for (int i = 0; i < _layers.getSize(); i++) {
- if (scumm_stricmp(LayerName, _layers[i]->getName()) == 0) {
+ if (scumm_stricmp(layerName, _layers[i]->getName()) == 0) {
stack->pushNative(_layers[i], true);
- LayerFound = true;
+ layerFound = true;
break;
}
}
- if (!LayerFound) stack->pushNULL();
+ if (!layerFound) {
+ stack->pushNULL();
+ }
}
return STATUS_OK;
}
@@ -1362,8 +1469,11 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, else if (strcmp(name, "GetWaypointGroup") == 0) {
stack->correctParams(1);
int group = stack->pop()->getInt();
- if (group < 0 || group >= _waypointGroups.getSize()) stack->pushNULL();
- else stack->pushNative(_waypointGroups[group], true);
+ if (group < 0 || group >= _waypointGroups.getSize()) {
+ stack->pushNULL();
+ } else {
+ stack->pushNative(_waypointGroups[group], true);
+ }
return STATUS_OK;
}
@@ -1375,8 +1485,11 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *nodeName = stack->pop()->getString();
BaseObject *node = getNodeByName(nodeName);
- if (node) stack->pushNative((BaseScriptable *)node, true);
- else stack->pushNULL();
+ if (node) {
+ stack->pushNative((BaseScriptable *)node, true);
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -1391,7 +1504,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, AdObject *ret = NULL;
if (val->isInt()) {
int index = val->getInt();
- if (index >= 0 && index < _objects.getSize()) 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++) {
@@ -1401,8 +1516,11 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, }
}
}
- if (ret) stack->pushNative(ret, true);
- else stack->pushNULL();
+ if (ret) {
+ stack->pushNative(ret, true);
+ } else {
+ stack->pushNULL();
+ }
return STATUS_OK;
}
@@ -1417,13 +1535,17 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
bool includeDecors = false;
- if (!val->isNULL()) includeDecors = val->getBool();
+ if (!val->isNULL()) {
+ includeDecors = val->getBool();
+ }
if (_mainLayer) {
for (int i = _mainLayer->_nodes.getSize() - 1; i >= 0; i--) {
AdSceneNode *node = _mainLayer->_nodes[i];
if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->pointInRegion(x, y)) {
- if (node->_region->_decoration && !includeDecors) continue;
+ if (node->_region->_decoration && !includeDecors) {
+ continue;
+ }
stack->pushNative(node->_region, true);
return STATUS_OK;
@@ -1489,7 +1611,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(0);
bool ret = false;
if (_autoScroll) {
- if (_targetOffsetLeft != _offsetLeft || _targetOffsetTop != _offsetTop) ret = true;
+ if (_targetOffsetLeft != _offsetLeft || _targetOffsetTop != _offsetTop) {
+ ret = true;
+ }
}
stack->pushBool(ret);
@@ -1508,7 +1632,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, byte alpha = stack->pop()->getInt(0xFF);
_fader->fadeOut(BYTETORGBA(red, green, blue, alpha), duration);
- if (strcmp(name, "FadeOutAsync") != 0) script->waitFor(_fader);
+ if (strcmp(name, "FadeOutAsync") != 0) {
+ script->waitFor(_fader);
+ }
stack->pushNULL();
return STATUS_OK;
@@ -1526,7 +1652,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, byte alpha = stack->pop()->getInt(0xFF);
_fader->fadeIn(BYTETORGBA(red, green, blue, alpha), duration);
- if (strcmp(name, "FadeInAsync") != 0) script->waitFor(_fader);
+ if (strcmp(name, "FadeInAsync") != 0) {
+ script->waitFor(_fader);
+ }
stack->pushNULL();
return STATUS_OK;
@@ -1562,11 +1690,19 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, int width = stack->pop()->getInt();
int height = stack->pop()->getInt();
- if (width <= 0) width = _gameRef->_renderer->_width;
- if (height <= 0) height = _gameRef->_renderer->_height;
+ if (width <= 0) {
+ width = _gameRef->_renderer->_width;
+ }
+ if (height <= 0) {
+ height = _gameRef->_renderer->_height;
+ }
- if (!_viewport) _viewport = new BaseViewport(_gameRef);
- if (_viewport) _viewport->setRect(x, y, x + width, y + height);
+ if (!_viewport) {
+ _viewport = new BaseViewport(_gameRef);
+ }
+ if (_viewport) {
+ _viewport->setRect(x, y, x + width, y + height);
+ }
stack->pushBool(true);
@@ -1581,7 +1717,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
AdLayer *layer = new AdLayer(_gameRef);
- if (!val->isNULL()) layer->setName(val->getString());
+ if (!val->isNULL()) {
+ layer->setName(val->getString());
+ }
if (_mainLayer) {
layer->_width = _mainLayer->_width;
layer->_height = _mainLayer->_height;
@@ -1602,14 +1740,21 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, ScValue *val = stack->pop();
AdLayer *layer = new AdLayer(_gameRef);
- if (!val->isNULL()) layer->setName(val->getString());
+ if (!val->isNULL()) {
+ layer->setName(val->getString());
+ }
if (_mainLayer) {
layer->_width = _mainLayer->_width;
layer->_height = _mainLayer->_height;
}
- if (index < 0) index = 0;
- if (index <= _layers.getSize() - 1) _layers.insertAt(index, layer);
- else _layers.add(layer);
+ if (index < 0) {
+ index = 0;
+ }
+ if (index <= _layers.getSize() - 1) {
+ _layers.insertAt(index, layer);
+ } else {
+ _layers.add(layer);
+ }
_gameRef->registerObject(layer);
@@ -1659,9 +1804,9 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, }
stack->pushBool(true);
return STATUS_OK;
+ } else {
+ return BaseObject::scCallMethod(script, stack, thisStack, name);
}
-
- else return BaseObject::scCallMethod(script, stack, thisStack, name);
}
@@ -1697,8 +1842,11 @@ ScValue *AdScene::scGetProperty(const char *name) { // MainLayer (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "MainLayer") == 0) {
- if (_mainLayer) _scValue->setNative(_mainLayer, true);
- else _scValue->setNULL();
+ if (_mainLayer) {
+ _scValue->setNative(_mainLayer, true);
+ } else {
+ _scValue->setNULL();
+ }
return _scValue;
}
@@ -1810,8 +1958,11 @@ ScValue *AdScene::scGetProperty(const char *name) { // Width (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Width") == 0) {
- if (_mainLayer) _scValue->setInt(_mainLayer->_width);
- else _scValue->setInt(0);
+ if (_mainLayer) {
+ _scValue->setInt(_mainLayer->_width);
+ } else {
+ _scValue->setInt(0);
+ }
return _scValue;
}
@@ -1819,12 +1970,15 @@ ScValue *AdScene::scGetProperty(const char *name) { // Height (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Height") == 0) {
- if (_mainLayer) _scValue->setInt(_mainLayer->_height);
- else _scValue->setInt(0);
+ if (_mainLayer) {
+ _scValue->setInt(_mainLayer->_height);
+ } else {
+ _scValue->setInt(0);
+ }
return _scValue;
+ } else {
+ return BaseObject::scGetProperty(name);
}
-
- else return BaseObject::scGetProperty(name);
}
@@ -1924,9 +2078,9 @@ bool AdScene::scSetProperty(const char *name, ScValue *value) { _targetOffsetTop = _offsetTop;
return STATUS_OK;
+ } else {
+ return BaseObject::scSetProperty(name, value);
}
-
- else return BaseObject::scSetProperty(name, value);
}
@@ -1964,11 +2118,13 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", getName());
buffer->putTextIndent(indent + 2, "CAPTION=\"%s\"\n", getCaption());
- if (_persistentState)
+ if (_persistentState) {
buffer->putTextIndent(indent + 2, "PERSISTENT_STATE=%s\n", _persistentState ? "TRUE" : "FALSE");
+ }
- if (!_persistentStateSprites)
+ if (!_persistentStateSprites) {
buffer->putTextIndent(indent + 2, "PERSISTENT_STATE_SPRITES=%s\n", _persistentStateSprites ? "TRUE" : "FALSE");
+ }
// scripts
@@ -1979,7 +2135,9 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n");
// properties
- if (_scProp) _scProp->saveAsText(buffer, indent + 2);
+ if (_scProp) {
+ _scProp->saveAsText(buffer, indent + 2);
+ }
// viewport
if (_viewport) {
@@ -2018,21 +2176,29 @@ bool AdScene::saveAsText(BaseDynamicBuffer *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");
@@ -2103,14 +2269,17 @@ float AdScene::getScaleAt(int Y) { for (int i = 0; i < _scaleLevels.getSize(); i++) {
/* AdScaleLevel *xxx = _scaleLevels[i];*/
/* int j = _scaleLevels.getSize(); */
- if (_scaleLevels[i]->_posY < Y) prev = _scaleLevels[i];
- else {
+ if (_scaleLevels[i]->_posY < Y) {
+ prev = _scaleLevels[i];
+ } else {
next = _scaleLevels[i];
break;
}
}
- if (prev == NULL || next == NULL) return 100;
+ if (prev == NULL || next == NULL) {
+ return 100;
+ }
int delta_y = next->_posY - prev->_posY;
float delta_scale = next->_scale - prev->_scale;
@@ -2255,70 +2424,86 @@ bool AdScene::correctTargetPoint(int startX, int startY, int *argX, int *argY, b }
// right
- int length_right = 0;
- bool found_right = false;
- for (x = *argX, y = *argY; x < _mainLayer->_width; x++, length_right++) {
+ int lengthRight = 0;
+ bool foundRight = false;
+ for (x = *argX, y = *argY; x < _mainLayer->_width; x++, lengthRight++) {
if (isWalkableAt(x, y, checkFreeObjects, requester) && isWalkableAt(x - 5, y, checkFreeObjects, requester)) {
- found_right = true;
+ foundRight = true;
break;
}
}
// left
- int length_left = 0;
- bool found_left = false;
- for (x = *argX, y = *argY; x >= 0; x--, length_left--) {
+ int lengthLeft = 0;
+ bool foundLeft = false;
+ for (x = *argX, y = *argY; x >= 0; x--, lengthLeft--) {
if (isWalkableAt(x, y, checkFreeObjects, requester) && isWalkableAt(x + 5, y, checkFreeObjects, requester)) {
- found_left = true;
+ foundLeft = true;
break;
}
}
// up
- int length_up = 0;
- bool found_up = false;
- for (x = *argX, y = *argY; y >= 0; y--, length_up--) {
+ int lengthUp = 0;
+ bool foundUp = false;
+ for (x = *argX, y = *argY; y >= 0; y--, lengthUp--) {
if (isWalkableAt(x, y, checkFreeObjects, requester) && isWalkableAt(x, y + 5, checkFreeObjects, requester)) {
- found_up = true;
+ foundUp = true;
break;
}
}
// down
- int length_down = 0;
- bool found_down = false;
- for (x = *argX, y = *argY; y < _mainLayer->_height; y++, length_down++) {
+ int lengthDown = 0;
+ bool foundDown = false;
+ for (x = *argX, y = *argY; y < _mainLayer->_height; y++, lengthDown++) {
if (isWalkableAt(x, y, checkFreeObjects, requester) && isWalkableAt(x, y - 5, checkFreeObjects, requester)) {
- found_down = true;
+ foundDown = true;
break;
}
}
- if (!found_left && !found_right && !found_up && !found_down) {
+ if (!foundLeft && !foundRight && !foundUp && !foundDown) {
return STATUS_OK;
}
- int OffsetX = INT_MAX, OffsetY = INT_MAX;
+ int offsetX = INT_MAX, offsetY = INT_MAX;
- if (found_left && found_right) {
- if (abs(length_left) < abs(length_right)) OffsetX = length_left;
- else OffsetX = length_right;
- } else if (found_left) OffsetX = length_left;
- else if (found_right) OffsetX = length_right;
+ if (foundLeft && foundRight) {
+ if (abs(lengthLeft) < abs(lengthRight)) {
+ offsetX = lengthLeft;
+ } else {
+ offsetX = lengthRight;
+ }
+ } else if (foundLeft) {
+ offsetX = lengthLeft;
+ } else if (foundRight) {
+ offsetX = lengthRight;
+ }
- if (found_up && found_down) {
- if (abs(length_up) < abs(length_down)) OffsetY = length_up;
- else OffsetY = length_down;
- } else if (found_up) OffsetY = length_up;
- else if (found_down) OffsetY = length_down;
+ if (foundUp && foundDown) {
+ if (abs(lengthUp) < abs(lengthDown)) {
+ offsetY = lengthUp;
+ } else {
+ offsetY = lengthDown;
+ }
+ } else if (foundUp) {
+ offsetY = lengthUp;
+ } else if (foundDown) {
+ offsetY = lengthDown;
+ }
- if (abs(OffsetX) < abs(OffsetY))
- *argX = *argX + OffsetX;
- else
- *argY = *argY + OffsetY;
+ if (abs(offsetX) < abs(offsetY)) {
+ *argX = *argX + offsetX;
+ } else {
+ *argY = *argY + offsetY;
+ }
- if (!isWalkableAt(*argX, *argY)) return correctTargetPoint2(startX, startY, argX, argY, checkFreeObjects, requester);
- else return STATUS_OK;
+ if (!isWalkableAt(*argX, *argY)) {
+ return correctTargetPoint2(startX, startY, argX, argY, checkFreeObjects, requester);
+ } else {
+ return STATUS_OK;
+ }
}
@@ -2348,14 +2533,26 @@ void AdScene::pfPointsAdd(int x, int y, int distance) { bool AdScene::getViewportOffset(int *offsetX, int *offsetY) {
AdGame *adGame = (AdGame *)_gameRef;
if (_viewport && !_gameRef->_editorMode) {
- if (offsetX) *offsetX = _viewport->_offsetX;
- if (offsetY) *offsetY = _viewport->_offsetY;
+ if (offsetX) {
+ *offsetX = _viewport->_offsetX;
+ }
+ if (offsetY) {
+ *offsetY = _viewport->_offsetY;
+ }
} else if (adGame->_sceneViewport && !_gameRef->_editorMode) {
- if (offsetX) *offsetX = adGame->_sceneViewport->_offsetX;
- if (offsetY) *offsetY = adGame->_sceneViewport->_offsetY;
+ if (offsetX) {
+ *offsetX = adGame->_sceneViewport->_offsetX;
+ }
+ if (offsetY) {
+ *offsetY = adGame->_sceneViewport->_offsetY;
+ }
} else {
- if (offsetX) *offsetX = 0;
- if (offsetY) *offsetY = 0;
+ if (offsetX) {
+ *offsetX = 0;
+ }
+ if (offsetY) {
+ *offsetY = 0;
+ }
}
return STATUS_OK;
}
@@ -2365,14 +2562,26 @@ bool AdScene::getViewportOffset(int *offsetX, int *offsetY) { bool AdScene::getViewportSize(int *width, int *height) {
AdGame *adGame = (AdGame *)_gameRef;
if (_viewport && !_gameRef->_editorMode) {
- if (width) *width = _viewport->getWidth();
- if (height) *height = _viewport->getHeight();
+ if (width) {
+ *width = _viewport->getWidth();
+ }
+ if (height) {
+ *height = _viewport->getHeight();
+ }
} else if (adGame->_sceneViewport && !_gameRef->_editorMode) {
- if (width) *width = adGame->_sceneViewport->getWidth();
- if (height) *height = adGame->_sceneViewport->getHeight();
+ if (width) {
+ *width = adGame->_sceneViewport->getWidth();
+ }
+ if (height) {
+ *height = adGame->_sceneViewport->getHeight();
+ }
} else {
- if (width) *width = _gameRef->_renderer->_width;
- if (height) *height = _gameRef->_renderer->_height;
+ if (width) {
+ *width = _gameRef->_renderer->_width;
+ }
+ if (height) {
+ *height = _gameRef->_renderer->_height;
+ }
}
return STATUS_OK;
}
@@ -2472,11 +2681,15 @@ bool AdScene::loadState() { //////////////////////////////////////////////////////////////////////////
bool AdScene::persistState(bool saving) {
- if (!_persistentState) return STATUS_OK;
+ if (!_persistentState) {
+ return STATUS_OK;
+ }
AdGame *adGame = (AdGame *)_gameRef;
AdSceneState *state = adGame->getSceneState(getFilename(), saving);
- if (!state) return STATUS_OK;
+ if (!state) {
+ return STATUS_OK;
+ }
AdNodeState *nodeState;
@@ -2487,7 +2700,9 @@ bool AdScene::persistState(bool saving) { AdSceneNode *node = layer->_nodes[j];
switch (node->_type) {
case OBJECT_ENTITY:
- if (!node->_entity->_saveState) continue;
+ if (!node->_entity->_saveState) {
+ continue;
+ }
nodeState = state->getNodeState(node->_entity->getName(), saving);
if (nodeState) {
nodeState->transferEntity(node->_entity, _persistentStateSprites, saving);
@@ -2496,11 +2711,16 @@ bool AdScene::persistState(bool saving) { }
break;
case OBJECT_REGION:
- if (!node->_region->_saveState) continue;
+ if (!node->_region->_saveState) {
+ continue;
+ }
nodeState = state->getNodeState(node->_region->getName(), saving);
if (nodeState) {
- if (saving) nodeState->_active = node->_region->_active;
- else node->_region->_active = nodeState->_active;
+ if (saving) {
+ nodeState->_active = node->_region->_active;
+ } else {
+ node->_region->_active = nodeState->_active;
+ }
}
break;
default:
@@ -2512,7 +2732,9 @@ bool AdScene::persistState(bool saving) { // free entities
for (int i = 0; i < _objects.getSize(); i++) {
- if (!_objects[i]->_saveState) continue;
+ if (!_objects[i]->_saveState) {
+ continue;
+ }
if (_objects[i]->_type == OBJECT_ENTITY) {
nodeState = state->getNodeState(_objects[i]->getName(), saving);
if (nodeState) {
@@ -2527,8 +2749,11 @@ bool AdScene::persistState(bool saving) { for (int i = 0; i < _waypointGroups.getSize(); i++) {
nodeState = state->getNodeState(_waypointGroups[i]->getName(), saving);
if (nodeState) {
- if (saving) nodeState->_active = _waypointGroups[i]->_active;
- else _waypointGroups[i]->_active = nodeState->_active;
+ if (saving) {
+ nodeState->_active = _waypointGroups[i]->_active;
+ } else {
+ _waypointGroups[i]->_active = nodeState->_active;
+ }
}
}
@@ -2544,14 +2769,17 @@ float AdScene::getRotationAt(int x, int y) { for (int i = 0; i < _rotLevels.getSize(); i++) {
/* AdRotLevel *xxx = _rotLevels[i];
int j = _rotLevels.getSize();*/
- if (_rotLevels[i]->_posX < x) prev = _rotLevels[i];
- else {
+ if (_rotLevels[i]->_posX < x) {
+ prev = _rotLevels[i];
+ } else {
next = _rotLevels[i];
break;
}
}
- if (prev == NULL || next == NULL) return 0;
+ if (prev == NULL || next == NULL) {
+ return 0;
+ }
int delta_x = next->_posX - prev->_posX;
float delta_rot = next->_rotation - prev->_rotation;
@@ -2570,7 +2798,9 @@ bool AdScene::handleItemAssociations(const char *itemName, bool show) { if (layer->_nodes[j]->_type == OBJECT_ENTITY) {
AdEntity *ent = layer->_nodes[j]->_entity;
- if (ent->_item && strcmp(ent->_item, itemName) == 0) ent->_active = show;
+ if (ent->_item && strcmp(ent->_item, itemName) == 0) {
+ ent->_active = show;
+ }
}
}
}
@@ -2578,7 +2808,9 @@ bool AdScene::handleItemAssociations(const char *itemName, bool show) { for (int i = 0; i < _objects.getSize(); i++) {
if (_objects[i]->_type == OBJECT_ENTITY) {
AdEntity *ent = (AdEntity *)_objects[i];
- if (ent->_item && strcmp(ent->_item, itemName) == 0) ent->_active = show;
+ if (ent->_item && strcmp(ent->_item, itemName) == 0) {
+ ent->_active = show;
+ }
}
}
@@ -2596,7 +2828,9 @@ bool AdScene::getRegionsAt(int x, int y, AdRegion **regionList, int numRegions) if (numUsed < numRegions - 1) {
regionList[numUsed] = node->_region;
numUsed++;
- } else break;
+ } else {
+ break;
+ }
}
}
}
@@ -2618,13 +2852,17 @@ BaseObject *AdScene::getNextAccessObject(BaseObject *currObject) { BaseArray<AdObject *, AdObject *> objects;
getSceneObjects(objects, true);
- if (objects.getSize() == 0) return NULL;
- else {
+ if (objects.getSize() == 0) {
+ return NULL;
+ } else {
if (currObject != NULL) {
for (int i = 0; i < objects.getSize(); i++) {
if (objects[i] == currObject) {
- if (i < objects.getSize() - 1) return objects[i + 1];
- else break;
+ if (i < objects.getSize() - 1) {
+ return objects[i + 1];
+ } else {
+ break;
+ }
}
}
}
@@ -2638,13 +2876,17 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) { BaseArray<AdObject *, AdObject *> objects;
getSceneObjects(objects, true);
- if (objects.getSize() == 0) return NULL;
- else {
+ if (objects.getSize() == 0) {
+ return NULL;
+ } else {
if (currObject != NULL) {
for (int i = objects.getSize() - 1; i >= 0; i--) {
if (objects[i] == currObject) {
- if (i > 0) return objects[i - 1];
- else break;
+ if (i > 0) {
+ return objects[i - 1];
+ } else {
+ break;
+ }
}
}
}
@@ -2658,7 +2900,9 @@ BaseObject *AdScene::getPrevAccessObject(BaseObject *currObject) { bool AdScene::getSceneObjects(BaseArray<AdObject *, AdObject *> &objects, bool interactiveOnly) {
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++) {
@@ -2666,8 +2910,9 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *, AdObject *> &objects, bool i switch (node->_type) {
case OBJECT_ENTITY: {
AdEntity *ent = node->_entity;
- if (ent->_active && (ent->_registrable || !interactiveOnly))
+ if (ent->_active && (ent->_registrable || !interactiveOnly)) {
objects.add(ent);
+ }
}
break;
@@ -2682,7 +2927,9 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *, AdObject *> &objects, bool i break;
}
}
- if (!found) objects.add(regionObj[newIndex]);
+ if (!found) {
+ objects.add(regionObj[newIndex]);
+ }
}
//if (RegionObj.getSize() > 0) Objects.Append(RegionObj);
}
@@ -2705,7 +2952,9 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *, AdObject *> &objects, bool i break;
}
}
- if (!found) objects.add(regionObj[newIndex]);
+ if (!found) {
+ objects.add(regionObj[newIndex]);
+ }
}
@@ -2722,7 +2971,9 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *, AdObject 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;
+ if (interactiveOnly && !obj->_registrable) {
+ continue;
+ }
objects.add(obj);
}
@@ -2732,7 +2983,9 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *, AdObject 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;
+ if (interactiveOnly && !obj->_registrable) {
+ continue;
+ }
objects.add(obj);
}
diff --git a/engines/wintermute/ad/ad_scene_state.cpp b/engines/wintermute/ad/ad_scene_state.cpp index 617f247241..8a223150f2 100644 --- a/engines/wintermute/ad/ad_scene_state.cpp +++ b/engines/wintermute/ad/ad_scene_state.cpp @@ -47,7 +47,9 @@ AdSceneState::~AdSceneState() { delete[] _filename;
_filename = NULL;
- for (int i = 0; i < _nodeStates.getSize(); i++) delete _nodeStates[i];
+ for (int i = 0; i < _nodeStates.getSize(); i++) {
+ delete _nodeStates[i];
+ }
_nodeStates.removeAll();
}
@@ -65,14 +67,18 @@ bool AdSceneState::persist(BasePersistenceManager *persistMgr) { void AdSceneState::setFilename(const char *filename) {
delete[] _filename;
_filename = new char [strlen(filename) + 1];
- if (_filename) strcpy(_filename, filename);
+ if (_filename) {
+ strcpy(_filename, filename);
+ }
}
//////////////////////////////////////////////////////////////////////////
AdNodeState *AdSceneState::getNodeState(const char *name, bool saving) {
for (int i = 0; i < _nodeStates.getSize(); i++) {
- if (scumm_stricmp(_nodeStates[i]->_name, name) == 0) return _nodeStates[i];
+ if (scumm_stricmp(_nodeStates[i]->_name, name) == 0) {
+ return _nodeStates[i];
+ }
}
if (saving) {
@@ -81,7 +87,9 @@ AdNodeState *AdSceneState::getNodeState(const char *name, bool saving) { _nodeStates.add(ret);
return ret;
- } else return NULL;
+ } else {
+ return NULL;
+ }
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp index a011db3f02..d429c1fedf 100644 --- a/engines/wintermute/ad/ad_sentence.cpp +++ b/engines/wintermute/ad/ad_sentence.cpp @@ -91,19 +91,29 @@ AdSentence::~AdSentence() { //////////////////////////////////////////////////////////////////////////
void AdSentence::setText(const char *text) {
- if (_text) delete[] _text;
+ if (_text) {
+ delete[] _text;
+ }
_text = new char[strlen(text) + 1];
- if (_text) strcpy(_text, text);
+ if (_text) {
+ strcpy(_text, text);
+ }
}
//////////////////////////////////////////////////////////////////////////
void AdSentence::setStances(const char *stances) {
- if (_stances) delete[] _stances;
+ if (_stances) {
+ delete[] _stances;
+ }
if (stances) {
_stances = new char[strlen(stances) + 1];
- if (_stances) strcpy(_stances, stances);
- } else _stances = NULL;
+ if (_stances) {
+ strcpy(_stances, stances);
+ }
+ } else {
+ _stances = NULL;
+ }
}
@@ -122,36 +132,55 @@ char *AdSentence::getNextStance() { //////////////////////////////////////////////////////////////////////////
char *AdSentence::getStance(int stance) {
- if (_stances == NULL) return NULL;
+ if (_stances == NULL) {
+ return NULL;
+ }
- if (_tempStance) delete[] _tempStance;
+ if (_tempStance) {
+ delete[] _tempStance;
+ }
_tempStance = NULL;
char *start;
char *curr;
int pos;
- if (stance == 0) start = _stances;
- else {
+ if (stance == 0) {
+ start = _stances;
+ } else {
pos = 0;
start = NULL;
curr = _stances;
while (pos < stance) {
- if (*curr == '\0') break;
- if (*curr == ',') pos++;
+ if (*curr == '\0') {
+ break;
+ }
+ if (*curr == ',') {
+ pos++;
+ }
curr++;
}
- if (pos == stance) start = curr;
+ if (pos == stance) {
+ start = curr;
+ }
}
- if (start == NULL) return NULL;
+ if (start == NULL) {
+ return NULL;
+ }
- while (*start == ' ' && *start != ',' && *start != '\0') start++;
+ while (*start == ' ' && *start != ',' && *start != '\0') {
+ start++;
+ }
curr = start;
- while (*curr != '\0' && *curr != ',') curr++;
+ while (*curr != '\0' && *curr != ',') {
+ curr++;
+ }
- while (curr > start && *(curr - 1) == ' ') curr--;
+ while (curr > start && *(curr - 1) == ' ') {
+ curr--;
+ }
_tempStance = new char [curr - start + 1];
if (_tempStance) {
@@ -165,7 +194,9 @@ char *AdSentence::getStance(int stance) { //////////////////////////////////////////////////////////////////////////
bool AdSentence::display() {
- if (!_font || !_text) return STATUS_FAILED;
+ if (!_font || !_text) {
+ return STATUS_FAILED;
+ }
if (_sound && !_soundStarted) {
_sound->play();
@@ -195,7 +226,9 @@ bool AdSentence::display() { //////////////////////////////////////////////////////////////////////////
void AdSentence::setSound(BaseSound *sound) {
- if (!sound) return;
+ if (!sound) {
+ return;
+ }
delete _sound;
_sound = sound;
_soundStarted = false;
@@ -204,7 +237,9 @@ void AdSentence::setSound(BaseSound *sound) { //////////////////////////////////////////////////////////////////////////
bool AdSentence::finish() {
- if (_sound) _sound->stop();
+ if (_sound) {
+ _sound->stop();
+ }
return STATUS_OK;
}
@@ -242,7 +277,9 @@ bool AdSentence::setupTalkFile(const char *soundFilename) { _talkDef = NULL;
_currentSprite = NULL;
- if (!soundFilename) return STATUS_OK;
+ if (!soundFilename) {
+ return STATUS_OK;
+ }
AnsiString path = PathUtil::getDirectoryName(soundFilename);
@@ -250,8 +287,9 @@ bool AdSentence::setupTalkFile(const char *soundFilename) { AnsiString talkDefFileName = PathUtil::combine(path, name + ".talk");
- if (!_gameRef->_fileManager->hasFile(talkDefFileName))
- return STATUS_OK; // no talk def file found
+ if (!_gameRef->_fileManager->hasFile(talkDefFileName)) {
+ return STATUS_OK; // no talk def file found
+ }
_talkDef = new AdTalkDef(_gameRef);
if (!_talkDef || DID_FAIL(_talkDef->loadFile(talkDefFileName.c_str()))) {
@@ -267,7 +305,9 @@ bool AdSentence::setupTalkFile(const char *soundFilename) { //////////////////////////////////////////////////////////////////////////
bool AdSentence::update(TDirection dir) {
- if (!_talkDef) return STATUS_OK;
+ if (!_talkDef) {
+ return STATUS_OK;
+ }
uint32 currentTime;
// if sound is available, synchronize with sound, otherwise use timer
@@ -284,10 +324,14 @@ bool AdSentence::update(TDirection dir) { talkNodeFound = true;
BaseSprite *newSprite = _talkDef->_nodes[i]->getSprite(dir);
- if (newSprite != _currentSprite) newSprite->reset();
+ if (newSprite != _currentSprite) {
+ newSprite->reset();
+ }
_currentSprite = newSprite;
- if (!_talkDef->_nodes[i]->_playToEnd) break;
+ if (!_talkDef->_nodes[i]->_playToEnd) {
+ break;
+ }
}
}
@@ -296,9 +340,13 @@ bool AdSentence::update(TDirection dir) { if (!talkNodeFound) {
BaseSprite *newSprite = _talkDef->getDefaultSprite(dir);
if (newSprite) {
- if (newSprite != _currentSprite) newSprite->reset();
+ if (newSprite != _currentSprite) {
+ newSprite->reset();
+ }
_currentSprite = newSprite;
- } else _currentSprite = NULL;
+ } else {
+ _currentSprite = NULL;
+ }
}
return STATUS_OK;
diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp index fcbf9af4eb..42409988a5 100644 --- a/engines/wintermute/ad/ad_sprite_set.cpp +++ b/engines/wintermute/ad/ad_sprite_set.cpp @@ -41,8 +41,9 @@ IMPLEMENT_PERSISTENT(AdSpriteSet, false) AdSpriteSet::AdSpriteSet(BaseGame *inGame, BaseObject *owner): BaseObject(inGame) {
_owner = owner;
- for (int i = 0; i < NUM_DIRECTIONS; i++)
+ for (int i = 0; i < NUM_DIRECTIONS; i++) {
_sprites[i] = NULL;
+ }
}
@@ -67,7 +68,9 @@ bool AdSpriteSet::loadFile(const char *filename, int lifeTime, TSpriteCacheType bool ret;
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing SPRITESET file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing SPRITESET file '%s'", filename);
+ }
delete[] buffer;
@@ -90,7 +93,7 @@ TOKEN_DEF(TEMPLATE) TOKEN_DEF(EDITOR_PROPERTY)
TOKEN_DEF_END
//////////////////////////////////////////////////////////////////////////
-bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteCacheType CacheType) {
+bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteCacheType cacheType) {
TOKEN_TABLE_START(commands)
TOKEN_TABLE(SPRITESET)
TOKEN_TABLE(NAME)
@@ -122,7 +125,9 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_NAME:
@@ -133,64 +138,88 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC delete _sprites[DI_LEFT];
_sprites[DI_LEFT] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_LEFT] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_LEFT] = spr;
+ }
break;
case TOKEN_RIGHT:
delete _sprites[DI_RIGHT];
_sprites[DI_RIGHT] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_RIGHT] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_RIGHT] = spr;
+ }
break;
case TOKEN_UP:
delete _sprites[DI_UP];
_sprites[DI_UP] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_UP] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_UP] = spr;
+ }
break;
case TOKEN_DOWN:
delete _sprites[DI_DOWN];
_sprites[DI_DOWN] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_DOWN] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_DOWN] = spr;
+ }
break;
case TOKEN_UP_LEFT:
delete _sprites[DI_UPLEFT];
_sprites[DI_UPLEFT] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_UPLEFT] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_UPLEFT] = spr;
+ }
break;
case TOKEN_UP_RIGHT:
delete _sprites[DI_UPRIGHT];
_sprites[DI_UPRIGHT] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_UPRIGHT] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_UPRIGHT] = spr;
+ }
break;
case TOKEN_DOWN_LEFT:
delete _sprites[DI_DOWNLEFT];
_sprites[DI_DOWNLEFT] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_DOWNLEFT] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_DOWNLEFT] = spr;
+ }
break;
case TOKEN_DOWN_RIGHT:
delete _sprites[DI_DOWNRIGHT];
_sprites[DI_DOWNRIGHT] = NULL;
spr = new BaseSprite(_gameRef, _owner);
- if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
- else _sprites[DI_DOWNRIGHT] = spr;
+ if (!spr || DID_FAIL(spr->loadFile((char *)params, lifeTime, cacheType))) {
+ cmd = PARSERR_GENERIC;
+ } else {
+ _sprites[DI_DOWNRIGHT] = spr;
+ }
break;
case TOKEN_EDITOR_PROPERTY:
@@ -205,7 +234,9 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC if (cmd == PARSERR_GENERIC) {
_gameRef->LOG(0, "Error loading SPRITESET definition");
- if (spr) delete spr;
+ if (spr) {
+ delete spr;
+ }
return STATUS_FAILED;
}
@@ -230,8 +261,12 @@ bool AdSpriteSet::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
BaseSprite *AdSpriteSet::getSprite(TDirection direction) {
int dir = (int)direction;
- if (dir < 0) dir = 0;
- if (dir >= NUM_DIRECTIONS) dir = NUM_DIRECTIONS - 1;
+ if (dir < 0) {
+ dir = 0;
+ }
+ if (dir >= NUM_DIRECTIONS) {
+ dir = NUM_DIRECTIONS - 1;
+ }
BaseSprite *ret = NULL;
@@ -247,8 +282,11 @@ BaseSprite *AdSpriteSet::getSprite(TDirection direction) { for (int i = dir; i < NUM_DIRECTIONS; i++) {
if (_sprites[i] != NULL) {
- if (ret == NULL || numSteps > i - dir) return _sprites[i];
- else return ret;
+ if (ret == NULL || numSteps > i - dir) {
+ return _sprites[i];
+ } else {
+ return ret;
+ }
}
}
@@ -260,7 +298,9 @@ BaseSprite *AdSpriteSet::getSprite(TDirection direction) { //////////////////////////////////////////////////////////////////////////
bool AdSpriteSet::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent, "SPRITESET {\n");
- if (getName()) buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", getName());
+ if (getName()) {
+ buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", getName());
+ }
for (int i = 0; i < NUM_DIRECTIONS; i++) {
if (_sprites[i]) {
switch (i) {
@@ -301,10 +341,14 @@ bool AdSpriteSet::saveAsText(BaseDynamicBuffer *buffer, int indent) { //////////////////////////////////////////////////////////////////////////
bool AdSpriteSet::containsSprite(BaseSprite *sprite) {
- if (!sprite) return false;
+ if (!sprite) {
+ return false;
+ }
for (int i = 0; i < NUM_DIRECTIONS; i++) {
- if (_sprites[i] == sprite) return true;
+ if (_sprites[i] == sprite) {
+ return true;
+ }
}
return false;
}
diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp index 2b0c6c6c1b..fc057ba183 100644 --- a/engines/wintermute/ad/ad_talk_def.cpp +++ b/engines/wintermute/ad/ad_talk_def.cpp @@ -52,7 +52,9 @@ AdTalkDef::AdTalkDef(BaseGame *inGame): BaseObject(inGame) { //////////////////////////////////////////////////////////////////////////
AdTalkDef::~AdTalkDef() {
- for (int i = 0; i < _nodes.getSize(); i++) delete _nodes[i];
+ for (int i = 0; i < _nodes.getSize(); i++) {
+ delete _nodes[i];
+ }
_nodes.removeAll();
delete[] _defaultSpriteFilename;
@@ -79,7 +81,9 @@ bool AdTalkDef::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing TALK file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing TALK file '%s'", filename);
+ }
delete[] buffer;
@@ -123,15 +127,18 @@ bool AdTalkDef::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_ACTION: {
- AdTalkNode *Node = new AdTalkNode(_gameRef);
- if (Node && DID_SUCCEED(Node->loadBuffer(params, false))) _nodes.add(Node);
- else {
- delete Node;
- Node = NULL;
+ AdTalkNode *node = new AdTalkNode(_gameRef);
+ if (node && DID_SUCCEED(node->loadBuffer(params, false))) {
+ _nodes.add(node);
+ } else {
+ delete node;
+ node = NULL;
cmd = PARSERR_GENERIC;
}
}
@@ -179,12 +186,16 @@ bool AdTalkDef::loadBuffer(byte *buffer, bool complete) { if (_defaultSpriteFilename) {
_defaultSprite = new BaseSprite(_gameRef);
- if (!_defaultSprite || DID_FAIL(_defaultSprite->loadFile(_defaultSpriteFilename))) return STATUS_FAILED;
+ if (!_defaultSprite || DID_FAIL(_defaultSprite->loadFile(_defaultSpriteFilename))) {
+ return STATUS_FAILED;
+ }
}
if (_defaultSpriteSetFilename) {
_defaultSpriteSet = new AdSpriteSet(_gameRef);
- if (!_defaultSpriteSet || DID_FAIL(_defaultSpriteSet->loadFile(_defaultSpriteSetFilename))) return STATUS_FAILED;
+ if (!_defaultSpriteSet || DID_FAIL(_defaultSpriteSet->loadFile(_defaultSpriteSetFilename))) {
+ return STATUS_FAILED;
+ }
}
@@ -211,10 +222,15 @@ bool AdTalkDef::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
bool AdTalkDef::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent, "TALK {\n");
- if (_defaultSpriteFilename) buffer->putTextIndent(indent + 2, "DEFAULT_SPRITE=\"%s\"\n", _defaultSpriteFilename);
+ if (_defaultSpriteFilename) {
+ buffer->putTextIndent(indent + 2, "DEFAULT_SPRITE=\"%s\"\n", _defaultSpriteFilename);
+ }
- if (_defaultSpriteSetFilename) buffer->putTextIndent(indent + 2, "DEFAULT_SPRITESET_FILE=\"%s\"\n", _defaultSpriteSetFilename);
- else if (_defaultSpriteSet) _defaultSpriteSet->saveAsText(buffer, indent + 2);
+ 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++) {
_nodes[i]->saveAsText(buffer, indent + 2);
@@ -236,24 +252,34 @@ bool AdTalkDef::loadDefaultSprite() { delete _defaultSprite;
_defaultSprite = NULL;
return STATUS_FAILED;
- } else return STATUS_OK;
+ } else {
+ return STATUS_OK;
+ }
} else if (_defaultSpriteSetFilename && !_defaultSpriteSet) {
_defaultSpriteSet = new AdSpriteSet(_gameRef);
if (!_defaultSpriteSet || DID_FAIL(_defaultSpriteSet->loadFile(_defaultSpriteSetFilename))) {
delete _defaultSpriteSet;
_defaultSpriteSet = NULL;
return STATUS_FAILED;
- } else return STATUS_OK;
- } else return STATUS_OK;
+ } else {
+ return STATUS_OK;
+ }
+ } else {
+ return STATUS_OK;
+ }
}
//////////////////////////////////////////////////////////////////////////
BaseSprite *AdTalkDef::getDefaultSprite(TDirection dir) {
loadDefaultSprite();
- if (_defaultSprite) return _defaultSprite;
- else if (_defaultSpriteSet) return _defaultSpriteSet->getSprite(dir);
- else return NULL;
+ if (_defaultSprite) {
+ return _defaultSprite;
+ } else if (_defaultSpriteSet) {
+ return _defaultSpriteSet->getSprite(dir);
+ } else {
+ return NULL;
+ }
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp index d47cbb446e..90435d7977 100644 --- a/engines/wintermute/ad/ad_talk_holder.cpp +++ b/engines/wintermute/ad/ad_talk_holder.cpp @@ -52,12 +52,14 @@ AdTalkHolder::~AdTalkHolder() { 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();
- for (int i = 0; i < _talkSpritesEx.getSize(); i++)
+ for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
delete _talkSpritesEx[i];
+ }
_talkSpritesEx.removeAll();
}
@@ -77,7 +79,9 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { _gameRef->LOG(res, "AdTalkHolder::GetTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", getName(), _forcedTalkAnimName);
delete _animSprite;
_animSprite = NULL;
- } else return _animSprite;
+ } else {
+ return _animSprite;
+ }
}
}
@@ -103,8 +107,9 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { // not a valid stance? get a random one
if (ret == NULL) {
- if (_talkSprites.getSize() < 1) ret = _sprite;
- else {
+ if (_talkSprites.getSize() < 1) {
+ ret = _sprite;
+ } else {
// TODO: remember last
int rnd = g_wintermute->randInt(0, _talkSprites.getSize() - 1);
ret = _talkSprites[rnd];
@@ -128,14 +133,18 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS ScValue *val = stack->pop();
bool setCurrent = false;
- if (_currentSprite && _currentSprite == _sprite) setCurrent = true;
+ if (_currentSprite && _currentSprite == _sprite) {
+ setCurrent = true;
+ }
delete _sprite;
_sprite = NULL;
if (val->isNULL()) {
_sprite = NULL;
- if (setCurrent) _currentSprite = NULL;
+ if (setCurrent) {
+ _currentSprite = NULL;
+ }
stack->pushBool(true);
} else {
const char *filename = val->getString();
@@ -145,7 +154,9 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS stack->pushBool(false);
} else {
_sprite = spr;
- if (setCurrent) _currentSprite = _sprite;
+ if (setCurrent) {
+ _currentSprite = _sprite;
+ }
stack->pushBool(true);
}
}
@@ -158,8 +169,11 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS else if (strcmp(name, "GetSprite") == 0) {
stack->correctParams(0);
- if (!_sprite || !_sprite->getFilename()) stack->pushNULL();
- else stack->pushString(_sprite->getFilename());
+ if (!_sprite || !_sprite->getFilename()) {
+ stack->pushNULL();
+ } else {
+ stack->pushString(_sprite->getFilename());
+ }
return STATUS_OK;
}
@@ -169,8 +183,11 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS else if (strcmp(name, "GetSpriteObject") == 0) {
stack->correctParams(0);
- if (!_sprite) stack->pushNULL();
- else stack->pushNative(_sprite, true);
+ if (!_sprite) {
+ stack->pushNULL();
+ } else {
+ stack->pushNative(_sprite, true);
+ }
return STATUS_OK;
}
@@ -181,15 +198,18 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS stack->correctParams(2);
const char *filename = stack->pop()->getString();
- bool Ex = stack->pop()->getBool();
+ bool ex = stack->pop()->getBool();
BaseSprite *spr = new BaseSprite(_gameRef, this);
if (!spr || DID_FAIL(spr->loadFile(filename))) {
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;
@@ -210,10 +230,12 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS if (ex) {
for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
if (scumm_stricmp(_talkSpritesEx[i]->getFilename(), filename) == 0) {
- if (_currentSprite == _talkSpritesEx[i])
+ if (_currentSprite == _talkSpritesEx[i]) {
setCurrent = true;
- if (_tempSprite2 == _talkSpritesEx[i])
+ }
+ if (_tempSprite2 == _talkSpritesEx[i]) {
setTemp2 = true;
+ }
delete _talkSpritesEx[i];
_talkSpritesEx.removeAt(i);
break;
@@ -222,10 +244,12 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS } else {
for (int i = 0; i < _talkSprites.getSize(); i++) {
if (scumm_stricmp(_talkSprites[i]->getFilename(), filename) == 0) {
- if (_currentSprite == _talkSprites[i])
+ if (_currentSprite == _talkSprites[i]) {
setCurrent = true;
- if (_tempSprite2 == _talkSprites[i])
+ }
+ if (_tempSprite2 == _talkSprites[i]) {
setTemp2 = true;
+ }
delete _talkSprites[i];
_talkSprites.removeAt(i);
break;
@@ -235,10 +259,12 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS }
stack->pushBool(true);
- if (setCurrent)
+ if (setCurrent) {
_currentSprite = _sprite;
- if (setTemp2)
+ }
+ if (setTemp2) {
_tempSprite2 = _sprite;
+ }
return STATUS_OK;
}
@@ -263,38 +289,47 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS // delete current
if (ex) {
for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
- if (_talkSpritesEx[i] == _currentSprite)
+ if (_talkSpritesEx[i] == _currentSprite) {
setCurrent = true;
- if (_talkSpritesEx[i] == _tempSprite2)
+ }
+ if (_talkSpritesEx[i] == _tempSprite2) {
setTemp2 = true;
+ }
delete _talkSpritesEx[i];
}
_talkSpritesEx.removeAll();
} else {
for (int i = 0; i < _talkSprites.getSize(); i++) {
- if (_talkSprites[i] == _currentSprite) setCurrent = true;
- if (_talkSprites[i] == _tempSprite2) setTemp2 = true;
+ if (_talkSprites[i] == _currentSprite) {
+ setCurrent = true;
+ }
+ if (_talkSprites[i] == _tempSprite2) {
+ setTemp2 = true;
+ }
delete _talkSprites[i];
}
_talkSprites.removeAll();
}
// set new
- if (ex)
+ if (ex) {
_talkSpritesEx.add(spr);
- else
+ } else {
_talkSprites.add(spr);
+ }
stack->pushBool(true);
- if (setCurrent)
+ if (setCurrent) {
_currentSprite = spr;
- if (setTemp2)
+ }
+ if (setTemp2) {
_tempSprite2 = spr;
+ }
}
return STATUS_OK;
+ } else {
+ return AdObject::scCallMethod(script, stack, thisStack, name);
}
-
- else return AdObject::scCallMethod(script, stack, thisStack, name);
}
@@ -308,9 +343,9 @@ ScValue *AdTalkHolder::scGetProperty(const char *name) { if (strcmp(name, "Type") == 0) {
_scValue->setString("talk-holder");
return _scValue;
+ } else {
+ return AdObject::scGetProperty(name);
}
-
- else return AdObject::scGetProperty(name);
}
@@ -338,13 +373,15 @@ const char *AdTalkHolder::scToString() { //////////////////////////////////////////////////////////////////////////
bool AdTalkHolder::saveAsText(BaseDynamicBuffer *buffer, int indent) {
for (int i = 0; i < _talkSprites.getSize(); i++) {
- if (_talkSprites[i]->getFilename())
+ if (_talkSprites[i]->getFilename()) {
buffer->putTextIndent(indent + 2, "TALK=\"%s\"\n", _talkSprites[i]->getFilename());
+ }
}
for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
- if (_talkSpritesEx[i]->getFilename())
+ if (_talkSpritesEx[i]->getFilename()) {
buffer->putTextIndent(indent + 2, "TALK_SPECIAL=\"%s\"\n", _talkSpritesEx[i]->getFilename());
+ }
}
return STATUS_OK;
diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp index 306825c439..ef30290b8c 100644 --- a/engines/wintermute/ad/ad_talk_node.cpp +++ b/engines/wintermute/ad/ad_talk_node.cpp @@ -142,7 +142,9 @@ bool AdTalkNode::loadBuffer(byte *buffer, bool complete) { break;
case TOKEN_COMMENT:
- if (_gameRef->_editorMode) BaseUtils::setString(&_comment, (char *)params);
+ if (_gameRef->_editorMode) {
+ BaseUtils::setString(&_comment, (char *)params);
+ }
break;
case TOKEN_EDITOR_PROPERTY:
@@ -160,23 +162,26 @@ bool AdTalkNode::loadBuffer(byte *buffer, bool complete) { return STATUS_FAILED;
}
- if (_endTime == 0)
+ if (_endTime == 0) {
_playToEnd = true;
- else
+ } else {
_playToEnd = false;
+ }
if (_preCache && _spriteFilename) {
delete _sprite;
_sprite = new BaseSprite(_gameRef);
- if (!_sprite || DID_FAIL(_sprite->loadFile(_spriteFilename)))
+ if (!_sprite || DID_FAIL(_sprite->loadFile(_spriteFilename))) {
return STATUS_FAILED;
+ }
}
if (_preCache && _spriteSetFilename) {
delete _spriteSet;
_spriteSet = new AdSpriteSet(_gameRef);
- if (!_spriteSet || DID_FAIL(_spriteSet->loadFile(_spriteSetFilename)))
+ if (!_spriteSet || DID_FAIL(_spriteSet->loadFile(_spriteSetFilename))) {
return STATUS_FAILED;
+ }
}
return STATUS_OK;
@@ -202,13 +207,24 @@ bool AdTalkNode::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
bool AdTalkNode::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent, "ACTION {\n");
- if (_comment) buffer->putTextIndent(indent + 2, "COMMENT=\"%s\"\n", _comment);
+ if (_comment) {
+ buffer->putTextIndent(indent + 2, "COMMENT=\"%s\"\n", _comment);
+ }
buffer->putTextIndent(indent + 2, "START_TIME=%d\n", _startTime);
- if (!_playToEnd) buffer->putTextIndent(indent + 2, "END_TIME=%d\n", _endTime);
- if (_spriteFilename) buffer->putTextIndent(indent + 2, "SPRITE=\"%s\"\n", _spriteFilename);
- if (_spriteSetFilename) buffer->putTextIndent(indent + 2, "SPRITESET_FILE=\"%s\"\n", _spriteSetFilename);
- else if (_spriteSet) _spriteSet->saveAsText(buffer, indent + 2);
- if (_preCache) buffer->putTextIndent(indent + 2, "PRECACHE=\"%s\"\n", _preCache ? "TRUE" : "FALSE");
+ if (!_playToEnd) {
+ buffer->putTextIndent(indent + 2, "END_TIME=%d\n", _endTime);
+ }
+ if (_spriteFilename) {
+ buffer->putTextIndent(indent + 2, "SPRITE=\"%s\"\n", _spriteFilename);
+ }
+ if (_spriteSetFilename) {
+ buffer->putTextIndent(indent + 2, "SPRITESET_FILE=\"%s\"\n", _spriteSetFilename);
+ } else if (_spriteSet) {
+ _spriteSet->saveAsText(buffer, indent + 2);
+ }
+ if (_preCache) {
+ buffer->putTextIndent(indent + 2, "PRECACHE=\"%s\"\n", _preCache ? "TRUE" : "FALSE");
+ }
BaseClass::saveAsText(buffer, indent + 2);
@@ -226,19 +242,21 @@ bool AdTalkNode::loadSprite() { delete _sprite;
_sprite = NULL;
return STATUS_FAILED;
- } else return STATUS_OK;
- }
-
- else if (_spriteSetFilename && !_spriteSet) {
+ } else {
+ return STATUS_OK;
+ }
+ } else if (_spriteSetFilename && !_spriteSet) {
_spriteSet = new AdSpriteSet(_gameRef);
if (!_spriteSet || DID_FAIL(_spriteSet->loadFile(_spriteSetFilename))) {
delete _spriteSet;
_spriteSet = NULL;
return STATUS_FAILED;
- } else return STATUS_OK;
+ } else {
+ return STATUS_OK;
+ }
+ } else {
+ return STATUS_OK;
}
-
- else return STATUS_OK;
}
@@ -246,20 +264,32 @@ bool AdTalkNode::loadSprite() { bool AdTalkNode::isInTimeInterval(uint32 time, TDirection dir) {
if (time >= _startTime) {
if (_playToEnd) {
- if ((_spriteFilename && _sprite == NULL) || (_sprite && _sprite->_finished == false)) return true;
- else if ((_spriteSetFilename && _spriteSet == NULL) || (_spriteSet && _spriteSet->getSprite(dir) && _spriteSet->getSprite(dir)->_finished == false)) return true;
- else return false;
- } else return _endTime >= time;
- } else return false;
+ if ((_spriteFilename && _sprite == NULL) || (_sprite && _sprite->_finished == false)) {
+ return true;
+ } else if ((_spriteSetFilename && _spriteSet == NULL) || (_spriteSet && _spriteSet->getSprite(dir) && _spriteSet->getSprite(dir)->_finished == false)) {
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ return _endTime >= time;
+ }
+ } else {
+ return false;
+ }
}
//////////////////////////////////////////////////////////////////////////
BaseSprite *AdTalkNode::getSprite(TDirection dir) {
loadSprite();
- if (_sprite) return _sprite;
- else if (_spriteSet) return _spriteSet->getSprite(dir);
- else return NULL;
+ if (_sprite) {
+ return _sprite;
+ } else if (_spriteSet) {
+ return _spriteSet->getSprite(dir);
+ } else {
+ return NULL;
+ }
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp index 7e5d8d29c6..bb1e9275f5 100644 --- a/engines/wintermute/ad/ad_waypoint_group.cpp +++ b/engines/wintermute/ad/ad_waypoint_group.cpp @@ -56,8 +56,9 @@ AdWaypointGroup::~AdWaypointGroup() { //////////////////////////////////////////////////////////////////////////
void AdWaypointGroup::cleanup() {
- for (int i = 0; i < _points.getSize(); i++)
+ for (int i = 0; i < _points.getSize(); i++) {
delete _points[i];
+ }
_points.removeAll();
_editorSelectedPoint = -1;
}
@@ -75,7 +76,9 @@ bool AdWaypointGroup::loadFile(const char *filename) { setFilename(filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing WAYPOINTS file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) {
+ _gameRef->LOG(0, "Error parsing WAYPOINTS file '%s'", filename);
+ }
delete[] buffer;
@@ -122,7 +125,9 @@ bool AdWaypointGroup::loadBuffer(byte *buffer, bool complete) { while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
- if (DID_FAIL(loadFile((char *)params))) cmd = PARSERR_GENERIC;
+ if (DID_FAIL(loadFile((char *)params))) {
+ cmd = PARSERR_GENERIC;
+ }
break;
case TOKEN_NAME:
@@ -169,8 +174,9 @@ bool AdWaypointGroup::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "EDITOR_SELECTED_POINT=%d\n", _editorSelectedPoint);
- if (_scProp)
+ if (_scProp) {
_scProp->saveAsText(buffer, indent + 2);
+ }
BaseClass::saveAsText(buffer, indent + 2);
for (int i = 0; i < _points.getSize(); i++) {
@@ -217,9 +223,9 @@ ScValue *AdWaypointGroup::scGetProperty(const char *name) { else if (strcmp(name, "Active") == 0) {
_scValue->setBool(_active);
return _scValue;
+ } else {
+ return BaseObject::scGetProperty(name);
}
-
- else return BaseObject::scGetProperty(name);
}
@@ -233,13 +239,17 @@ bool AdWaypointGroup::scSetProperty(const char *name, ScValue *value) { return STATUS_OK;
}
- else return BaseObject::scSetProperty(name, value);
+ else {
+ return BaseObject::scSetProperty(name, value);
+ }
}
//////////////////////////////////////////////////////////////////////////
bool AdWaypointGroup::mimic(AdWaypointGroup *wpt, float scale, int argX, int argY) {
- if (scale == _lastMimicScale && argX == _lastMimicX && argY == _lastMimicY) return STATUS_OK;
+ if (scale == _lastMimicScale && argX == _lastMimicX && argY == _lastMimicY) {
+ return STATUS_OK;
+ }
cleanup();
|