[Scummvm-cvs-logs] SF.net SVN: scummvm:[40526] scummvm/trunk/sound/softsynth/opl/opl_impl.h

[lordhoto at users.sourceforge.net]

Revision: 40526
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40526&view=rev
Author:   lordhoto
Date:     2009-05-13 17:29:48 +0000 (Wed, 13 May 2009)

Log Message:
-----------
Make g++ 4.4 happy (warning about out of bounds access).

Modified Paths:
--------------
    scummvm/trunk/sound/softsynth/opl/opl_impl.h

Modified: scummvm/trunk/sound/softsynth/opl/opl_impl.h
===================================================================
--- scummvm/trunk/sound/softsynth/opl/opl_impl.h	2009-05-13 17:00:28 UTC (rev 40525)
+++ scummvm/trunk/sound/softsynth/opl/opl_impl.h	2009-05-13 17:29:48 UTC (rev 40526)
@@ -632,7 +632,11 @@
 		int num = idx&7;
 		Bitu base = (idx-ARC_TVS_KSR_MUL)&0xff;
 		if ((num<6) && (base<22)) {
+#if defined(OPLTYPE_IS_OPL3)
 			Bitu modop = regbase2modop[second_set?(base+22):base];
+#else
+			Bitu modop = regbase2modop[base];
+#endif
 			Bitu regbase = base+second_set;
 			Bitu chanbase = second_set?(modop-18+ARC_SECONDSET):modop;
 
@@ -662,7 +666,11 @@
 		int num = idx&7;
 		Bitu base = (idx-ARC_KSL_OUTLEV)&0xff;
 		if ((num<6) && (base<22)) {
+#if defined(OPLTYPE_IS_OPL3)
 			Bitu modop = regbase2modop[second_set?(base+22):base];
+#else
+			Bitu modop = regbase2modop[base];
+#endif
 			Bitu chanbase = second_set?(modop-18+ARC_SECONDSET):modop;
 
 			// change frequency calculations of this operator as


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.