diff options
| author | Paweł Kołodziejski | 2005-01-27 16:48:30 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2005-01-27 16:48:30 +0000 |
| commit | 46c2a49e86c35edade619fe1214fa3565ce42080 (patch) | |
| tree | 811e71fdf99d99a87b5fbb4780be3d9ffce23d09 /scumm | |
| parent | 79c3049c1c95732e579aef071a8d68cac4ca19cb (diff) | |
| download | scummvm-rg350-46c2a49e86c35edade619fe1214fa3565ce42080.tar.gz scummvm-rg350-46c2a49e86c35edade619fe1214fa3565ce42080.tar.bz2 scummvm-rg350-46c2a49e86c35edade619fe1214fa3565ce42080.zip | |
fix for shadowed variable
svn-id: r16646
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi/dimuse_sndmgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp index f7b8016daf..cd91ed4c85 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -565,10 +565,10 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b char fileName[24]; sprintf(fileName, "%s_reg%03d.ogg", soundHandle->name, region); if (scumm_stricmp(fileName, soundHandle->lastFileName) != 0) { - int32 offs = 0, size = 0; - File *oggFile = soundHandle->bundle->getFile(fileName, offs, size); + int32 offs = 0, len = 0; + File *oggFile = soundHandle->bundle->getFile(fileName, offs, len); if (!soundHandle->compressedStream) { - soundHandle->compressedStream = makeVorbisStream(oggFile, size); + soundHandle->compressedStream = makeVorbisStream(oggFile, len); assert(soundHandle->compressedStream); assert(soundHandle->compressedStream->getRate() == 22050); assert(soundHandle->compressedStream->isStereo()); |