thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Use ObjectType enums in more places

Browse source
This commit is contained in:
Max Horn 2011-12-28 23:06:22 +01:00
parent dc4af2afc2
commit 9f99fb5f8a
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/dreamweb/object.cpp
View file

@ -30,7 +30,7 @@ void DreamWebEngine::showRyanPage() {
} }
void DreamWebEngine::findAllRyan() { void DreamWebEngine::findAllRyan() {
memset(_ryanInvList, 0xff, 60); memset(_ryanInvList, 0xff, sizeof(_ryanInvList));
for (size_t i = 0; i < kNumexobjects; ++i) { for (size_t i = 0; i < kNumexobjects; ++i) {
const DynObject *extra = getExAd(i); const DynObject *extra = getExAd(i);
if (extra->mapad[0] != kExObjectType) if (extra->mapad[0] != kExObjectType)
@ -683,12 +683,12 @@ void DreamWebEngine::dropObject() {
return; return;
} }
if (compare(_itemFrame, 4, "GUNA") || compare(_itemFrame, 4, "SHLD")) { if (compare(_itemFrame, kExObjectType, "GUNA") || compare(_itemFrame, kExObjectType, "SHLD")) {
cantDrop(); cantDrop();
return; return;
} }
_objectType = 4; _objectType = kExObjectType;
DynObject *object = getExAd(_itemFrame); DynObject *object = getExAd(_itemFrame);
object->mapad[0] = 0; object->mapad[0] = 0;
object->mapad[1] = ((_ryanX + 4) >> 4) + _mapX; object->mapad[1] = ((_ryanX + 4) >> 4) + _mapX;

14
engines/dreamweb/stubs.cpp
View file

@ -1185,16 +1185,16 @@ bool DreamWebEngine::checkIfEx(uint8 x, uint8 y) {
} }
const uint8 *DreamWebEngine::findObName(uint8 type, uint8 index) { const uint8 *DreamWebEngine::findObName(uint8 type, uint8 index) {
if (type == 5) { switch (type) {
uint16 i = 64 * (index & 127); case 5:
return (const uint8 *)_personText.getString(i); return (const uint8 *)_personText.getString(64 * (index & 127));
} else if (type == 4) { case kExObjectType:
return (const uint8 *)_exText.getString(index); return (const uint8 *)_exText.getString(index);
} else if (type == 2) { case kFreeObjectType:
return (const uint8 *)_freeDesc.getString(index); return (const uint8 *)_freeDesc.getString(index);
} else if (type == 1) { case kSetObjectType1:
return (const uint8 *)_setDesc.getString(index); return (const uint8 *)_setDesc.getString(index);
} else { default:
return (const uint8 *)_blockDesc.getString(index); return (const uint8 *)_blockDesc.getString(index);
} }
} }