aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-04-29 11:50:13 +0000
committerJohannes Schickel2009-04-29 11:50:13 +0000
commit9c560ed94b5089abb31ca6984702809b54a9b47a (patch)
tree5e13c604e44f2bcaa442a6e7eaf6a4369db3f8e5
parentc0cce2a52f1f7cb0548b1061fdbd1c659a0c9f87 (diff)
downloadscummvm-rg350-9c560ed94b5089abb31ca6984702809b54a9b47a.tar.gz
scummvm-rg350-9c560ed94b5089abb31ca6984702809b54a9b47a.tar.bz2
scummvm-rg350-9c560ed94b5089abb31ca6984702809b54a9b47a.zip
Cleanup.
svn-id: r40200
-rw-r--r--engines/kyra/sound_adlib.cpp16
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);