diff options
| author | athrxx | 2012-11-11 16:42:52 +0100 |
|---|---|---|
| committer | athrxx | 2012-11-11 19:14:33 +0100 |
| commit | 086dd66a654e5b08c7c15b8715c4b15e211f6727 (patch) | |
| tree | 75218d2086d29121ea64028763a6ee4b560a08a6 /engines/kyra/staticres_lol.cpp | |
| parent | 93e69aa4da0558b05fc235684355ed38eed9863d (diff) | |
| download | scummvm-rg350-086dd66a654e5b08c7c15b8715c4b15e211f6727.tar.gz scummvm-rg350-086dd66a654e5b08c7c15b8715c4b15e211f6727.tar.bz2 scummvm-rg350-086dd66a654e5b08c7c15b8715c4b15e211f6727.zip | |
KYRA: fix several GCC compile issues in previous commits
Diffstat (limited to 'engines/kyra/staticres_lol.cpp')
| -rw-r--r-- | engines/kyra/staticres_lol.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp index af32fb9ad5..b8a68ffb81 100644 --- a/engines/kyra/staticres_lol.cpp +++ b/engines/kyra/staticres_lol.cpp @@ -217,13 +217,17 @@ void LoLEngine::initStaticResource() { // assign music resource data (not required for the PC version, resource loading is implemented differently there) if (_flags.isDemo) { static const char *const file[] = { "LOREDEMO" }; - _sound->initAudioResourceInfo(kMusicIntro, &SoundResourceInfo_TownsPC98V2(file, ARRAYSIZE(file), 0, 0, 0)); + SoundResourceInfo_TownsPC98V2 resInfoDemo(file, ARRAYSIZE(file), 0, 0, 0); + _sound->initAudioResourceInfo(kMusicIntro, &resInfoDemo); } else if (_flags.platform == Common::kPlatformPC98) { static const char *const fileListIntro[] = { 0, "lore84.86", "lore82.86", 0, 0, 0, "lore83.86", "lore81.86" }; static const char *const fileListFinale[] = { 0, 0, "lore85.86", "lore86.86", "lore87.86" }; - _sound->initAudioResourceInfo(kMusicIntro, &SoundResourceInfo_TownsPC98V2(fileListIntro, ARRAYSIZE(fileListIntro), 0, 0, 0)); - _sound->initAudioResourceInfo(kMusicIngame, &SoundResourceInfo_TownsPC98V2(0, 0, "lore%02d.86", 0, 0)); - _sound->initAudioResourceInfo(kMusicFinale, &SoundResourceInfo_TownsPC98V2(fileListFinale, ARRAYSIZE(fileListFinale), 0, 0, 0)); + SoundResourceInfo_TownsPC98V2 resInfoIntro(fileListIntro, ARRAYSIZE(fileListIntro), 0, 0, 0); + SoundResourceInfo_TownsPC98V2 resInfoIngame(0, 0, "lore%02d.86", 0, 0); + SoundResourceInfo_TownsPC98V2 resInfoFinale(fileListFinale, ARRAYSIZE(fileListFinale), 0, 0, 0); + _sound->initAudioResourceInfo(kMusicIntro, &resInfoIntro); + _sound->initAudioResourceInfo(kMusicIngame, &resInfoIngame); + _sound->initAudioResourceInfo(kMusicFinale, &resInfoFinale); } if (_flags.isDemo) |