[Scummvm-cvs-logs] scummvm master -> 88fa659ace49e417cbd6c157436ba8c4dd79cfaa

[lordhoto]

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:
2dd85c0cad KYRA: Some minor cleanup.
88fa659ace KYRA: Name another variable in the AdLib output code.


Commit: 2dd85c0cad2ebf7d92cde9b18db8adb6e4a92a2f
    https://github.com/scummvm/scummvm/commit/2dd85c0cad2ebf7d92cde9b18db8adb6e4a92a2f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-10-01T15:13:41-07:00

Commit Message:
KYRA: Some minor cleanup.

Changed paths:
    engines/kyra/sound_adlib.cpp
    engines/kyra/sound_adlib.h



diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 67dc986..6332431 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -2297,8 +2297,8 @@ void SoundAdLibPC::playTrack(uint8 track) {
 }
 
 void SoundAdLibPC::haltTrack() {
-	unk1();
-	unk2();
+	playSoundEffect(0);
+	playSoundEffect(0);
 	//_vm->_system->delayMillis(3 * 60);
 }
 
@@ -2402,8 +2402,8 @@ void SoundAdLibPC::internalLoadFile(Common::String file) {
 		return;
 	}
 
-	unk2();
-	unk1();
+	playSoundEffect(0);
+	playSoundEffect(0);
 
 	_driver->callback(8, int(-1));
 	_soundDataPtr = 0;
@@ -2435,13 +2435,4 @@ void SoundAdLibPC::internalLoadFile(Common::String file) {
 	_soundFileLoaded = file;
 }
 
-void SoundAdLibPC::unk1() {
-	playSoundEffect(0);
-	//_vm->_system->delayMillis(5 * 60);
-}
-
-void SoundAdLibPC::unk2() {
-	playSoundEffect(0);
-}
-
 } // End of namespace Kyra
diff --git a/engines/kyra/sound_adlib.h b/engines/kyra/sound_adlib.h
index 962df40..c09fec9 100644
--- a/engines/kyra/sound_adlib.h
+++ b/engines/kyra/sound_adlib.h
@@ -83,9 +83,6 @@ private:
 
 	void play(uint8 track);
 
-	void unk1();
-	void unk2();
-
 	AdLibDriver *_driver;
 
 	bool _v2;


Commit: 88fa659ace49e417cbd6c157436ba8c4dd79cfaa
    https://github.com/scummvm/scummvm/commit/88fa659ace49e417cbd6c157436ba8c4dd79cfaa
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-10-01T15:13:41-07:00

Commit Message:
KYRA: Name another variable in the AdLib output code.

Changed paths:
    engines/kyra/sound_adlib.cpp



diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 6332431..38682c1 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -318,7 +318,6 @@ private:
 	//
 	// _unkValue1      - Unknown. Used for updating _unkValue2
 	// _unkValue2      - Unknown. Used for updating _unkValue4
-	// _unkValue3      - Unknown. Used for updating _unkValue2
 	// _unkValue4      - Unknown. Used for updating _unkValue5
 	// _unkValue5      - Unknown. Used for controlling updateCallback24().
 	// _unkValue6      - Unknown. Rhythm section volume?
@@ -357,7 +356,7 @@ private:
 
 	uint8 _unkValue1;
 	uint8 _unkValue2;
-	uint8 _unkValue3;
+	uint8 _callbackTimer;
 	uint8 _unkValue4;
 	uint8 _unkValue5;
 	uint8 _unkValue6;
@@ -434,7 +433,7 @@ AdLibDriver::AdLibDriver(Audio::Mixer *mixer, bool v2) {
 	_tempo = 0;
 	_soundTrigger = 0;
 
-	_unkValue3 = 0xFF;
+	_callbackTimer = 0xFF;
 	_unkValue1 = _unkValue2 = _unkValue4 = _unkValue5 = 0;
 	_unkValue6 = _unkValue7 = _unkValue8 = _unkValue9 = _unkValue10 = 0;
 	_unkValue11 = _unkValue12 = _unkValue13 = _unkValue14 = _unkValue15 =
@@ -635,9 +634,9 @@ void AdLibDriver::callback() {
 	setupPrograms();
 	executePrograms();
 
-	uint8 temp = _unkValue3;
-	_unkValue3 += _tempo;
-	if (_unkValue3 < temp) {
+	uint8 temp = _callbackTimer;
+	_callbackTimer += _tempo;
+	if (_callbackTimer < temp) {
 		if (!(--_unkValue2)) {
 			_unkValue2 = _unkValue1;
 			++_unkValue4;
@@ -1470,7 +1469,7 @@ int AdLibDriver::update_setPriority(uint8 *&dataptr, Channel &channel, uint8 val
 int AdLibDriver::updateCallback23(uint8 *&dataptr, Channel &channel, uint8 value) {
 	value >>= 1;
 	_unkValue1 = _unkValue2 = value;
-	_unkValue3 = 0xFF;
+	_callbackTimer = 0xFF;
 	_unkValue4 = _unkValue5 = 0;
 	return 0;
 }