libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Silenced GCC warnings.

Browse Source 
svn-id: r46258
This commit is contained in:
Torbjörn Andersson 2009-12-04 19:00:40 +00:00
parent 0db75cd812
commit 01e12310ae
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
engines/saga/resource.cpp
View File

@ -236,19 +236,19 @@ bool Resource::createContexts() {
//// Detect and add SFX files ////////////////////////////////////////////////
SoundFileInfo sfxFiles[] = {
{ GID_ITE, "sounds.rsc", false },
{ GID_ITE, "sounds.cmp", true },
{ GID_ITE, "soundsd.rsc", false },
{ GID_ITE, "soundsd.cmp", true },
{ GID_ITE, "sounds.rsc", false, 0 },
{ GID_ITE, "sounds.cmp", true, 0 },
{ GID_ITE, "soundsd.rsc", false, 0 },
{ GID_ITE, "soundsd.cmp", true, 0 },
#ifdef ENABLE_IHNM
{ GID_IHNM, "sfx.res", false },
{ GID_IHNM, "sfx.cmp", true },
{ GID_IHNM, "sfx.res", false, 0 },
{ GID_IHNM, "sfx.cmp", true, 0 },
#endif
#ifdef ENABLE_SAGA2
{ GID_FTA2, "ftasound.hrs", false },
{ GID_DINO, "dinosnd.hrs", false },
{ GID_FTA2, "ftasound.hrs", false, 0 },
{ GID_DINO, "dinosnd.hrs", false, 0 },
#endif
{ -1, NULL, false }
{ -1, "", false, 0 }
};
_soundFileName[0] = 0;
@ -283,7 +283,7 @@ bool Resource::createContexts() {
#ifdef ENABLE_SAGA2
{ GID_FTA2, "ftavoice.hrs", false , 0},
#endif
{ -1, NULL, false , 0}
{ -1, "", false , 0}
};
// Detect and add voice files
@ -329,11 +329,11 @@ bool Resource::createContexts() {
//// Detect and add music files /////////////////////////////////////////
SoundFileInfo musicFiles[] = {
{ GID_ITE, "music.rsc", false },
{ GID_ITE, "music.cmp", true },
{ GID_ITE, "musicd.rsc", false },
{ GID_ITE, "musicd.cmp", true },
{ -1, NULL, false }
{ GID_ITE, "music.rsc", false, 0 },
{ GID_ITE, "music.cmp", true, 0 },
{ GID_ITE, "musicd.rsc", false, 0 },
{ GID_ITE, "musicd.cmp", true, 0 },
{ -1, "", false , 0}
};
// Check for digital music in ITE

3
engines/saga/resource.h
View File

@ -107,6 +107,9 @@ public:
_fileSize(0) {
}
virtual ~ResourceContext() {
}
bool isCompressed() const {
return _isCompressed;
}