thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed warnings.

Browse source 
svn-id: r18607
This commit is contained in:
Torbjörn Andersson 2005-07-31 16:51:14 +00:00
parent f69544ebd2
commit c13aed09fc
4 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
saga/ihnm_introproc.cpp
View file

@ -80,10 +80,10 @@ SceneDescription IHNM_IntroMovie4Desc = {
}; };
LoadSceneParams IHNM_IntroList[] = { LoadSceneParams IHNM_IntroList[] = {
{0, kLoadByDescription, &IHNM_IntroMovie1Desc, Scene::SC_IHNMIntroMovieProc1, false, kTransitionNoFade, 0}, {0, kLoadByDescription, &IHNM_IntroMovie1Desc, Scene::SC_IHNMIntroMovieProc1, false, kTransitionNoFade, 0, false},
{0, kLoadByDescription, &IHNM_IntroMovie2Desc, Scene::SC_IHNMIntroMovieProc2, false, kTransitionNoFade, 0}, {0, kLoadByDescription, &IHNM_IntroMovie2Desc, Scene::SC_IHNMIntroMovieProc2, false, kTransitionNoFade, 0, false},
{0, kLoadByDescription, &IHNM_IntroMovie3Desc, Scene::SC_IHNMIntroMovieProc3, false, kTransitionNoFade, 0}, {0, kLoadByDescription, &IHNM_IntroMovie3Desc, Scene::SC_IHNMIntroMovieProc3, false, kTransitionNoFade, 0, false},
{0, kLoadByDescription, &IHNM_IntroMovie4Desc, Scene::SC_IHNMHateProc, false, kTransitionNoFade, 0} {0, kLoadByDescription, &IHNM_IntroMovie4Desc, Scene::SC_IHNMHateProc, false, kTransitionNoFade, 0, false}
}; };
int Scene::IHNMStartProc() { int Scene::IHNMStartProc() {

18
saga/ite_introproc.cpp
View file

@ -45,15 +45,15 @@ using Common::EN_USA;
using Common::DE_DEU; using Common::DE_DEU;
LoadSceneParams ITE_IntroList[] = { LoadSceneParams ITE_IntroList[] = {
{RID_ITE_INTRO_ANIM_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroAnimProc, 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}, {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}, {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}, {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}, {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}, {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}, {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}, {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} {RID_ITE_FAIRETENT_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFaireTentProc, false, kTransitionNoFade, 0, false}
}; };
int Scene::ITEStartProc() { int Scene::ITEStartProc() {

5
saga/scene.cpp
View file

@ -113,7 +113,7 @@ SAGA_UNKNOWN,
SAGA_PALETTE SAGA_PALETTE
}; };
char *SAGAResourceTypesString[] = { const char *SAGAResourceTypesString[] = {
"SAGA_UNKNOWN", "SAGA_UNKNOWN",
"SAGA_ACTOR", "SAGA_ACTOR",
"SAGA_OBJECT", "SAGA_OBJECT",
@ -134,21 +134,18 @@ char *SAGAResourceTypesString[] = {
"SAGA_PALETTE" "SAGA_PALETTE"
}; };
Scene::Scene(SagaEngine *vm) : _vm(vm) { Scene::Scene(SagaEngine *vm) : _vm(vm) {
byte *sceneLUTPointer; byte *sceneLUTPointer;
size_t sceneLUTLength; size_t sceneLUTLength;
uint32 resourceId; uint32 resourceId;
int i; int i;
// Load scene module resource context // Load scene module resource context
_sceneContext = _vm->_resource->getContext(GAME_RESOURCEFILE); _sceneContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
if (_sceneContext == NULL) { if (_sceneContext == NULL) {
error("Scene::Scene() scene context not found"); error("Scene::Scene() scene context not found");
} }
// Load scene lookup table // Load scene lookup table
resourceId = _vm->_resource->convertResourceId(_vm->getResourceDescription()->sceneLUTResourceId); resourceId = _vm->_resource->convertResourceId(_vm->getResourceDescription()->sceneLUTResourceId);
debug(3, "Loading scene LUT from resource %i", resourceId); debug(3, "Loading scene LUT from resource %i", resourceId);

3
saga/sndres.cpp
View file

@ -104,7 +104,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
size_t voxSize; size_t voxSize;
const GameSoundInfo *soundInfo; const GameSoundInfo *soundInfo;
if (resourceId == (int32)-1) { if (resourceId == (uint32)-1) {
return false; return false;
} }
@ -211,7 +211,6 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
} }
int SndRes::getVoiceLength(uint32 resourceId) { int SndRes::getVoiceLength(uint32 resourceId) {
bool voiceFile = false;
double msDouble; double msDouble;
SoundBuffer buffer; SoundBuffer buffer;