CDROM: Ignore pending setloc after read/play

stenzek · stenzek · commit f856a8ad65de · 2020-05-31T17:03:15.000+10:00
Fixes games which send a second Setloc after reading, e.g. Army Men -
Sarge's Heroes.
diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp
@@ -1496,7 +1496,7 @@ void CDROM::BeginReading(TickCount ticks_late /* = 0 */, bool after_seek /* = fa
   Log_DebugPrintf("Starting reading @ LBA %u", m_current_lba);
   ClearSectorBuffers();
 
-  if (m_setloc_pending)
+  if (!after_seek && m_setloc_pending)
   {
     BeginSeeking(true, true, false);
     return;

Original file line number	Diff line number	Diff line change
`@@ -1496,7 +1496,7 @@ void CDROM::BeginReading(TickCount ticks_late /* = 0 /, bool after_seek / = fa`
`1496`	`1496`	`Log_DebugPrintf("Starting reading @ LBA %u", m_current_lba);`
`1497`	`1497`	`ClearSectorBuffers();`
`1498`	`1498`
`1499`		`- if (m_setloc_pending)`
	`1499`	`+ if (!after_seek && m_setloc_pending)`
`1500`	`1500`	`{`
`1501`	`1501`	`BeginSeeking(true, true, false);`
`1502`	`1502`	`return;`