aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2011-12-29 00:00:44 +0100
committerMax Horn2011-12-29 00:00:44 +0100
commit93ee179641122d47cda3483a85e39b3256f5ce92 (patch)
tree6d12c0ccf23d3972d38f62146aef868f734e03d9
parent36778c8221e7a9994db8daf9ca5f90529f09d2d0 (diff)
downloadscummvm-rg350-93ee179641122d47cda3483a85e39b3256f5ce92.tar.gz
scummvm-rg350-93ee179641122d47cda3483a85e39b3256f5ce92.tar.bz2
scummvm-rg350-93ee179641122d47cda3483a85e39b3256f5ce92.zip
DREAMWEB: Minor cleanup
-rw-r--r--engines/dreamweb/stubs.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4f18136dfc..3602558b8b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2977,7 +2977,7 @@ void DreamWebEngine::clearBuffers() {
}
void DreamWebEngine::clearChanges() {
- memset(_listOfChanges, 0xFF, 4*kNumChanges);
+ memset(_listOfChanges, 0xFF, sizeof(_listOfChanges));
setupInitialReelRoutines();
@@ -2988,13 +2988,14 @@ void DreamWebEngine::clearChanges() {
memset(_exFrames._frames, 0xFF, kFrameBlocksize);
memset(_exFrames._data, 0xFF, kExframeslen);
- memset(_exData, 0xFF, sizeof(DynObject) * kNumexobjects);
+ memset(_exData, 0xFF, sizeof(_exData));
memset(_exText._offsetsLE, 0xFF, 2*(kNumexobjects+2));
memset(_exText._text, 0xFF, kExtextlen);
- const uint8 initialRoomsCanGo[] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ const uint8 initialRoomsCanGo[16] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- memcpy(_roomsCanGo, initialRoomsCanGo, 16);
+ assert(sizeof(_roomsCanGo) == sizeof(initialRoomsCanGo));
+ memcpy(_roomsCanGo, initialRoomsCanGo, sizeof(initialRoomsCanGo));
}
void DreamWebEngine::setupInitialVars() {