diff options
author | Filippos Karapetis | 2008-05-30 15:15:49 +0000 |
---|---|---|
committer | Filippos Karapetis | 2008-05-30 15:15:49 +0000 |
commit | d0174453ed0ba091a3fc5b76ed7f22c67a609e63 (patch) | |
tree | a0d1502c3b91714b8683fb67fcbf0be1948308bd | |
parent | 08eeb40ab44baa176185db23fd0e7b025a7d88cd (diff) | |
download | scummvm-rg350-d0174453ed0ba091a3fc5b76ed7f22c67a609e63.tar.gz scummvm-rg350-d0174453ed0ba091a3fc5b76ed7f22c67a609e63.tar.bz2 scummvm-rg350-d0174453ed0ba091a3fc5b76ed7f22c67a609e63.zip |
LookForFree -> soundIsActive
soundIsActive returns a boolean value now
svn-id: r32402
-rw-r--r-- | engines/drascula/drascula.cpp | 6 | ||||
-rw-r--r-- | engines/drascula/drascula.h | 2 | ||||
-rw-r--r-- | engines/drascula/talk.cpp | 54 |
3 files changed, 31 insertions, 31 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 3c7c9be46a..426e170d08 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -2171,7 +2171,7 @@ void DrasculaEngine::stopSound() { delay(1); if (hay_sb == 1) { - while (LookForFree() != 0); + while (soundIsActive()); delete sku; sku = NULL; } @@ -4122,7 +4122,7 @@ void DrasculaEngine::ctvd_init(int b) { 11025, Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED); } -int DrasculaEngine::LookForFree() { +bool DrasculaEngine::soundIsActive() { return _mixer->isSoundHandleActive(_soundHandle); } @@ -4373,7 +4373,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index c80ef82a01..8ba248addd 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -555,7 +555,7 @@ public: void setCursorTable(); void enterName(); void para_grabar(char[]); - int LookForFree(); + bool soundIsActive(); void openSSN(const char *Name, int Pause); void WaitFrameSSN(); void MixVideo(byte *OldScreen, byte *NewScreen); diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp index 98532a0941..c3f9fa2e2d 100644 --- a/engines/drascula/talk.cpp +++ b/engines/drascula/talk.cpp @@ -86,7 +86,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -151,7 +151,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -216,7 +216,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -268,7 +268,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -330,7 +330,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -399,7 +399,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete(sku); ctvd_terminate(); @@ -465,7 +465,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -601,7 +601,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -660,7 +660,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -727,7 +727,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -797,7 +797,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -838,7 +838,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -908,7 +908,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -939,7 +939,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -991,7 +991,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1044,7 +1044,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1097,7 +1097,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1148,7 +1148,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1203,7 +1203,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1257,7 +1257,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1313,7 +1313,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1411,7 +1411,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1456,7 +1456,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1496,7 +1496,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1549,7 +1549,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1602,7 +1602,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1){ - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; @@ -1651,7 +1651,7 @@ bucless: if (key != 0) ctvd_stop(); if (hay_sb == 1) { - if (LookForFree() != 0) + if (soundIsActive()) goto bucless; delete sku; sku = NULL; |