[Scummvm-cvs-logs] scummvm master -> c167a293ab3d3268f4632cae4e22f8a0ddc50685

[m-kiewitz]

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:
c167a293ab SHERLOCK: RT: Miles AdLib: circular phys. assign


Commit: c167a293ab3d3268f4632cae4e22f8a0ddc50685
    https://github.com/scummvm/scummvm/commit/c167a293ab3d3268f4632cae4e22f8a0ddc50685
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-26T10:38:49+02:00

Commit Message:
SHERLOCK: RT: Miles AdLib: circular phys. assign

circular physical assignment of FM-voices
- removed hardcoded value, that made it search from FM-voice 0
and replaced it with the total number of physical FM-voices
this makes it easier to understand the code
- added comment about why this is set (starting search at FM-voice 0)

Changed paths:
    engines/sherlock/tattoo/drivers/tattoo_adlib.cpp



diff --git a/engines/sherlock/tattoo/drivers/tattoo_adlib.cpp b/engines/sherlock/tattoo/drivers/tattoo_adlib.cpp
index 75530f4..86a2031 100644
--- a/engines/sherlock/tattoo/drivers/tattoo_adlib.cpp
+++ b/engines/sherlock/tattoo/drivers/tattoo_adlib.cpp
@@ -255,7 +255,8 @@ MidiDriver_Miles_AdLib::MidiDriver_Miles_AdLib(Audio::Mixer *mixer, InstrumentEn
 	// Older Miles Audio drivers did not do a circular assign for physical FM-voices
 	// Sherlock Holmes 2 used the circular assign
 	circularPhysicalAssignment = true;
-	circularPhysicalAssignmentFmVoice = 255;
+	// this way the first circular physical FM-voice search will start at FM-voice 0
+	circularPhysicalAssignmentFmVoice = SHERLOCK_MILES_ADLIB_PHYSICAL_FMVOICES_COUNT;
 
 	resetData();
 }