aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-06-20 22:33:55 +1000
committerPaul Gilbert2011-06-20 22:33:55 +1000
commit0d485d282222e4b0ce407e1bce537acf5b7f5dd0 (patch)
tree9adea6e3f5cf9c5a570f317c9122da328c964daf
parentadb40844d894cd69c4c89fbaddb130a70cab6816 (diff)
downloadscummvm-rg350-0d485d282222e4b0ce407e1bce537acf5b7f5dd0.tar.gz
scummvm-rg350-0d485d282222e4b0ce407e1bce537acf5b7f5dd0.tar.bz2
scummvm-rg350-0d485d282222e4b0ce407e1bce537acf5b7f5dd0.zip
TSAGE: Loop variables are meant to be integers rather than bools
-rw-r--r--engines/tsage/sound.cpp10
-rw-r--r--engines/tsage/sound.h12
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 51a24a3c86..65c2c990fb 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -1395,11 +1395,11 @@ Sound::Sound() {
_group = 0;
_sndResPriority = 0;
_fixedPriority = -1;
- _sndResLoop = true;
- _fixedLoop = true;
+ _sndResLoop = 1;
+ _fixedLoop = -1;
_priority = 0;
_volume = 127;
- _loop = false;
+ _loop = 0;
_pausedCount = 0;
_mutedCount = 0;
_hold = 0xff;
@@ -1660,7 +1660,7 @@ void Sound::setPri(int priority) {
_soundManager->updateSoundPri(this);
}
-void Sound::setLoop(bool flag) {
+void Sound::setLoop(int flag) {
_fixedLoop = flag;
_soundManager->updateSoundLoop(this);
}
@@ -1669,7 +1669,7 @@ int Sound::getPri() const {
return _priority;
}
-bool Sound::getLoop() {
+int Sound::getLoop() {
return _loop;
}
diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h
index 722e33d8d4..5e89275722 100644
--- a/engines/tsage/sound.h
+++ b/engines/tsage/sound.h
@@ -264,8 +264,8 @@ public:
int _group;
int _sndResPriority;
int _fixedPriority;
- bool _sndResLoop;
- bool _fixedLoop;
+ int _sndResLoop;
+ int _fixedLoop;
int _priority;
int _volume;
int _loop;
@@ -329,9 +329,9 @@ public:
void setVol(int volume);
int getVol() const;
void setPri(int priority);
- void setLoop(bool flag);
+ void setLoop(int flag);
int getPri() const;
- bool getLoop();
+ int getLoop();
void holdAt(int amount);
void release();
void orientAfterDriverChange();
@@ -384,9 +384,9 @@ public:
void setTimeIndex(uint32 timeIndex) { _sound.setTimeIndex(timeIndex); }
uint32 getTimeIndex() const { return _sound.getTimeIndex(); }
void setPri(int v) { _sound.setPri(v); }
- void setLoop(bool flag) { _sound.setLoop(flag); }
+ void setLoop(int total) { _sound.setLoop(total); }
int getPri() const { return _sound.getPri(); }
- bool getLoop() { return _sound.getLoop(); }
+ int getLoop() { return _sound.getLoop(); }
void setVol(int volume) { _sound.setVol(volume); }
int getVol() const { return _sound.getVol(); }
void holdAt(int v) { _sound.holdAt(v); }