aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMax Horn2010-06-28 11:21:39 +0000
committerMax Horn2010-06-28 11:21:39 +0000
commit12099176f712c65b9822a5874f705d63d82228ce (patch)
tree399be2f812cd883a886a8af4f0a5e66835a6af01 /engines/sci/engine
parent14530933919cfcfb86c0542ed2408b8e47675036 (diff)
downloadscummvm-rg350-12099176f712c65b9822a5874f705d63d82228ce.tar.gz
scummvm-rg350-12099176f712c65b9822a5874f705d63d82228ce.tar.bz2
scummvm-rg350-12099176f712c65b9822a5874f705d63d82228ce.zip
SCI: More formatting cleanup
svn-id: r50426
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/script.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 2bb405372a..b6bcbb7646 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -275,10 +275,10 @@ void Script::relocate(reg_t block) {
for (int i = 0; i < count; i++) {
pos = READ_SCI11ENDIAN_UINT16(heap + block.offset + 2 + (exportIndex * 2)) + heapOffset;
- // This occurs in SCI01/SCI1 games where usually one export value
- // is zero. It seems that in this situation, we should skip the
- // export and move to the next one, though the total count of valid
- // exports remains the same
+ // This occurs in SCI01/SCI1 games where usually one export value is
+ // zero. It seems that in this situation, we should skip the export and
+ // move to the next one, though the total count of valid exports remains
+ // the same
if (!pos) {
exportIndex++;
pos = READ_SCI11ENDIAN_UINT16(heap + block.offset + 2 + (exportIndex * 2)) + heapOffset;
@@ -286,9 +286,10 @@ void Script::relocate(reg_t block) {
error("Script::relocate(): Consecutive zero exports found");
}
- // In SCI0-SCI1, script local variables, objects and code are relocated. We only relocate
- // locals and objects here, and ignore relocation of code blocks. In SCI1.1 and newer
- // versions, only locals and objects are relocated.
+ // In SCI0-SCI1, script local variables, objects and code are relocated.
+ // We only relocate locals and objects here, and ignore relocation of
+ // code blocks. In SCI1.1 and newer versions, only locals and objects
+ // are relocated.
if (!relocateLocal(block.segment, pos)) {
// Not a local? It's probably an object or code block. If it's an object, relocate it.
const ObjMap::iterator end = _objects.end();
@@ -497,10 +498,10 @@ void Script::initialiseObjectsSci11(SegManager *segMan) {
obj->setSuperClassSelector(
segMan->getClassAddress(obj->getSuperClassSelector().offset, SCRIPT_GET_LOCK, NULL_REG));
- // If object is instance, get -propDict- from class and set it for this object
- // This is needed for ::isMemberOf() to work.
- // Example testcase - room 381 of sq4cd - if isMemberOf() doesn't work, talk-clicks on the robot will act like
- // clicking on ego
+ // If object is instance, get -propDict- from class and set it for this
+ // object. This is needed for ::isMemberOf() to work.
+ // Example testcase - room 381 of sq4cd - if isMemberOf() doesn't work,
+ // talk-clicks on the robot will act like clicking on ego
if (!obj->isClass()) {
reg_t classObject = obj->getSuperClassSelector();
Object *classObj = segMan->getObject(classObject);