aboutsummaryrefslogtreecommitdiff
path: root/engines/illusions/resources
diff options
context:
space:
mode:
Diffstat (limited to 'engines/illusions/resources')
-rw-r--r--engines/illusions/resources/actorresource.cpp18
-rw-r--r--engines/illusions/resources/backgroundresource.cpp27
-rw-r--r--engines/illusions/resources/fontresource.cpp3
-rw-r--r--engines/illusions/resources/scriptresource.cpp33
-rw-r--r--engines/illusions/resources/soundresource.cpp3
-rw-r--r--engines/illusions/resources/talkresource.cpp6
6 files changed, 60 insertions, 30 deletions
diff --git a/engines/illusions/resources/actorresource.cpp b/engines/illusions/resources/actorresource.cpp
index 13c8abc481..04e6c9dc67 100644
--- a/engines/illusions/resources/actorresource.cpp
+++ b/engines/illusions/resources/actorresource.cpp
@@ -162,9 +162,10 @@ void ActorResource::load(Resource *resource) {
}
bool ActorResource::containsSequence(Sequence *sequence) {
- for (uint i = 0; i < _sequences.size(); ++i)
+ for (uint i = 0; i < _sequences.size(); ++i) {
if (sequence == &_sequences[i])
return true;
+ }
return false;
}
@@ -243,10 +244,12 @@ void ActorInstance::registerResources() {
}
void ActorInstance::unregisterResources() {
- for (uint i = 0; i < _actorResource->_actorTypes.size(); ++i)
+ for (uint i = 0; i < _actorResource->_actorTypes.size(); ++i) {
_vm->_dict->removeActorType(_actorResource->_actorTypes[i]._actorTypeId);
- for (uint i = 0; i < _actorResource->_sequences.size(); ++i)
+ }
+ for (uint i = 0; i < _actorResource->_sequences.size(); ++i) {
_vm->_dict->removeSequence(_actorResource->_sequences[i]._sequenceId);
+ }
}
// ActorInstanceList
@@ -270,15 +273,17 @@ void ActorInstanceList::removeActorInstance(ActorInstance *actorInstance) {
}
void ActorInstanceList::pauseBySceneId(uint32 sceneId) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_sceneId == sceneId)
(*it)->pause();
+ }
}
void ActorInstanceList::unpauseBySceneId(uint32 sceneId) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_sceneId == sceneId)
(*it)->unpause();
+ }
}
FramesList *ActorInstanceList::findSequenceFrames(Sequence *sequence) {
@@ -291,9 +296,10 @@ FramesList *ActorInstanceList::findSequenceFrames(Sequence *sequence) {
}
ActorInstance *ActorInstanceList::findActorByResource(ActorResource *actorResource) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_actorResource == actorResource)
return (*it);
+ }
return 0;
}
diff --git a/engines/illusions/resources/backgroundresource.cpp b/engines/illusions/resources/backgroundresource.cpp
index 27d73a70b9..2a37bba4a8 100644
--- a/engines/illusions/resources/backgroundresource.cpp
+++ b/engines/illusions/resources/backgroundresource.cpp
@@ -281,8 +281,9 @@ void BackgroundResource::load(byte *data, uint32 dataSize) {
stream.seek(0x48);
uint32 regionSequencesOffs = stream.readUint32LE();
stream.seek(regionSequencesOffs);
- for (uint i = 0; i < _regionSequencesCount; ++i)
+ for (uint i = 0; i < _regionSequencesCount; ++i) {
_regionSequences[i].load(data, stream);
+ }
// Load background objects
stream.seek(0x1C);
@@ -344,8 +345,9 @@ void BackgroundResource::load(byte *data, uint32 dataSize) {
int BackgroundResource::findMasterBgIndex() {
int index = 1;
- while (!(_bgInfos[index - 1]._flags & 1)) //TODO check if this is correct
+ while (!(_bgInfos[index - 1]._flags & 1)) { // TODO check if this is correct
++index;
+ }
return index;
}
@@ -394,8 +396,9 @@ void BackgroundInstance::load(Resource *resource) {
initSurface();
// Insert background objects
- for (uint i = 0; i < backgroundResource->_backgroundObjectsCount; ++i)
+ for (uint i = 0; i < backgroundResource->_backgroundObjectsCount; ++i) {
_vm->_controls->placeBackgroundObject(&backgroundResource->_backgroundObjects[i]);
+ }
registerResources();
@@ -460,8 +463,9 @@ void BackgroundInstance::unregisterResources() {
}
void BackgroundInstance::initSurface() {
- for (uint i = 0; i < kMaxBackgroundItemSurfaces; ++i)
+ for (uint i = 0; i < kMaxBackgroundItemSurfaces; ++i) {
_surfaces[i] = 0;
+ }
for (uint i = 0; i < _bgRes->_bgInfosCount; ++i) {
BgInfo *bgInfo = &_bgRes->_bgInfos[i];
_panPoints[i] = bgInfo->_panPoint;
@@ -481,12 +485,13 @@ void BackgroundInstance::initSurface() {
}
void BackgroundInstance::freeSurface() {
- for (uint i = 0; i < _bgRes->_bgInfosCount; ++i)
+ for (uint i = 0; i < _bgRes->_bgInfosCount; ++i) {
if (_surfaces[i]) {
_surfaces[i]->free();
delete _surfaces[i];
_surfaces[i] = 0;
}
+ }
}
void BackgroundInstance::drawTiles(Graphics::Surface *surface, TileMap &tileMap, byte *tilePixels) {
@@ -572,28 +577,32 @@ void BackgroundInstanceList::removeBackgroundInstance(BackgroundInstance *backgr
}
void BackgroundInstanceList::pauseBySceneId(uint32 sceneId) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_sceneId == sceneId)
(*it)->pause();
+ }
}
void BackgroundInstanceList::unpauseBySceneId(uint32 sceneId) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_sceneId == sceneId)
(*it)->unpause();
+ }
}
BackgroundInstance *BackgroundInstanceList::findActiveBackgroundInstance() {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_pauseCtr == 0)
return (*it);
+ }
return 0;
}
BackgroundInstance *BackgroundInstanceList::findBackgroundByResource(BackgroundResource *backgroundResource) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_bgRes == backgroundResource)
return (*it);
+ }
return 0;
}
diff --git a/engines/illusions/resources/fontresource.cpp b/engines/illusions/resources/fontresource.cpp
index 4c89708fbc..8d11e92b48 100644
--- a/engines/illusions/resources/fontresource.cpp
+++ b/engines/illusions/resources/fontresource.cpp
@@ -104,9 +104,10 @@ void FontResource::load(Resource *resource) {
}
CharInfo *FontResource::getCharInfo(uint16 c) {
- for (uint i = 0; i < _charRangesCount; ++i)
+ for (uint i = 0; i < _charRangesCount; ++i) {
if (_charRanges[i].containsChar(c))
return _charRanges[i].getCharInfo(c);
+ }
return 0;
}
diff --git a/engines/illusions/resources/scriptresource.cpp b/engines/illusions/resources/scriptresource.cpp
index 08433fe71c..760273c669 100644
--- a/engines/illusions/resources/scriptresource.cpp
+++ b/engines/illusions/resources/scriptresource.cpp
@@ -51,8 +51,9 @@ void Properties::init(uint count, byte *properties) {
void Properties::clear() {
uint32 size = getSize();
- for (uint32 i = 0; i < size; ++i)
+ for (uint32 i = 0; i < size; ++i) {
_properties[i] = 0;
+ }
}
bool Properties::get(uint32 propertyId) {
@@ -108,8 +109,9 @@ void BlockCounters::init(uint count, byte *blockCounters) {
}
void BlockCounters::clear() {
- for (uint i = 0; i < _count; ++i)
+ for (uint i = 0; i < _count; ++i) {
_blockCounters[i] = 0;
+ }
}
byte BlockCounters::get(uint index) {
@@ -177,8 +179,9 @@ void TriggerObject::load(byte *dataStart, Common::SeekableReadStream &stream) {
debug(2, "TriggerObject::load() _objectId: %08X; _causesCount: %d",
_objectId, _causesCount);
_causes = new TriggerCause[_causesCount];
- for (uint i = 0; i < _causesCount; ++i)
+ for (uint i = 0; i < _causesCount; ++i) {
_causes[i].load(stream);
+ }
}
bool TriggerObject::findTriggerCause(uint32 verbId, uint32 objectId2, uint32 &codeOffs) {
@@ -191,18 +194,20 @@ bool TriggerObject::findTriggerCause(uint32 verbId, uint32 objectId2, uint32 &co
}
}
} else {
- for (uint i = 0; i < _causesCount; ++i)
+ for (uint i = 0; i < _causesCount; ++i) {
if (_causes[i]._verbId == verbId && _causes[i]._objectId2 == objectId2) {
codeOffs = _causes[i]._codeOffs;
return true;
}
+ }
}
return false;
}
void TriggerObject::fixupSceneInfosDuckman() {
- for (uint i = 0; i < _causesCount; ++i)
+ for (uint i = 0; i < _causesCount; ++i) {
_causes[i]._verbId &= 0xFFFF;
+ }
}
// SceneInfo
@@ -229,8 +234,9 @@ void SceneInfo::load(byte *dataStart, Common::SeekableReadStream &stream) {
uint32 triggerObjectsListOffs = stream.readUint32LE();
if (_resourcesCount > 0) {
_resources = new uint32[_resourcesCount];
- for (uint i = 0; i < _resourcesCount; ++i)
+ for (uint i = 0; i < _resourcesCount; ++i) {
_resources[i] = stream.readUint32LE();
+ }
}
if (_triggerObjectsCount > 0) {
_triggerObjects = new TriggerObject[_triggerObjectsCount];
@@ -256,15 +262,17 @@ void SceneInfo::getResources(uint &resourcesCount, uint32 *&resources) {
}
TriggerObject *SceneInfo::findTriggerObject(uint32 objectId) {
- for (uint i = 0; i < _triggerObjectsCount; ++i)
+ for (uint i = 0; i < _triggerObjectsCount; ++i) {
if (_triggerObjects[i]._objectId == objectId)
return &_triggerObjects[i];
+ }
return 0;
}
void SceneInfo::fixupSceneInfosDuckman() {
- for (uint i = 0; i < _triggerObjectsCount; ++i)
+ for (uint i = 0; i < _triggerObjectsCount; ++i) {
_triggerObjects[i].fixupSceneInfosDuckman();
+ }
}
// ScriptResource
@@ -290,8 +298,9 @@ void ScriptResource::load(Resource *resource) {
if (resource->_gameId == kGameIdBBDOU) {
sceneInfosOffs = 0x18;
} else if (resource->_gameId == kGameIdDuckman) {
- for (uint i = 0; i < 27; ++i)
+ for (uint i = 0; i < 27; ++i) {
_soundIds[i] = stream.readUint32LE();
+ }
sceneInfosOffs = 0x8C;
}
@@ -326,8 +335,9 @@ void ScriptResource::load(Resource *resource) {
_codeOffsets = new uint32[_codeCount];
stream.seek(codeTblOffs);
- for (uint i = 0; i < _codeCount; ++i)
+ for (uint i = 0; i < _codeCount; ++i) {
_codeOffsets[i] = stream.readUint32LE();
+ }
_sceneInfos = new SceneInfo[_sceneInfosCount];
for (uint i = 0; i < _sceneInfosCount; ++i) {
@@ -378,8 +388,9 @@ uint32 ScriptResource::getObjectActorTypeId(uint32 objectId) {
}
void ScriptResource::fixupSceneInfosDuckman() {
- for (uint i = 0; i < _sceneInfosCount; ++i)
+ for (uint i = 0; i < _sceneInfosCount; ++i) {
_sceneInfos[i].fixupSceneInfosDuckman();
+ }
}
// ScriptInstance
diff --git a/engines/illusions/resources/soundresource.cpp b/engines/illusions/resources/soundresource.cpp
index 5cfa240db6..030a4cc3a9 100644
--- a/engines/illusions/resources/soundresource.cpp
+++ b/engines/illusions/resources/soundresource.cpp
@@ -73,8 +73,9 @@ void SoundGroupResource::load(byte *data, uint32 dataSize) {
debug(1, "_soundEffectsCount: %d; soundEffectsOffs: %08X", _soundEffectsCount, soundEffectsOffs);
_soundEffects = new SoundEffect[_soundEffectsCount];
stream.seek(soundEffectsOffs);
- for (uint i = 0; i < _soundEffectsCount; ++i)
+ for (uint i = 0; i < _soundEffectsCount; ++i) {
_soundEffects[i].load(stream);
+ }
}
diff --git a/engines/illusions/resources/talkresource.cpp b/engines/illusions/resources/talkresource.cpp
index a75c3700f2..4b2f67897d 100644
--- a/engines/illusions/resources/talkresource.cpp
+++ b/engines/illusions/resources/talkresource.cpp
@@ -142,16 +142,18 @@ void TalkInstanceList::removeTalkInstance(TalkInstance *talkInstance) {
}
TalkInstance *TalkInstanceList::findTalkItem(uint32 talkId) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_talkId == talkId)
return (*it);
+ }
return 0;
}
TalkInstance *TalkInstanceList::findTalkItemBySceneId(uint32 sceneId) {
- for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it) {
if ((*it)->_sceneId == sceneId)
return (*it);
+ }
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-15 14:06:05 +0000