aboutsummaryrefslogtreecommitdiff
path: root/engines/illusions/duckman
diff options
context:
space:
mode:
authorEric Fry2018-06-28 22:20:36 +1000
committerEugene Sandulenko2018-07-20 06:43:33 +0000
commitfee1f3d8cb065182322bc80aba39a66a1b4b0cfb (patch)
treef152dd04ca1313d799d6edcc1d20ba5f789b52e0 /engines/illusions/duckman
parent608f2f1f1ae524fd6ffc656dfcef3985988adaa9 (diff)
downloadscummvm-rg350-fee1f3d8cb065182322bc80aba39a66a1b4b0cfb.tar.gz
scummvm-rg350-fee1f3d8cb065182322bc80aba39a66a1b4b0cfb.tar.bz2
scummvm-rg350-fee1f3d8cb065182322bc80aba39a66a1b4b0cfb.zip
ILLUSIONS: always use braces for loops
Diffstat (limited to 'engines/illusions/duckman')
-rw-r--r--engines/illusions/duckman/duckman_inventory.cpp9
-rw-r--r--engines/illusions/duckman/illusions_duckman.cpp3
-rw-r--r--engines/illusions/duckman/menusystem_duckman.cpp6
-rw-r--r--engines/illusions/duckman/propertytimers.cpp3
-rw-r--r--engines/illusions/duckman/scriptopcodes_duckman.cpp6
5 files changed, 18 insertions, 9 deletions
diff --git a/engines/illusions/duckman/duckman_inventory.cpp b/engines/illusions/duckman/duckman_inventory.cpp
index 1f863b5869..e1ab1ffbd7 100644
--- a/engines/illusions/duckman/duckman_inventory.cpp
+++ b/engines/illusions/duckman/duckman_inventory.cpp
@@ -112,9 +112,10 @@ void DuckmanInventory::addInventoryItem(uint32 objectId) {
}
void DuckmanInventory::clearInventorySlot(uint32 objectId) {
- for (uint i = 0; i < _inventorySlots.size(); ++i)
+ for (uint i = 0; i < _inventorySlots.size(); ++i) {
if (_inventorySlots[i]._objectId == objectId)
_inventorySlots[i]._objectId = 0;
+ }
}
void DuckmanInventory::putBackInventoryItem() {
@@ -140,16 +141,18 @@ void DuckmanInventory::putBackInventoryItem() {
}
DMInventorySlot *DuckmanInventory::findInventorySlot(uint32 objectId) {
- for (uint i = 0; i < _inventorySlots.size(); ++i)
+ for (uint i = 0; i < _inventorySlots.size(); ++i) {
if (_inventorySlots[i]._objectId == objectId)
return &_inventorySlots[i];
+ }
return 0;
}
DMInventoryItem *DuckmanInventory::findInventoryItem(uint32 objectId) {
- for (uint i = 0; i < _inventoryItems.size(); ++i)
+ for (uint i = 0; i < _inventoryItems.size(); ++i) {
if (_inventoryItems[i]._objectId == objectId)
return &_inventoryItems[i];
+ }
return 0;
}
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index e08d1b0096..56c997dd1f 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -881,8 +881,9 @@ bool IllusionsEngine_Duckman::loadScene(uint32 sceneId) {
uint resourcesCount;
uint32 *resources;
sceneInfo->getResources(resourcesCount, resources);
- for (uint i = 0; i < resourcesCount; ++i)
+ for (uint i = 0; i < resourcesCount; ++i) {
_resSys->loadResource(resources[i], sceneId, 0);
+ }
return true;
}
diff --git a/engines/illusions/duckman/menusystem_duckman.cpp b/engines/illusions/duckman/menusystem_duckman.cpp
index 3a10ec3f0a..367eb28312 100644
--- a/engines/illusions/duckman/menusystem_duckman.cpp
+++ b/engines/illusions/duckman/menusystem_duckman.cpp
@@ -56,13 +56,15 @@ void DuckmanMenuSystem::runMenu(MenuChoiceOffsets menuChoiceOffsets, int16 *menu
}
void DuckmanMenuSystem::clearMenus() {
- for (int i = 0; i < kDuckmanLastMenuIndex; ++i)
+ for (int i = 0; i < kDuckmanLastMenuIndex; ++i) {
_menus[i] = 0;
+ }
}
void DuckmanMenuSystem::freeMenus() {
- for (int i = 0; i < kDuckmanLastMenuIndex; ++i)
+ for (int i = 0; i < kDuckmanLastMenuIndex; ++i) {
delete _menus[i];
+ }
}
BaseMenu *DuckmanMenuSystem::getMenuById(int menuId) {
diff --git a/engines/illusions/duckman/propertytimers.cpp b/engines/illusions/duckman/propertytimers.cpp
index cdfdd927a3..c74b9dbc24 100644
--- a/engines/illusions/duckman/propertytimers.cpp
+++ b/engines/illusions/duckman/propertytimers.cpp
@@ -73,11 +73,12 @@ void PropertyTimers::removePropertyTimer(uint32 propertyId) {
}
bool PropertyTimers::findPropertyTimer(uint32 propertyId, PropertyTimer *&propertyTimer) {
- for (uint i = 0; i < kPropertyTimersCount; ++i)
+ for (uint i = 0; i < kPropertyTimersCount; ++i) {
if (_propertyTimers[i]._propertyId == propertyId) {
propertyTimer = &_propertyTimers[i];
return true;
}
+ }
return false;
}
diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp
index 6b76a65686..e6f286ca9c 100644
--- a/engines/illusions/duckman/scriptopcodes_duckman.cpp
+++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp
@@ -57,8 +57,9 @@ typedef Common::Functor2Mem<ScriptThread*, OpCall&, void, ScriptOpcodes_Duckman>
void ScriptOpcodes_Duckman::initOpcodes() {
// First clear everything
- for (uint i = 0; i < 256; ++i)
+ for (uint i = 0; i < 256; ++i) {
_opcodes[i] = 0;
+ }
// Register opcodes
OPCODE(1, opNop);
OPCODE(2, opSuspend);
@@ -164,8 +165,9 @@ void ScriptOpcodes_Duckman::initOpcodes() {
#undef OPCODE
void ScriptOpcodes_Duckman::freeOpcodes() {
- for (uint i = 0; i < 256; ++i)
+ for (uint i = 0; i < 256; ++i) {
delete _opcodes[i];
+ }
}
// Opcodes