aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-06-25 21:33:01 +0200
committerWillem Jan Palenstijn2011-06-25 21:35:17 +0200
commitd21402ef3c39e8a4664e36417d8192208a21b148 (patch)
tree8b18cad71c5ad89608746cb726d5c40413e7be5b
parentbc4691a23e0ff1ff6f2452d7ad5d4cd612ad06a1 (diff)
downloadscummvm-rg350-d21402ef3c39e8a4664e36417d8192208a21b148.tar.gz
scummvm-rg350-d21402ef3c39e8a4664e36417d8192208a21b148.tar.bz2
scummvm-rg350-d21402ef3c39e8a4664e36417d8192208a21b148.zip
HUGO: Fix incorrect usage of sizeof
Thanks to salty-horse for the report. The new sizes are the ones that were replaced by sizeof in 399b59a583b.
-rw-r--r--engines/hugo/file_v1d.cpp2
-rw-r--r--engines/hugo/file_v1w.cpp2
-rw-r--r--engines/hugo/file_v2d.cpp2
-rw-r--r--engines/hugo/file_v3d.cpp4
-rw-r--r--engines/hugo/hugo.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/engines/hugo/file_v1d.cpp b/engines/hugo/file_v1d.cpp
index 9ebd9d284c..0795923536 100644
--- a/engines/hugo/file_v1d.cpp
+++ b/engines/hugo/file_v1d.cpp
@@ -62,7 +62,7 @@ void FileManager_v1d::readOverlay(const int screenNum, image_pt image, const ovl
Common::String buf = Common::String(_vm->_text->getScreenNames(screenNum)) + Common::String(ovl_ext[overlayType]);
if (!Common::File::exists(buf)) {
- memset(image, 0, sizeof(image));
+ memset(image, 0, kOvlSize);
warning("File not found: %s", buf.c_str());
return;
}
diff --git a/engines/hugo/file_v1w.cpp b/engines/hugo/file_v1w.cpp
index eb2226f18a..162019dd2e 100644
--- a/engines/hugo/file_v1w.cpp
+++ b/engines/hugo/file_v1w.cpp
@@ -80,7 +80,7 @@ void FileManager_v1w::readOverlay(const int screenNum, image_pt image, ovl_t ove
break;
}
if (i == 0) {
- memset(image, 0, sizeof(image));
+ memset(image, 0, kOvlSize);
return;
}
_sceneryArchive1.read(tmpImage, kOvlSize);
diff --git a/engines/hugo/file_v2d.cpp b/engines/hugo/file_v2d.cpp
index 2a663edcfa..7e44e756d5 100644
--- a/engines/hugo/file_v2d.cpp
+++ b/engines/hugo/file_v2d.cpp
@@ -136,7 +136,7 @@ void FileManager_v2d::readOverlay(const int screenNum, image_pt image, ovl_t ove
break;
}
if (i == 0) {
- memset(image, 0, sizeof(image));
+ memset(image, 0, kOvlSize);
return;
}
diff --git a/engines/hugo/file_v3d.cpp b/engines/hugo/file_v3d.cpp
index 7ac0ffc48a..69371bb030 100644
--- a/engines/hugo/file_v3d.cpp
+++ b/engines/hugo/file_v3d.cpp
@@ -143,7 +143,7 @@ void FileManager_v3d::readOverlay(const int screenNum, image_pt image, ovl_t ove
break;
}
if (i == 0) {
- memset(image, 0, sizeof(image));
+ memset(image, 0, kOvlSize);
return;
}
@@ -182,7 +182,7 @@ void FileManager_v3d::readOverlay(const int screenNum, image_pt image, ovl_t ove
break;
}
if (i == 0) {
- memset(image, 0, sizeof(image));
+ memset(image, 0, kOvlSize);
return;
}
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index 7b54c7701d..df8abf32eb 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -463,7 +463,7 @@ bool HugoEngine::loadHugoDat() {
if (varnt == _gameVariant) {
_numStates = numElem;
_screenStates = (byte *)malloc(sizeof(byte) * numElem);
- memset(_screenStates, 0, sizeof(_screenStates));
+ memset(_screenStates, 0, sizeof(byte) * numElem);
}
}