Allow incontinuous FFFF instructions

rixplay.cpp

@@ -425,11 +425,13 @@ RIX_Init(
 				new CDBemuopl(gpGlobals->iOPLSampleRate, true, false),
 				true, gpGlobals->iOPLSampleRate, gpGlobals->dSurroundOPLOffset);
 			break;
+#if PAL_HAS_MAME
 		case OPL_MAME:
 			pRixPlayer->opl = new CSurroundopl(
 				new CEmuopl(gpGlobals->iOPLSampleRate, true, false),
 				new CEmuopl(gpGlobals->iOPLSampleRate, true, false),
 				true, gpGlobals->iOPLSampleRate, gpGlobals->dSurroundOPLOffset);
+#endif
 			break;
 		}
 	}
@@ -443,9 +445,11 @@ RIX_Init(
 		case OPL_DOSBOX:
 			pRixPlayer->opl = new CDBemuopl(gpGlobals->iOPLSampleRate, true, gpGlobals->iAudioChannels == 2);
 			break;
+#if PAL_HAS_MAME
 		case OPL_MAME:
 			pRixPlayer->opl = new CEmuopl(gpGlobals->iOPLSampleRate, true, gpGlobals->iAudioChannels == 2);
 			break;
+#endif
 		}
 	}
 

text.c

@@ -206,8 +206,7 @@ PAL_ReadMessageFile(
 				if (*buffer && *buffer != '#')
 				{
 					if (strncmp(buffer, "[BEGIN MESSAGE]", 15) == 0 &&
-						sscanf(buffer + 15, "%d", &sid) == 1 &&
-						sid == eid + 1)
+						sscanf(buffer + 15, "%d", &sid) == 1 && sid > eid)
 					{
 						state = ST_DIALOG;
 						//