diff options
| author | Nicola Mettifogo | 2007-05-01 15:39:40 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-05-01 15:39:40 +0000 |
| commit | 008042ac2538bebfce013cb0ec4efa4a5600e4bb (patch) | |
| tree | 3c1107a6a9323641201a6ebb11960214891c3cc9 /engines/saga/scene.cpp | |
| parent | d520bdfcb8f70e8fd4448ea404d9e5fa993f23ca (diff) | |
| download | scummvm-rg350-008042ac2538bebfce013cb0ec4efa4a5600e4bb.tar.gz scummvm-rg350-008042ac2538bebfce013cb0ec4efa4a5600e4bb.tar.bz2 scummvm-rg350-008042ac2538bebfce013cb0ec4efa4a5600e4bb.zip | |
Implemented a IFF (Interchange File Format) parser and added subclasses to parse graphics (ILBM, PBM) and audio (8SVX), thus replacing old decoding routines. SAGA and Parallaction have been adjusted to work with the new code.
svn-id: r26719
Diffstat (limited to 'engines/saga/scene.cpp')
| -rw-r--r-- | engines/saga/scene.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 8311308018..bbe6b92c2b 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -45,7 +45,7 @@ #include "saga/rscfile.h" #include "saga/sagaresnames.h" -#include "graphics/ilbm.h" +#include "graphics/iff.h" #include "common/util.h" namespace Saga { @@ -594,7 +594,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { Event event; Event *q_event; static PalEntry current_pal[PAL_ENTRIES]; - + if ((_vm->getGameType() == GType_IHNM) && (loadSceneParams->chapter != NO_CHAPTER_CHANGE)) { if (loadSceneParams->loadFlag != kLoadBySceneNumber) { error("loadScene wrong usage"); @@ -680,7 +680,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { _vm->_resource->loadResource(_sceneContext, _resourceList[i].resourceId, _resourceList[i].buffer, _resourceList[i].size); - + if (_resourceList[i].size >= 6) { if (!memcmp(_resourceList[i].buffer, "DUMMY!", 6)) { _resourceList[i].invalid = true; @@ -897,7 +897,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { void Scene::loadSceneDescriptor(uint32 resourceId) { byte *sceneDescriptorData; size_t sceneDescriptorDataLength; - + memset(&_sceneDescription, 0, sizeof(_sceneDescription)); if (resourceId == 0) { @@ -970,7 +970,7 @@ void Scene::processSceneResources() { SAGAResourceTypes resType; getResourceTypes(types, typesCount); - + // Process the scene resource list for (i = 0; i < _resourceListCount; i++) { if (_resourceList[i].invalid) { |