diff options
| author | Torbjörn Andersson | 2009-12-04 19:00:40 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2009-12-04 19:00:40 +0000 |
| commit | 01e12310ae134f429c9ba72fd776af6ccd654a04 (patch) | |
| tree | 516b923bc0e226fd7c48d897761902b11f9efa34 /engines | |
| parent | 0db75cd812d5d805378b58ed860cdb2f49478775 (diff) | |
| download | scummvm-rg350-01e12310ae134f429c9ba72fd776af6ccd654a04.tar.gz scummvm-rg350-01e12310ae134f429c9ba72fd776af6ccd654a04.tar.bz2 scummvm-rg350-01e12310ae134f429c9ba72fd776af6ccd654a04.zip | |
Silenced GCC warnings.
svn-id: r46258
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/saga/resource.cpp | 30 | ||||
| -rw-r--r-- | engines/saga/resource.h | 3 |
2 files changed, 18 insertions, 15 deletions
diff --git a/engines/saga/resource.cpp b/engines/saga/resource.cpp index bdff209704..ff835694db 100644 --- a/engines/saga/resource.cpp +++ b/engines/saga/resource.cpp @@ -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 diff --git a/engines/saga/resource.h b/engines/saga/resource.h index 42b7a93404..611feea233 100644 --- a/engines/saga/resource.h +++ b/engines/saga/resource.h @@ -107,6 +107,9 @@ public: _fileSize(0) { } + virtual ~ResourceContext() { + } + bool isCompressed() const { return _isCompressed; } |