diff options
| -rw-r--r-- | engines/kyra/kyra3.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/resource.cpp | 6 | ||||
| -rw-r--r-- | engines/kyra/resource.h | 2 | ||||
| -rw-r--r-- | engines/kyra/sound.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/kyra3.cpp b/engines/kyra/kyra3.cpp index 83b71b035c..0738c1dc94 100644 --- a/engines/kyra/kyra3.cpp +++ b/engines/kyra/kyra3.cpp @@ -248,7 +248,7 @@ void KyraEngine_v3::playMenuAudioFile() { Common::File *handle = new Common::File(); uint32 temp = 0; - _res->fileHandle(_menuAudioFile, &temp, *handle); + _res->getFileHandle(_menuAudioFile, &temp, *handle); if (handle->isOpen()) { _musicSoundChannel = _soundDigital->playSound(handle, true); } else { @@ -277,7 +277,7 @@ void KyraEngine_v3::playMusicTrack(int track, int force) { Common::File *handle = new Common::File(); uint32 temp = 0; - _res->fileHandle(_soundList[track], &temp, *handle); + _res->getFileHandle(_soundList[track], &temp, *handle); if (handle->isOpen()) { _musicSoundChannel = _soundDigital->playSound(handle); } else { diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 6aa17408e8..178ea4bca3 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -96,7 +96,7 @@ bool Resource::loadPakFile(const Common::String &filename) { uint32 size = 0; Common::File handle; - if (!fileHandle(filename.c_str(), &size, handle)) { + if (!getFileHandle(filename.c_str(), &size, handle)) { warning("couldn't load file: '%s'", filename.c_str()); return false; } @@ -193,7 +193,7 @@ uint8 *Resource::fileData(const char *file, uint32 *size) { return buffer; } -bool Resource::fileHandle(const char *file, uint32 *size, Common::File &filehandle) { +bool Resource::getFileHandle(const char *file, uint32 *size, Common::File &filehandle) { filehandle.close(); if (filehandle.open(file)) @@ -235,7 +235,7 @@ uint32 Resource::getFileSize(const char *file) { bool Resource::loadFileToBuf(const char *file, void *buf, uint32 maxSize) { Common::File tempHandle; uint32 size = 0; - if (!fileHandle(file, &size, tempHandle)) + if (!getFileHandle(file, &size, tempHandle)) return false; if (size > maxSize) diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 49631c282e..20cbbdd537 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -110,7 +110,7 @@ public: // it gives back a file handle (used for the speech player) // it could be that the needed file is embedded in the returned // handle - bool fileHandle(const char *file, uint32 *size, Common::File &filehandle); + bool getFileHandle(const char *file, uint32 *size, Common::File &filehandle); bool loadFileToBuf(const char *file, void *buf, uint32 maxSize); diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index c2c85df950..1b7fcda97f 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -54,7 +54,7 @@ void Sound::voicePlay(const char *file) { strcat(filenamebuffer, _supportedCodes[i].fileext); _compressHandle.close(); - _engine->resource()->fileHandle(filenamebuffer, &fileSize, _compressHandle); + _engine->resource()->getFileHandle(filenamebuffer, &fileSize, _compressHandle); if (!_compressHandle.isOpen()) continue; |