libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

KYRA: Get rid of Sound's voiceFileIsPresent in favor of isVoicePresent.

Browse Source
This commit is contained in:
Johannes Schickel 2011-10-29 00:43:52 +02:00
parent 17883b9137
commit 951cb8ea71
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/kyra/kyra_hof.cpp
View File

@ -1473,7 +1473,7 @@ void KyraEngine_HoF::snd_playVoiceFile(int id) {
char vocFile[9];
assert(id >= 0 && id <= 9999999);
sprintf(vocFile, "%07d", id);
if (_sound->voiceFileIsPresent(vocFile)) {
if (_sound->isVoicePresent(vocFile)) {
snd_stopVoice();
while (!_sound->voicePlay(vocFile, &_speechHandle)) {

2
engines/kyra/sequences_lol.cpp
View File

@ -788,7 +788,7 @@ void HistoryPlayer::play() {
for (; voiceFilename[3] <= '9' && !_vm->shouldQuit() && !_vm->skipFlag(); ++voiceFilename[3], voiceFilename[4] = 'a') {
while (!_vm->shouldQuit() && !_vm->skipFlag()) {
if (!sound->voiceFileIsPresent(voiceFilename))
if (!sound->isVoicePresent(voiceFilename))
break;
if (data[part * 15] == voiceFilename[3] && data[part * 15 + 1] == voiceFilename[4]) {

11
engines/kyra/sound.cpp
View File

@ -59,17 +59,6 @@ bool Sound::isPlaying() const {
return false;
}
bool Sound::voiceFileIsPresent(const char *file) const {
for (int i = 0; _supportedCodecs[i].fileext; ++i) {
Common::String f = file;
f += _supportedCodecs[i].fileext;
if (_vm->resource()->getFileSize(f.c_str()) > 0)
return true;
}
return false;
}
bool Sound::isVoicePresent(const char *file) const {
char filenamebuffer[25];

2
engines/kyra/sound.h
View File

@ -163,8 +163,6 @@ public:
void enableSFX(bool enable) { _sfxEnabled = enable; }
bool sfxEnabled() const { return _sfxEnabled; }
virtual bool voiceFileIsPresent(const char *file) const;
/**
* Checks whether a voice file with the given name is present
*