[Scummvm-cvs-logs] SF.net SVN: scummvm:[43754] scummvm/trunk/engines/sci/engine/vm.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Aug 26 11:36:54 CEST 2009
Revision: 43754
http://scummvm.svn.sourceforge.net/scummvm/?rev=43754&view=rev
Author: thebluegr
Date: 2009-08-26 09:36:54 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Formatting
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/vm.cpp
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2009-08-26 06:28:12 UTC (rev 43753)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2009-08-26 09:36:54 UTC (rev 43754)
@@ -1624,7 +1624,8 @@
reg_t addr;
reg.offset += objlength; // Step over the last checked object
objtype = scr->getHeap(reg.offset);
- if (!objtype) break;
+ if (!objtype)
+ break;
objlength = scr->getHeap(reg.offset + 2);
@@ -1670,6 +1671,7 @@
break;
}
} while (objtype != 0);
+
// And now a second pass to adjust objects and class pointers, and the general pointers
objlength = 0;
@@ -1679,7 +1681,9 @@
reg_t addr;
reg.offset += objlength; // Step over the last checked object
objtype = scr->getHeap(reg.offset);
- if (!objtype) break;
+ if (!objtype)
+ break;
+
objlength = scr->getHeap(reg.offset + 2);
reg.offset += 4; // Step over header
@@ -1715,7 +1719,7 @@
reg.offset -= 4; // Step back on header
- } while ((objtype != 0) && (((unsigned)reg.offset) < script->size - 2));
+ } while (objtype != 0 && reg.offset < script->size - 2);
if (relocation >= 0)
segManager->scriptRelocate(make_reg(reg.segment, relocation));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list