diff options
author | Andrew Kurushin | 2010-10-24 22:17:44 +0000 |
---|---|---|
committer | Andrew Kurushin | 2010-10-24 22:17:44 +0000 |
commit | 67cc1b8a84e8cbc344e87fe0f4715cae96199b69 (patch) | |
tree | fddf53a8a74288676993025c5c1ad073982db740 /engines/saga/objectmap.cpp | |
parent | 859c1c2c08c39262de6b6ba6e1169bb03d14353a (diff) | |
download | scummvm-rg350-67cc1b8a84e8cbc344e87fe0f4715cae96199b69.tar.gz scummvm-rg350-67cc1b8a84e8cbc344e87fe0f4715cae96199b69.tar.bz2 scummvm-rg350-67cc1b8a84e8cbc344e87fe0f4715cae96199b69.zip |
SAGA: replace Resource:loadResource malloc with ByteArray class
svn-id: r53779
Diffstat (limited to 'engines/saga/objectmap.cpp')
-rw-r--r-- | engines/saga/objectmap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/objectmap.cpp b/engines/saga/objectmap.cpp index a74a620ce7..4d7b78f7f6 100644 --- a/engines/saga/objectmap.cpp +++ b/engines/saga/objectmap.cpp @@ -163,22 +163,22 @@ void HitZone::draw(SagaEngine *vm, int color) { #endif // Loads an object map resource ( objects ( clickareas ( points ) ) ) -void ObjectMap::load(const byte *resourcePointer, size_t resourceLength) { +void ObjectMap::load(const ByteArray &resourceData) { uint i; if (!_hitZoneList.empty()) { error("ObjectMap::load _hitZoneList not empty"); } - if (resourceLength == 0) { + if (resourceData.empty()) { return; } - if (resourceLength < 4) { + if (resourceData.size() < 4) { error("ObjectMap::load wrong resourceLength"); } - MemoryReadStreamEndian readS(resourcePointer, resourceLength, _vm->isBigEndian()); + ByteArrayReadStreamEndian readS(resourceData, _vm->isBigEndian()); _hitZoneList.resize(readS.readUint16()); |