From 1f3aa1421fd32a531e5a70c01cb1ab05959fce99 Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Thu, 23 Feb 2012 19:59:34 +0000 Subject: [PATCH] Simplify CPS-2 sprite list end detection --- src/burn/drv/capcom/cps_obj.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/burn/drv/capcom/cps_obj.cpp b/src/burn/drv/capcom/cps_obj.cpp index f5af9f60f..48d87d714 100644 --- a/src/burn/drv/capcom/cps_obj.cpp +++ b/src/burn/drv/capcom/cps_obj.cpp @@ -119,10 +119,10 @@ INT32 CpsObjGet() UINT16* ps = (UINT16*)pg; if (Cps == 2) { - if (BURN_ENDIAN_SWAP_INT16(ps[1]) & 0x8000) { // end of sprite list? + if (BURN_ENDIAN_SWAP_INT16(ps[1]) & 0x8000) { // end of sprite list break; } - if (BURN_ENDIAN_SWAP_INT16(ps[0]) == 0 && BURN_ENDIAN_SWAP_INT16(ps[1]) == 0x0100 && BURN_ENDIAN_SWAP_INT16(ps[2]) == 0 && BURN_ENDIAN_SWAP_INT16(ps[3]) == 0xff00) { // Slammasters end of sprite list? + if (BURN_ENDIAN_SWAP_INT16(ps[3]) >= 0xff00) { // end of sprite list (ringdest) break; } } else {