[Scummvm-cvs-logs] SF.net SVN: scummvm: [32402] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri May 30 17:15:50 CEST 2008
Revision: 32402
http://scummvm.svn.sourceforge.net/scummvm/?rev=32402&view=rev
Author: thebluegr
Date: 2008-05-30 08:15:49 -0700 (Fri, 30 May 2008)
Log Message:
-----------
LookForFree -> soundIsActive
soundIsActive returns a boolean value now
Modified Paths:
--------------
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/talk.cpp
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-05-30 14:58:38 UTC (rev 32401)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-05-30 15:15:49 UTC (rev 32402)
@@ -2171,7 +2171,7 @@
delay(1);
if (hay_sb == 1) {
- while (LookForFree() != 0);
+ while (soundIsActive());
delete sku;
sku = NULL;
}
@@ -4122,7 +4122,7 @@
11025, Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED);
}
-int DrasculaEngine::LookForFree() {
+bool DrasculaEngine::soundIsActive() {
return _mixer->isSoundHandleActive(_soundHandle);
}
@@ -4373,7 +4373,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-05-30 14:58:38 UTC (rev 32401)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-05-30 15:15:49 UTC (rev 32402)
@@ -555,7 +555,7 @@
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);
Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp 2008-05-30 14:58:38 UTC (rev 32401)
+++ scummvm/trunk/engines/drascula/talk.cpp 2008-05-30 15:15:49 UTC (rev 32402)
@@ -86,7 +86,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -151,7 +151,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -216,7 +216,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -268,7 +268,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -330,7 +330,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -399,7 +399,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete(sku);
ctvd_terminate();
@@ -465,7 +465,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -601,7 +601,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -660,7 +660,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -727,7 +727,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -797,7 +797,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -838,7 +838,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -908,7 +908,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -939,7 +939,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -991,7 +991,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1044,7 +1044,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1097,7 +1097,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1148,7 +1148,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1203,7 +1203,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1257,7 +1257,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1313,7 +1313,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1411,7 +1411,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1456,7 +1456,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1496,7 +1496,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1549,7 +1549,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1602,7 +1602,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1){
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
@@ -1651,7 +1651,7 @@
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
- if (LookForFree() != 0)
+ if (soundIsActive())
goto bucless;
delete sku;
sku = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list