aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorLars Skovlund2010-12-23 14:05:16 +0000
committerLars Skovlund2010-12-23 14:05:16 +0000
commita03a3fd411aaac571413fae4f95c576845995e10 (patch)
tree8bf8fb84c29f6bedc3faaab5e9aa1f0e2c6e39b9 /engines/sci/engine
parent5b2071487f4df5adbb0c9a67d8c6077c0747d781 (diff)
downloadscummvm-rg350-a03a3fd411aaac571413fae4f95c576845995e10.tar.gz
scummvm-rg350-a03a3fd411aaac571413fae4f95c576845995e10.tar.bz2
scummvm-rg350-a03a3fd411aaac571413fae4f95c576845995e10.zip
Fix code formatting
svn-id: r55026
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/object.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp
index e28c8c6fcf..a82866aaca 100644
--- a/engines/sci/engine/object.cpp
+++ b/engines/sci/engine/object.cpp
@@ -63,16 +63,14 @@ void Object::init(byte *buf, reg_t obj_pos, bool initVariables) {
_variables.resize(READ_LE_UINT16(data + kOffsetSelectorCounter));
_baseVars = (uint16 *)(_baseObj + _variables.size() * 2);
_methodCount = READ_LE_UINT16(data + READ_LE_UINT16(data + kOffsetFunctionArea) - 2);
- for (int i = 0; i < _methodCount * 2 + 2; ++i)
- {
+ for (int i = 0; i < _methodCount * 2 + 2; ++i) {
_baseMethod.push_back(READ_SCI11ENDIAN_UINT16(data + READ_LE_UINT16(data + kOffsetFunctionArea) + i * 2));
}
} else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) {
_variables.resize(READ_SCI11ENDIAN_UINT16(data + 2));
_baseVars = (uint16 *)(buf + READ_SCI11ENDIAN_UINT16(data + 4));
_methodCount = READ_SCI11ENDIAN_UINT16(buf + READ_SCI11ENDIAN_UINT16(data + 6));
- for (int i = 0; i < _methodCount * 2 + 3; ++i)
- {
+ for (int i = 0; i < _methodCount * 2 + 3; ++i) {
_baseMethod.push_back(READ_SCI11ENDIAN_UINT16(buf + READ_SCI11ENDIAN_UINT16(data + 6) + i * 2));
}
} else if (getSciVersion() == SCI_VERSION_3) {