diff options
| -rw-r--r-- | saga/ihnm_introproc.cpp | 8 | ||||
| -rw-r--r-- | saga/ite_introproc.cpp | 18 | ||||
| -rw-r--r-- | saga/scene.cpp | 5 | ||||
| -rw-r--r-- | saga/sndres.cpp | 3 |
4 files changed, 15 insertions, 19 deletions
diff --git a/saga/ihnm_introproc.cpp b/saga/ihnm_introproc.cpp index 2db71de59d..49378e7b78 100644 --- a/saga/ihnm_introproc.cpp +++ b/saga/ihnm_introproc.cpp @@ -80,10 +80,10 @@ SceneDescription IHNM_IntroMovie4Desc = { }; LoadSceneParams IHNM_IntroList[] = { - {0, kLoadByDescription, &IHNM_IntroMovie1Desc, Scene::SC_IHNMIntroMovieProc1, false, kTransitionNoFade, 0}, - {0, kLoadByDescription, &IHNM_IntroMovie2Desc, Scene::SC_IHNMIntroMovieProc2, false, kTransitionNoFade, 0}, - {0, kLoadByDescription, &IHNM_IntroMovie3Desc, Scene::SC_IHNMIntroMovieProc3, false, kTransitionNoFade, 0}, - {0, kLoadByDescription, &IHNM_IntroMovie4Desc, Scene::SC_IHNMHateProc, false, kTransitionNoFade, 0} + {0, kLoadByDescription, &IHNM_IntroMovie1Desc, Scene::SC_IHNMIntroMovieProc1, false, kTransitionNoFade, 0, false}, + {0, kLoadByDescription, &IHNM_IntroMovie2Desc, Scene::SC_IHNMIntroMovieProc2, false, kTransitionNoFade, 0, false}, + {0, kLoadByDescription, &IHNM_IntroMovie3Desc, Scene::SC_IHNMIntroMovieProc3, false, kTransitionNoFade, 0, false}, + {0, kLoadByDescription, &IHNM_IntroMovie4Desc, Scene::SC_IHNMHateProc, false, kTransitionNoFade, 0, false} }; int Scene::IHNMStartProc() { diff --git a/saga/ite_introproc.cpp b/saga/ite_introproc.cpp index 4ea8c783de..46e41ac4c3 100644 --- a/saga/ite_introproc.cpp +++ b/saga/ite_introproc.cpp @@ -45,15 +45,15 @@ using Common::EN_USA; using Common::DE_DEU; LoadSceneParams ITE_IntroList[] = { - {RID_ITE_INTRO_ANIM_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroAnimProc, false, kTransitionNoFade, 0}, - {RID_ITE_CAVE_SCENE_1, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave1Proc, false, kTransitionFade, 0}, - {RID_ITE_CAVE_SCENE_2, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave2Proc, false, kTransitionNoFade, 0}, - {RID_ITE_CAVE_SCENE_3, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave3Proc, false, kTransitionNoFade, 0}, - {RID_ITE_CAVE_SCENE_4, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave4Proc, false, kTransitionNoFade, 0}, - {RID_ITE_VALLEY_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroValleyProc, false, kTransitionFade, 0}, - {RID_ITE_TREEHOUSE_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroTreeHouseProc, false, kTransitionNoFade, 0}, - {RID_ITE_FAIREPATH_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFairePathProc, false, kTransitionNoFade, 0}, - {RID_ITE_FAIRETENT_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFaireTentProc, false, kTransitionNoFade, 0} + {RID_ITE_INTRO_ANIM_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroAnimProc, false, kTransitionNoFade, 0, false}, + {RID_ITE_CAVE_SCENE_1, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave1Proc, false, kTransitionFade, 0, false}, + {RID_ITE_CAVE_SCENE_2, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave2Proc, false, kTransitionNoFade, 0, false}, + {RID_ITE_CAVE_SCENE_3, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave3Proc, false, kTransitionNoFade, 0, false}, + {RID_ITE_CAVE_SCENE_4, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave4Proc, false, kTransitionNoFade, 0, false}, + {RID_ITE_VALLEY_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroValleyProc, false, kTransitionFade, 0, false}, + {RID_ITE_TREEHOUSE_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroTreeHouseProc, false, kTransitionNoFade, 0, false}, + {RID_ITE_FAIREPATH_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFairePathProc, false, kTransitionNoFade, 0, false}, + {RID_ITE_FAIRETENT_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFaireTentProc, false, kTransitionNoFade, 0, false} }; int Scene::ITEStartProc() { diff --git a/saga/scene.cpp b/saga/scene.cpp index fc6a2bf6f8..9dc37c952d 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -113,7 +113,7 @@ SAGA_UNKNOWN, SAGA_PALETTE }; -char *SAGAResourceTypesString[] = { +const char *SAGAResourceTypesString[] = { "SAGA_UNKNOWN", "SAGA_ACTOR", "SAGA_OBJECT", @@ -134,21 +134,18 @@ char *SAGAResourceTypesString[] = { "SAGA_PALETTE" }; - Scene::Scene(SagaEngine *vm) : _vm(vm) { byte *sceneLUTPointer; size_t sceneLUTLength; uint32 resourceId; int i; - // Load scene module resource context _sceneContext = _vm->_resource->getContext(GAME_RESOURCEFILE); if (_sceneContext == NULL) { error("Scene::Scene() scene context not found"); } - // Load scene lookup table resourceId = _vm->_resource->convertResourceId(_vm->getResourceDescription()->sceneLUTResourceId); debug(3, "Loading scene LUT from resource %i", resourceId); diff --git a/saga/sndres.cpp b/saga/sndres.cpp index 7d228628ca..da79280b47 100644 --- a/saga/sndres.cpp +++ b/saga/sndres.cpp @@ -104,7 +104,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff size_t voxSize; const GameSoundInfo *soundInfo; - if (resourceId == (int32)-1) { + if (resourceId == (uint32)-1) { return false; } @@ -211,7 +211,6 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff } int SndRes::getVoiceLength(uint32 resourceId) { - bool voiceFile = false; double msDouble; SoundBuffer buffer; |