[Scummvm-cvs-logs] scummvm branch-1-8 -> 85b5e413cc7c1499e2ad17980a501e6f8c672916

[sev-]

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

Summary:
833fab0d65 SHERLOCK RT: Actually clear screen instead of a useless call.
5325ae353c SCUMM HE: Safeguard division by zero
b3f30784ce AUDIO FM-TOWNS: Fix copy/paste error
85b5e413cc WINTERMUTE: Add missing parameter


Commit: 833fab0d657c6de7553c5803d87fb0400d407736
    https://github.com/scummvm/scummvm/commit/833fab0d657c6de7553c5803d87fb0400d407736
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-09T00:07:23+02:00

Commit Message:
SHERLOCK RT: Actually clear screen instead of a useless call.

Changed paths:
    engines/sherlock/tattoo/tattoo_journal.cpp



diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp
index 5368c41..cc98efd 100644
--- a/engines/sherlock/tattoo/tattoo_journal.cpp
+++ b/engines/sherlock/tattoo/tattoo_journal.cpp
@@ -66,7 +66,7 @@ void TattooJournal::show() {
 
 	// Set screen to black, and set background
 	screen._backBuffer1.blitFrom((*_journalImages)[0], Common::Point(0, 0));
-	screen.empty();
+	screen.clear();
 	screen.setPalette(palette);
 
 	if (_journal.empty()) {


Commit: 5325ae353c70b056506b0f806095acaa57273439
    https://github.com/scummvm/scummvm/commit/5325ae353c70b056506b0f806095acaa57273439
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-09T00:07:40+02:00

Commit Message:
SCUMM HE: Safeguard division by zero

Changed paths:
    engines/scumm/he/sound_he.cpp



diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index b806a9f..1b3abf9 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -474,6 +474,10 @@ void SoundHE::processSoundOpcodes(int sound, byte *codePtr, int *soundVars) {
 			if (arg == 2) {
 				val = getSoundVar(sound, val);
 			}
+			if (!val) {
+				val = 1; // Safeguard for division by zero
+				warning("Incorrect value 0 for processSoundOpcodes() kludge DIV");
+			}
 			val = getSoundVar(sound, var) / val;
 			setSoundVar(sound, var, val);
 			break;


Commit: b3f30784ce0f39045aa712ff72efa2a6e22cc3a5
    https://github.com/scummvm/scummvm/commit/b3f30784ce0f39045aa712ff72efa2a6e22cc3a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-09T00:07:40+02:00

Commit Message:
AUDIO FM-TOWNS: Fix copy/paste error

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



diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index 685ee99..d536429 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -1043,12 +1043,12 @@ void TownsPC98_FmSynth::writeReg(uint8 part, uint8 regAddress, uint8 value) {
 
 			if (value & 0x10) {
 				_timers[0].smpTillCb = _timers[0].smpPerCb;
-				_timers[0].smpTillCbRem = _timers[0].smpTillCbRem;
+				_timers[0].smpTillCbRem = _timers[0].smpPerCbRem;
 			}
 
 			if (value & 0x20) {
 				_timers[1].smpTillCb = _timers[1].smpPerCb;
-				_timers[1].smpTillCbRem = _timers[1].smpTillCbRem;
+				_timers[1].smpTillCbRem = _timers[1].smpPerCbRem;
 			}
 		} else if (l == 2) {
 			// LFO


Commit: 85b5e413cc7c1499e2ad17980a501e6f8c672916
    https://github.com/scummvm/scummvm/commit/85b5e413cc7c1499e2ad17980a501e6f8c672916
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-09T00:07:40+02:00

Commit Message:
WINTERMUTE: Add missing parameter

Changed paths:
    engines/wintermute/base/base_engine.cpp



diff --git a/engines/wintermute/base/base_engine.cpp b/engines/wintermute/base/base_engine.cpp
index 2166a3e..4ce334a 100644
--- a/engines/wintermute/base/base_engine.cpp
+++ b/engines/wintermute/base/base_engine.cpp
@@ -84,7 +84,7 @@ void BaseEngine::LOG(bool res, const char *fmt, ...) {
 	va_end(va);
 
 	if (instance()._gameRef) {
-		instance()._gameRef->LOG("%s", buff);
+		instance()._gameRef->LOG(res, "%s", buff);
 	} else {
 		debugCN(kWintermuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
 	}