From 66c8936824c2a34b9a1da2d20a1cde14a8ddccbe Mon Sep 17 00:00:00 2001 From: DavidHaywood <28625134+DavidHaywood@users.noreply.github.com> Date: Sun, 2 Dec 2018 03:24:23 +0000 Subject: [PATCH] just handle this like the others until the real offset source is found (nw) --- src/mame/drivers/seta2.cpp | 8 ++------ src/mame/includes/seta2.h | 2 -- src/mame/video/seta2.cpp | 13 ++----------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index 09eb7abaeee..cf1194459fe 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -2448,9 +2448,7 @@ MACHINE_CONFIG_START(seta2_state::myangel) // video hardware MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1) - - MCFG_VIDEO_START_OVERRIDE(seta2_state,yoffset) + MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x10, 0x100-1) MACHINE_CONFIG_END @@ -2461,9 +2459,7 @@ MACHINE_CONFIG_START(seta2_state::myangel2) // video hardware MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1) - - MCFG_VIDEO_START_OVERRIDE(seta2_state,yoffset) + MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x10, 0x100-1) MACHINE_CONFIG_END diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 8f6753d847d..c90ee1c4b0c 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -93,7 +93,6 @@ protected: DECLARE_READ16_MEMBER(gundamex_eeprom_r); DECLARE_WRITE16_MEMBER(gundamex_eeprom_w); - DECLARE_VIDEO_START(yoffset); DECLARE_VIDEO_START(xoffset); DECLARE_VIDEO_START(xoffset1); @@ -141,7 +140,6 @@ protected: output_finder<11> m_lamps; int m_xoffset; - int m_yoffset; int m_keyboard_row; std::unique_ptr m_buffered_spriteram; diff --git a/src/mame/video/seta2.cpp b/src/mame/video/seta2.cpp index 842d81c200a..f61e4f006bc 100644 --- a/src/mame/video/seta2.cpp +++ b/src/mame/video/seta2.cpp @@ -325,7 +325,7 @@ void seta2_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) if (clip.max_x > cliprect.max_x) clip.max_x = cliprect.max_x; // sprite clipping region (y) - clip.min_y = ((sy + yoffs) & 0x1ff) - m_yoffset; + clip.min_y = ((sy + yoffs) & 0x1ff); clip.max_y = clip.min_y + height * 0x10 - 1; if (clip.min_y > cliprect.max_y) continue; @@ -335,7 +335,7 @@ void seta2_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) for (int realline = clip.min_y; realline <= clip.max_y; realline++) { - int sourceline = (realline - scrolly - m_yoffset) & 0x1ff; + int sourceline = (realline - scrolly) & 0x1ff; int y = sourceline >> (is_16x16 ? 4 : 3); @@ -387,7 +387,6 @@ void seta2_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) sx = (sx & 0x1ff) - (sx & 0x200); sy &= 0x1ff; - sy -= m_yoffset; int basecode = code &= ~((sizex + 1) * (sizey + 1) - 1); // see myangel, myangel2 and grdians @@ -441,7 +440,6 @@ void seta2_state::video_start() m_buffered_spriteram = std::make_unique(m_spriteram.bytes()/2); m_xoffset = 0; - m_yoffset = 0; m_realtilenumber = std::make_unique(0x80000); @@ -468,13 +466,6 @@ VIDEO_START_MEMBER(seta2_state,xoffset1) m_xoffset = 0x1; } -VIDEO_START_MEMBER(seta2_state,yoffset) -{ - video_start(); - - m_yoffset = 0x10; -} - uint32_t seta2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { // Black or pen 0?