[Scummvm-cvs-logs] scummvm master -> 0d485d282222e4b0ce407e1bce537acf5b7f5dd0

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0d485d2822 TSAGE: Loop variables are meant to be integers rather than bools


Commit: 0d485d282222e4b0ce407e1bce537acf5b7f5dd0
    https://github.com/scummvm/scummvm/commit/0d485d282222e4b0ce407e1bce537acf5b7f5dd0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-20T05:33:55-07:00

Commit Message:
TSAGE: Loop variables are meant to be integers rather than bools

Changed paths:
    engines/tsage/sound.cpp
    engines/tsage/sound.h



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 51a24a3..65c2c99 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 722e33d..5e89275 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); }