diff options
| author | Einar Johan Trøan Sømåen | 2012-06-26 01:47:10 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-26 01:47:10 +0200 |
| commit | 1d2653e2b0dae173203dba0012e7b342df93cbb2 (patch) | |
| tree | b71d44dcd1fdb766907f55efc73b2693d85dd9fd /engines/wintermute/Ad | |
| parent | cb16242d5dfe7d8ccbb1828c0898ab1f5a92e41a (diff) | |
| download | scummvm-rg350-1d2653e2b0dae173203dba0012e7b342df93cbb2.tar.gz scummvm-rg350-1d2653e2b0dae173203dba0012e7b342df93cbb2.tar.bz2 scummvm-rg350-1d2653e2b0dae173203dba0012e7b342df93cbb2.zip | |
WINTERMUTE: Rename FuncName->funcName in the sound-classes.
Diffstat (limited to 'engines/wintermute/Ad')
| -rw-r--r-- | engines/wintermute/Ad/AdActor.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdEntity.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdGame.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdItem.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdObject.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdSentence.cpp | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index bfd344531c..b2686245a6 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -684,7 +684,7 @@ HRESULT CAdActor::update() { _sentence->update(_dir);
if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite;
- bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->IsPlaying() && !_sentence->_sound->IsPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime);
+ bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime);
if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ TimeIsUp)) {
if (TimeIsUp) {
_sentence->Finish();
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp index 9e7fb28f2a..64a9531678 100644 --- a/engines/wintermute/Ad/AdEntity.cpp +++ b/engines/wintermute/Ad/AdEntity.cpp @@ -565,7 +565,7 @@ HRESULT CAdEntity::update() { _sentence->update();
if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite;
- bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->IsPlaying() && !_sentence->_sound->IsPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime);
+ bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime);
if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ TimeIsUp)) {
if (TimeIsUp) {
_sentence->Finish();
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp index c16c1dac28..2d1a24c600 100644 --- a/engines/wintermute/Ad/AdGame.cpp +++ b/engines/wintermute/Ad/AdGame.cpp @@ -307,7 +307,7 @@ void CAdGame::FinishSentences() { for (int i = 0; i < _sentences.GetSize(); i++) {
if (_sentences[i]->CanSkip()) {
_sentences[i]->_duration = 0;
- if (_sentences[i]->_sound) _sentences[i]->_sound->Stop();
+ if (_sentences[i]->_sound) _sentences[i]->_sound->stop();
}
}
}
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp index ca001b3eb7..2885623454 100644 --- a/engines/wintermute/Ad/AdItem.cpp +++ b/engines/wintermute/Ad/AdItem.cpp @@ -357,7 +357,7 @@ HRESULT CAdItem::update() { _sentence->update();
if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite;
- bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->IsPlaying() && !_sentence->_sound->IsPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime);
+ bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime);
if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ TimeIsUp)) {
if (TimeIsUp) {
_sentence->Finish();
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp index ca6880557e..6cd37ee040 100644 --- a/engines/wintermute/Ad/AdObject.cpp +++ b/engines/wintermute/Ad/AdObject.cpp @@ -862,10 +862,10 @@ void CAdObject::Talk(const char *Text, const char *Sound, uint32 Duration, const // load sound and set duration appropriately
if (Sound) {
CBSound *snd = new CBSound(Game);
- if (snd && SUCCEEDED(snd->SetSound(Sound, SOUND_SPEECH, true))) {
+ if (snd && SUCCEEDED(snd->setSound(Sound, SOUND_SPEECH, true))) {
_sentence->SetSound(snd);
if (_sentence->_duration <= 0) {
- uint32 Length = snd->GetLength();
+ uint32 Length = snd->getLength();
if (Length != 0) _sentence->_duration = Length;
}
} else delete snd;
@@ -1009,7 +1009,7 @@ HRESULT CAdObject::updateSounds() { //////////////////////////////////////////////////////////////////////////
HRESULT CAdObject::resetSoundPan() {
if (_sentence && _sentence->_sound) {
- _sentence->_sound->SetPan(0.0f);
+ _sentence->_sound->setPan(0.0f);
}
return CBObject::resetSoundPan();
}
diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp index a753f13a67..feaeec714d 100644 --- a/engines/wintermute/Ad/AdSentence.cpp +++ b/engines/wintermute/Ad/AdSentence.cpp @@ -169,7 +169,7 @@ HRESULT CAdSentence::display() { if (!_font || !_text) return E_FAIL;
if (_sound && !_soundStarted) {
- _sound->Play();
+ _sound->play();
_soundStarted = true;
}
@@ -205,7 +205,7 @@ void CAdSentence::SetSound(CBSound *Sound) { //////////////////////////////////////////////////////////////////////////
HRESULT CAdSentence::Finish() {
- if (_sound) _sound->Stop();
+ if (_sound) _sound->stop();
return S_OK;
}
|