Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fmtowns: honor vram line address carry bit for scroll mode (nw)

Browse Source
This commit is contained in:
cracyc 2018-02-08 16:15:43 -06:00
parent deec373973
commit 2f3cf79c2f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mame/video/fmtowns.cpp
View File

@ -1066,6 +1066,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
uint32_t scroll; uint32_t scroll;
int pixel; int pixel;
int page = 0; int page = 0;
bool sphscroll = !(m_video.towns_crtc_reg[28] & (layer ? 0x20 : 0x10));
if(m_video.towns_video_reg[0] & 0x10) if(m_video.towns_video_reg[0] & 0x10)
{ {
@ -1090,7 +1091,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
{ {
if(!(m_video.towns_video_reg[0] & 0x10)) if(!(m_video.towns_video_reg[0] & 0x10))
return; return;
if(!(m_video.towns_crtc_reg[28] & 0x10)) if(!sphscroll)
off += (m_video.towns_crtc_reg[21]) << 2; // initial offset off += (m_video.towns_crtc_reg[21]) << 2; // initial offset
else else
{ {
@ -1102,7 +1103,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
} }
else else
{ {
if(!(m_video.towns_crtc_reg[28] & 0x20)) if(!sphscroll)
off += (m_video.towns_crtc_reg[17]) << 2; // initial offset off += (m_video.towns_crtc_reg[17]) << 2; // initial offset
else else
{ {
@ -1132,7 +1133,7 @@ void towns_state::towns_crtc_draw_scan_layer_hicolour(bitmap_rgb32 &bitmap,const
| ((colour & 0x03e0) << 14); | ((colour & 0x03e0) << 14);
} }
off+=2; off+=2;
if ((off - (page * 0x20000)) % linesize == 0) if ((off - (page * 0x20000)) % linesize == 0 && sphscroll)
off -= linesize; off -= linesize;
} }
} }
@ -1147,6 +1148,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
uint32_t scroll; uint32_t scroll;
int pixel; int pixel;
int page = 0; int page = 0;
bool sphscroll = !(m_video.towns_crtc_reg[28] & 0x10);
if(m_video.towns_display_page_sel != 0) if(m_video.towns_display_page_sel != 0)
{ {
@ -1156,7 +1158,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
linesize = m_video.towns_crtc_reg[20] * 4; linesize = m_video.towns_crtc_reg[20] * 4;
if(!(m_video.towns_crtc_reg[28] & 0x20)) if(!sphscroll)
off += m_video.towns_crtc_reg[17] << 2; // initial offset off += m_video.towns_crtc_reg[17] << 2; // initial offset
else else
{ {
@ -1182,7 +1184,7 @@ void towns_state::towns_crtc_draw_scan_layer_256(bitmap_rgb32 &bitmap,const rect
off += 4; off += 4;
subpix = 0; subpix = 0;
} }
if ((off - (page * 0x20000)) % linesize == 0 && subpix == 0) if ((off - (page * 0x20000)) % linesize == 0 && subpix == 0 && sphscroll)
off -= linesize; off -= linesize;
} }
} }
@ -1198,6 +1200,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
int pixel; int pixel;
int page = 0; int page = 0;
palette_device* pal = (layer == 0) ? m_palette16_0 : m_palette16_1; palette_device* pal = (layer == 0) ? m_palette16_0 : m_palette16_1;
bool sphscroll = !(m_video.towns_crtc_reg[28] & (layer ? 0x20 : 0x10));
if(m_video.towns_display_page_sel != 0) if(m_video.towns_display_page_sel != 0)
{ {
@ -1219,7 +1222,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
{ {
if(!(m_video.towns_video_reg[0] & 0x10)) if(!(m_video.towns_video_reg[0] & 0x10))
return; return;
if(!(m_video.towns_crtc_reg[28] & 0x10)) if(!sphscroll)
off += m_video.towns_crtc_reg[21] << 2; // initial offset off += m_video.towns_crtc_reg[21] << 2; // initial offset
else else
{ {
@ -1231,7 +1234,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
} }
else else
{ {
if(!(m_video.towns_crtc_reg[28] & 0x20)) if(!sphscroll)
off += m_video.towns_crtc_reg[17] << 2; // initial offset off += m_video.towns_crtc_reg[17] << 2; // initial offset
else else
{ {
@ -1263,7 +1266,7 @@ void towns_state::towns_crtc_draw_scan_layer_16(bitmap_rgb32 &bitmap,const recta
bitmap.pix32(scanline, x+pixel) = pal->pen(colour); bitmap.pix32(scanline, x+pixel) = pal->pen(colour);
} }
off++; off++;
if ((off - (page * 0x20000)) % linesize == 0) if ((off - (page * 0x20000)) % linesize == 0 && sphscroll)
off -= linesize; off -= linesize;
} }
} }