[Scummvm-cvs-logs] scummvm master -> 286c319719acc2bd414062d41ecc5796b248fe7e

athrxx athrxx at scummvm.org
Thu Nov 3 23:06:18 CET 2011


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:
4eab4f931f AUDIO: remove 2 superfluous lines in Kyra1/Kyra2/LoL FM-Towns/PC-98 sound driver
286c319719 KYRA: fix minor bug in LoLEngine::playCharacterScriptChat()


Commit: 4eab4f931fabe97e892c5e4fc2ee12ae34c9a3dc
    https://github.com/scummvm/scummvm/commit/4eab4f931fabe97e892c5e4fc2ee12ae34c9a3dc
Author: athrxx (athrxx at scummvm.org)
Date: 2011-11-03T15:05:03-07:00

Commit Message:
AUDIO: remove 2 superfluous lines in Kyra1/Kyra2/LoL FM-Towns/PC-98 sound driver

Changed paths:
    audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp



diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
index 05a4079..f3835c4 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
@@ -387,8 +387,6 @@ void TownsPC98_MusicChannel::reset() {
 
 	_totalLevel = 0;
 	_algorithm = 0;
-	_flags = CHS_EOT;
-	_algorithm = 0;
 
 	_block = 0;
 	_frequency = 0;


Commit: 286c319719acc2bd414062d41ecc5796b248fe7e
    https://github.com/scummvm/scummvm/commit/286c319719acc2bd414062d41ecc5796b248fe7e
Author: athrxx (athrxx at scummvm.org)
Date: 2011-11-03T15:05:04-07:00

Commit Message:
KYRA: fix minor bug in LoLEngine::playCharacterScriptChat()

Changed paths:
    engines/kyra/lol.cpp



diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 5aba264..bba21bb 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1922,8 +1922,7 @@ int LoLEngine::playCharacterScriptChat(int charId, int mode, int restorePortrait
 	stopPortraitSpeechAnim();
 
 	if (charId < 0) {
-		charId = ch = (_rnd.getRandomNumber(0x7fff) * countActiveCharacters()) / 0x8000;
-		ch = _rnd.getRandomNumber(countActiveCharacters() - 1);
+		charId = ch = _rnd.getRandomNumber(countActiveCharacters() - 1);
 	} else if (charId > 0) {
 		int i = 0;
 






More information about the Scummvm-git-logs mailing list