From 732ee11da1a539fdf68074c2e748d84873728a83 Mon Sep 17 00:00:00 2001
From: Gaerzi <gaerzi@gmail.com>
Date: Sun, 23 Feb 2014 23:07:10 +0100
Subject: [PATCH] Some DOSBox Raw OPL v2 indices were off by one.

This caused access violation errors on perfectly fine DRO files. For
reference, scoredata[20] is the hardware type (OPL2, dual OPL2, or
OPL3).
---
 src/oplsynth/opl_mus_player.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/oplsynth/opl_mus_player.cpp b/src/oplsynth/opl_mus_player.cpp
index 335e6d66e1..43a129b149 100644
--- a/src/oplsynth/opl_mus_player.cpp
+++ b/src/oplsynth/opl_mus_player.cpp
@@ -104,16 +104,19 @@ fail:		delete[] scoredata;
 		}
 		else if (((DWORD *)scoredata)[2] == MAKE_ID(2,0,0,0))
 		{
-			if (scoredata[20] != 0)
-			{
-				Printf("Unsupported DOSBox Raw OPL format %d\n", scoredata[20]);
-				goto fail;
-			}
+			bool okay = true;
 			if (scoredata[21] != 0)
 			{
-				Printf("Unsupported DOSBox Raw OPL compression %d\n", scoredata[21]);
-				goto fail;
+				Printf("Unsupported DOSBox Raw OPL format %d\n", scoredata[20]);
+				okay = false;
 			}
+			if (scoredata[22] != 0)
+			{
+				Printf("Unsupported DOSBox Raw OPL compression %d\n", scoredata[21]);
+				okay = false;
+			}
+			if (!okay)
+				goto fail;
 			RawPlayer = DosBox2;
 			SamplesPerTick = OPL_SAMPLE_RATE / 1000;
 			int headersize = 0x1A + scoredata[0x19];