k053936.c: fix potential out-of-bounds memory access; remove some dead code [Alex Jackson]

This commit is contained in:
Alex W. Jackson 2014-12-16 17:13:52 -05:00
parent 297c2ac817
commit 447822e40d
2 changed files with 6 additions and 37 deletions

View File

@ -496,7 +496,7 @@ INLINE void K053936GP_copyroz32clip( running_machine &machine,
if (blend > 0)
{
dst_base += dst_pitch; // draw blended
dst_ptr += dst_pitch; // draw blended
starty += incyy;
startx += incyx;
@ -539,35 +539,9 @@ INLINE void K053936GP_copyroz32clip( running_machine &machine,
}
else // draw solid
{
if (blend == 0)
{
dst_ptr += dst_pitch;
starty += incyy;
startx += incyx;
}
else
{
if ((sy & 1) ^ (blend & 1))
{
if (ty <= 1) return;
dst_ptr += dst_pitch;
cy += incyy;
cx += incyx;
}
if (ty > 1)
{
ty >>= 1;
dst_pitch <<= 1;
incyy <<= 1;
incyx <<= 1;
dst_ptr += dst_pitch;
starty = cy + incyy;
startx = cx + incyx;
}
}
dst_ptr += dst_pitch;
starty += incyy;
startx += incyx;
do {
do {

View File

@ -695,8 +695,6 @@ void konamigx_state::gx_draw_basic_extended_tilemaps_1(screen_device &screen, bi
int i = code<<1;
int j = mixerflags>>i & 3;
int k = 0;
static int parity = 0;
parity ^= 1;
int disp = m_k055555->K055555_read_register(K55_INPUT_ENABLES);
if ((disp & K55_INP_SUB1) || (rushingheroes_hack))
@ -717,7 +715,7 @@ void konamigx_state::gx_draw_basic_extended_tilemaps_1(screen_device &screen, bi
alpha = temp4 = m_k054338->set_alpha_level(temp2);
if (temp4 <= 0) return;
if (temp4 < 255) k = (j == GXMIX_BLEND_FAST) ? ~parity : 1;
if (temp4 < 255) k = 1;
}
int l = sub1flags & 0xf;
@ -745,9 +743,6 @@ void konamigx_state::gx_draw_basic_extended_tilemaps_2(screen_device &screen, bi
int temp1,temp2,temp3,temp4;
int i = code<<1;
int j = mixerflags>>i & 3;
// int k = 0;
// static int parity = 0;
// parity ^= 1;
int disp = m_k055555->K055555_read_register(K55_INPUT_ENABLES);
if (disp & K55_INP_SUB2)
@ -768,7 +763,7 @@ void konamigx_state::gx_draw_basic_extended_tilemaps_2(screen_device &screen, bi
temp4 = m_k054338->set_alpha_level(temp2);
if (temp4 <= 0) return;
//if (temp4 < 255) k = (j == GXMIX_BLEND_FAST) ? ~parity : 1;
//if (temp4 < 255) k = 1;
}
int l = sub2flags & 0xf;