aboutsummaryrefslogtreecommitdiff
path: root/saga/scene.cpp
diff options
context:
space:
mode:
authorAndrew Kurushin2005-06-20 11:46:34 +0000
committerAndrew Kurushin2005-06-20 11:46:34 +0000
commitc613eaab8898ab6403cec5a5e9f352810634baf5 (patch)
tree2c83f444c9cf8f1439fa01334a4e53cd5a16082d /saga/scene.cpp
parentea72e5c49fb4c3ab50c58e29b983cf05889e455c (diff)
downloadscummvm-rg350-c613eaab8898ab6403cec5a5e9f352810634baf5.tar.gz
scummvm-rg350-c613eaab8898ab6403cec5a5e9f352810634baf5.tar.bz2
scummvm-rg350-c613eaab8898ab6403cec5a5e9f352810634baf5.zip
fix animation bug at rats
svn-id: r18416
Diffstat (limited to 'saga/scene.cpp')
-rw-r--r--saga/scene.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp
index b313623096..778bb6873d 100644
--- a/saga/scene.cpp
+++ b/saga/scene.cpp
@@ -114,7 +114,6 @@ Scene::Scene(SagaEngine *vm) : _vm(vm), _initialized(false) {
memset(&_sceneDescription, 0, sizeof(_sceneDescription));
_resListEntries = 0;
_resList = NULL;
- _animEntries = 0;
_sceneProc = NULL;
_objectMap = new ObjectMap(_vm);
_actionMap = new ObjectMap(_vm);
@@ -831,19 +830,11 @@ int Scene::processSceneResources() {
case SAGA_ANIM_6:
case SAGA_ANIM_7:
{
- uint16 animId;
+ uint16 animId = _resList[i].res_type - SAGA_ANIM_1;
- debug(0, "Loading animation resource...");
+ debug(0, "Loading animation resource animId=%i", animId);
- animId = _vm->_anim->load(resourceData, resourceDataLength);
-
- SCENE_ANIMINFO *new_animinfo;
-
- new_animinfo = _animList.pushBack().operator->();
-
- new_animinfo->anim_handle = animId;
- new_animinfo->anim_res_number = _resList[i].res_number;
- _animEntries++;
+ _vm->_anim->load(animId, resourceData, resourceDataLength);
}
break;
case SAGA_ISO_MULTI:
@@ -949,10 +940,6 @@ void Scene::endScene() {
_sceneStrings.freeMem();
_vm->_isoMap->freeMem();
- _animList.clear();
-
- _animEntries = 0;
-
_vm->_events->clearList();
_vm->textClearList(_textList);