diff options
| -rw-r--r-- | engines/kyra/sound_adlib.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index 1509f530a3..88e0219f1b 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -2375,10 +2375,10 @@ void SoundAdlibPC::internalLoadFile(Common::String file) { if (_soundDataPtr) haltTrack(); - uint8 *file_data = 0; uint32 file_size = 0; + uint8 *fileData = 0; uint32 fileSize = 0; - file_data = _vm->resource()->fileData(file.c_str(), &file_size); - if (!file_data) { + fileData = _vm->resource()->fileData(file.c_str(), &fileSize); + if (!fileData) { warning("Couldn't find music file: '%s'", file.c_str()); return; } @@ -2389,8 +2389,8 @@ void SoundAdlibPC::internalLoadFile(Common::String file) { _driver->callback(8, int(-1)); _soundDataPtr = 0; - int soundDataSize = file_size; - uint8 *p = file_data; + int soundDataSize = fileSize; + uint8 *p = fileData; if (_v2) { memcpy(_trackEntries, p, 500); @@ -2407,9 +2407,9 @@ void SoundAdlibPC::internalLoadFile(Common::String file) { memcpy(_soundDataPtr, p, soundDataSize*sizeof(uint8)); - delete[] file_data; - file_data = p = 0; - file_size = 0; + delete[] fileData; + fileData = p = 0; + fileSize = 0; _driver->callback(4, _soundDataPtr); |