aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb/object.cpp
diff options
context:
space:
mode:
authorMax Horn2011-12-28 23:06:22 +0100
committerMax Horn2011-12-28 23:53:54 +0100
commit9f99fb5f8a731adf9f1aa9d538029d18c78d99a8 (patch)
treed54219b447fe251f489439ef433ec84c95e79ced /engines/dreamweb/object.cpp
parentdc4af2afc2013a0ab20955440221dc55332a0063 (diff)
downloadscummvm-rg350-9f99fb5f8a731adf9f1aa9d538029d18c78d99a8.tar.gz
scummvm-rg350-9f99fb5f8a731adf9f1aa9d538029d18c78d99a8.tar.bz2
scummvm-rg350-9f99fb5f8a731adf9f1aa9d538029d18c78d99a8.zip
DREAMWEB: Use ObjectType enums in more places
Diffstat (limited to 'engines/dreamweb/object.cpp')
-rw-r--r--engines/dreamweb/object.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index bcdf2e5eb9..443366561a 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -30,7 +30,7 @@ void DreamWebEngine::showRyanPage() {
}
void DreamWebEngine::findAllRyan() {
- memset(_ryanInvList, 0xff, 60);
+ memset(_ryanInvList, 0xff, sizeof(_ryanInvList));
for (size_t i = 0; i < kNumexobjects; ++i) {
const DynObject *extra = getExAd(i);
if (extra->mapad[0] != kExObjectType)
@@ -683,12 +683,12 @@ void DreamWebEngine::dropObject() {
return;
}
- if (compare(_itemFrame, 4, "GUNA") || compare(_itemFrame, 4, "SHLD")) {
+ if (compare(_itemFrame, kExObjectType, "GUNA") || compare(_itemFrame, kExObjectType, "SHLD")) {
cantDrop();
return;
}
- _objectType = 4;
+ _objectType = kExObjectType;
DynObject *object = getExAd(_itemFrame);
object->mapad[0] = 0;
object->mapad[1] = ((_ryanX + 4) >> 4) + _mapX;