diff options
| author | Andrew Kurushin | 2009-12-04 17:52:42 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2009-12-04 17:52:42 +0000 |
| commit | aa147a2f5af167048b3d57da558bc39a91c3a936 (patch) | |
| tree | c0d76d59a96f4b415f5186f74dfcb73c27775fc6 /engines/saga/scene.cpp | |
| parent | 4fb779dbaf85d93c776549cdc4903c5a671013a4 (diff) | |
| download | scummvm-rg350-aa147a2f5af167048b3d57da558bc39a91c3a936.tar.gz scummvm-rg350-aa147a2f5af167048b3d57da558bc39a91c3a936.tar.bz2 scummvm-rg350-aa147a2f5af167048b3d57da558bc39a91c3a936.zip | |
refactor resource module:
- struct ResourceContext => class ResourceContext
- replace "*alloc","free" with array templates
- simplify createContexts routines
svn-id: r46254
Diffstat (limited to 'engines/saga/scene.cpp')
| -rw-r--r-- | engines/saga/scene.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index f43db12d1a..5cb1890a2d 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -168,7 +168,7 @@ Scene::Scene(SagaEngine *vm) : _vm(vm) { memoryError("Scene::Scene()"); } - MemoryReadStreamEndian readS(sceneLUTPointer, sceneLUTLength, _sceneContext->isBigEndian); + MemoryReadStreamEndian readS(sceneLUTPointer, sceneLUTLength, _sceneContext->isBigEndian()); for (i = 0; i < _sceneCount; i++) { _sceneLUT[i] = readS.readUint16(); @@ -929,7 +929,7 @@ void Scene::loadSceneDescriptor(uint32 resourceId) { _vm->_resource->loadResource(_sceneContext, resourceId, sceneDescriptorData, sceneDescriptorDataLength); if (sceneDescriptorDataLength == 16) { - MemoryReadStreamEndian readS(sceneDescriptorData, sceneDescriptorDataLength, _sceneContext->isBigEndian); + MemoryReadStreamEndian readS(sceneDescriptorData, sceneDescriptorDataLength, _sceneContext->isBigEndian()); _sceneDescription.flags = readS.readSint16(); _sceneDescription.resourceListResourceId = readS.readSint16(); @@ -960,7 +960,7 @@ void Scene::loadSceneResourceList(uint32 resourceId) { _vm->_resource->loadResource(_sceneContext, resourceId, resourceListData, resourceListDataLength); if ((resourceListDataLength % SAGA_RESLIST_ENTRY_LEN) == 0) { - MemoryReadStreamEndian readS(resourceListData, resourceListDataLength, _sceneContext->isBigEndian); + MemoryReadStreamEndian readS(resourceListData, resourceListDataLength, _sceneContext->isBigEndian()); // Allocate memory for scene resource list _resourceListCount = resourceListDataLength / SAGA_RESLIST_ENTRY_LEN; @@ -1302,7 +1302,7 @@ void Scene::loadSceneEntryList(const byte* resourcePointer, size_t resourceLengt _entryList.entryListCount = resourceLength / 8; - MemoryReadStreamEndian readS(resourcePointer, resourceLength, _sceneContext->isBigEndian); + MemoryReadStreamEndian readS(resourcePointer, resourceLength, _sceneContext->isBigEndian()); if (_entryList.entryList) |