aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2015-06-13 17:41:10 +0200
committerMartin Kiewitz2015-06-13 17:41:10 +0200
commitc1102af1c32c0fca4c77980d1da9f04592ac1508 (patch)
treea2d38a24ecd6013f08b58122066e7e283c84825f /engines/sherlock/objects.cpp
parentdebe270d6f5595f5dbf50a8c7e7eeb888c247f8d (diff)
downloadscummvm-rg350-c1102af1c32c0fca4c77980d1da9f04592ac1508.tar.gz
scummvm-rg350-c1102af1c32c0fca4c77980d1da9f04592ac1508.tar.bz2
scummvm-rg350-c1102af1c32c0fca4c77980d1da9f04592ac1508.zip
SHERLOCK: 3DO: object loading: fix _use loading
fixes murder scene room crash
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a1fef8f8ec..9005235d5a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -766,17 +766,12 @@ void Object::load3DO(Common::SeekableReadStream &s) {
s.skip(2); // boundary filler
// 288 bytes
- _use[0].load3DO(s);
- s.skip(2); // Filler
- _use[1].load3DO(s);
- s.skip(2); // Filler
- _use[2].load3DO(s);
- // no filler after 3rd entry
- _use[3].load3DO(s);
- s.skip(2); // Filler
+ for (int idx = 0; idx < 4; ++idx) {
+ _use[idx].load3DO(s);
+ s.skip(2); // Filler
+ }
// 158 bytes
- s.skip(2); // Filler
_aOpen.load(s); // 2 + 12*4 bytes = 50 bytes
s.skip(2); // Boundary filler
_aClose.load(s);