diff options
| author | Andrew Kurushin | 2010-10-24 22:40:37 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2010-10-24 22:40:37 +0000 |
| commit | 599094d3a086db31a4988b27b480399beb51dafd (patch) | |
| tree | 8d9102ec7961216ed357b2dae6214c55e5dca014 /engines/saga/scene.cpp | |
| parent | 0f1ae79ac476c7871e91e4e5c01e2bc752c93777 (diff) | |
| download | scummvm-rg350-599094d3a086db31a4988b27b480399beb51dafd.tar.gz scummvm-rg350-599094d3a086db31a4988b27b480399beb51dafd.tar.bz2 scummvm-rg350-599094d3a086db31a4988b27b480399beb51dafd.zip | |
SAGA: fix SAGA_DEBUG; fix IHNM cutaway typo
svn-id: r53781
Diffstat (limited to 'engines/saga/scene.cpp')
| -rw-r--r-- | engines/saga/scene.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 6631918b4c..d40a0dbd8b 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -175,7 +175,6 @@ Scene::Scene(SagaEngine *vm) : _vm(vm) { #define DUMP_SCENES_LEVEL 10 if (DUMP_SCENES_LEVEL <= gDebugLevel) { - uint j; int backUpDebugLevel = gDebugLevel; SAGAResourceTypes *types; int typesCount; @@ -189,16 +188,16 @@ Scene::Scene(SagaEngine *vm) : _vm(vm) { loadSceneResourceList(_sceneDescription.resourceListResourceId); gDebugLevel = backUpDebugLevel; debug(DUMP_SCENES_LEVEL, "Dump Scene: number %i, descriptor resourceId %i, resourceList resourceId %i", i, _sceneLUT[i], _sceneDescription.resourceListResourceId); - debug(DUMP_SCENES_LEVEL, "\tresourceListCount %i", (int)_resourceListCount); - for (j = 0; j < _resourceListCount; j++) { - if (_resourceList[j].resourceType >= typesCount) { - error("wrong resource type %i", _resourceList[j].resourceType); + debug(DUMP_SCENES_LEVEL, "\tresourceListCount %i", (int)_resourceList.size()); + for (SceneResourceDataArray::iterator j = _resourceList.begin(); j != _resourceList.end(); ++j) { + if (j->resourceType >= typesCount) { + error("wrong resource type %i", j->resourceType); } - resType = types[_resourceList[j].resourceType]; + resType = types[j->resourceType]; - debug(DUMP_SCENES_LEVEL, "\t%s resourceId %i", SAGAResourceTypesString[resType], _resourceList[j].resourceId); + debug(DUMP_SCENES_LEVEL, "\t%s resourceId %i", SAGAResourceTypesString[resType], j->resourceId); } - free(_resourceList); + _resourceList.clear(); } } #endif |