Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-30 01:23:07 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2434 from DavidHaywood/200617

Browse Source 
fix 06613, game sets rowscroll to be bigger than assumed size of tilemap
This commit is contained in:
hap 2017-07-03 14:23:58 +02:00 committed by GitHub
commit 8976468a5c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mame/video/deco16ic.cpp
View File

@ -724,11 +724,18 @@ static int deco16_pf_update(
if (tilemap_16x16) if (tilemap_16x16)
{ {
int numrows = rows;
// cap at tilemap size
if (numrows > tilemap_16x16->height())
numrows = tilemap_16x16->height();
tilemap_16x16->set_scroll_cols(1); tilemap_16x16->set_scroll_cols(1);
tilemap_16x16->set_scroll_rows(rows); tilemap_16x16->set_scroll_rows(numrows);
tilemap_16x16->set_scrolly(0, scrolly); tilemap_16x16->set_scrolly(0, scrolly);
for (offs = 0; offs < rows; offs++)
for (offs = 0; offs < numrows; offs++)
tilemap_16x16->set_scrollx(offs, scrollx + rowscroll_ptr[offs]); tilemap_16x16->set_scrollx(offs, scrollx + rowscroll_ptr[offs]);
} }
@ -740,6 +747,10 @@ static int deco16_pf_update(
if (!(tilemapsizes & 4)) if (!(tilemapsizes & 4))
numrows = rows >> 1; numrows = rows >> 1;
// cap at tilemap size
if (numrows > tilemap_8x8->height())
numrows = tilemap_8x8->height();
tilemap_8x8->set_scroll_cols(1); tilemap_8x8->set_scroll_cols(1);
tilemap_8x8->set_scroll_rows(numrows); tilemap_8x8->set_scroll_rows(numrows);
tilemap_8x8->set_scrolly(0, scrolly); tilemap_8x8->set_scrolly(0, scrolly);