[Scummvm-cvs-logs] scummvm master -> 85e4e2933adcb3c9472b7a7095bb7b481a973fa0

[dreammaster]

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

Summary:
a15d233dc4 DREAMWEB: Fix compilation error on MSVC
85e4e2933a TSAGE: Fix signalling an action when a song stops


Commit: a15d233dc4f83c04252442496594aa1658f6f83c
    https://github.com/scummvm/scummvm/commit/a15d233dc4f83c04252442496594aa1658f6f83c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-19T06:19:02-07:00

Commit Message:
DREAMWEB: Fix compilation error on MSVC

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 7eeeabe..e2da072 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -287,7 +287,7 @@ void DreamGenContext::out22c() {
 
 void DreamGenContext::soundstartup() {}
 void DreamGenContext::soundend() {}
-void DreamGenContext::DreamGenContext::interupttest() {}
+void DreamGenContext::interupttest() {}
 void DreamGenContext::disablesoundint() {}
 void DreamGenContext::enablesoundint() {}
 void DreamGenContext::checksoundint() {


Commit: 85e4e2933adcb3c9472b7a7095bb7b481a973fa0
    https://github.com/scummvm/scummvm/commit/85e4e2933adcb3c9472b7a7095bb7b481a973fa0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-19T06:21:02-07:00

Commit Message:
TSAGE: Fix signalling an action when a song stops

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



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 88b2c2a..1288ba9 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -1454,7 +1454,7 @@ void Sound::unPrime() {
 	stop();
 }
 
-void Sound::_prime(int soundResID, bool queueFlag) {
+void Sound::_prime(int soundResID, bool dontQueue) {
 	if (_primed)
 		unPrime();
 
@@ -1485,8 +1485,8 @@ void Sound::_prime(int soundResID, bool queueFlag) {
 		_remoteReceiver = ALLOCATE(200);
 	}
 
-	_soPrimeSound(queueFlag);
-	if (queueFlag)
+	_soPrimeSound(dontQueue);
+	if (!dontQueue)
 		_soundManager->addToSoundList(this);
 
 	_primed = true;
@@ -1675,8 +1675,8 @@ void Sound::release() {
 	_hold = -1;
 }
 
-void Sound::_soPrimeSound(bool queueFlag) {
-	if (!queueFlag) {
+void Sound::_soPrimeSound(bool dontQueue) {
+	if (!dontQueue) {
 		_priority = (_fixedPriority != -1) ? _fixedPriority : _sndResPriority;
 		_loop = !_fixedLoop ? _fixedLoop : _sndResLoop;
 		_pausedCount = 0;
diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h
index 105b2a4..8fcb1c3 100644
--- a/engines/tsage/sound.h
+++ b/engines/tsage/sound.h
@@ -247,7 +247,7 @@ public:
 
 class Sound: public EventHandler {
 private:
-	void _prime(int soundResID, bool queueFlag);
+	void _prime(int soundResID, bool dontQueue);
 	void _unPrime();
 	void orientAfterRestore();
 public:
@@ -329,7 +329,7 @@ public:
 	void orientAfterDriverChange();
 
 	// _so methods
-	void _soPrimeSound(bool queueFlag);
+	void _soPrimeSound(bool dontQueue);
 	void _soSetTimeIndex(uint timeIndex);
 	bool _soServiceTracks();
 	void _soPrimeChannelData();