From a54d8e6257267f224dcab62facaea06ae5efc1da Mon Sep 17 00:00:00 2001 From: Osso Date: Thu, 6 Nov 2014 18:13:48 +0100 Subject: [PATCH] Fixed MT04990 (nw) --- src/mame/drivers/tumbleb.c | 2 -- src/mame/includes/tumbleb.h | 1 - src/mame/video/tumbleb.c | 58 ++++++++++++++++++------------------- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 68d960d04ac..4f38c91b73f 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -2026,7 +2026,6 @@ MACHINE_START_MEMBER(tumbleb_state,tumbleb) save_item(NAME(m_music_is_playing)); save_item(NAME(m_control_0)); - save_item(NAME(m_flipscreen)); save_item(NAME(m_tilebank)); } @@ -2035,7 +2034,6 @@ MACHINE_RESET_MEMBER(tumbleb_state,tumbleb) m_music_command = 0; m_music_bank = 0; m_music_is_playing = 0; - m_flipscreen = 0; m_tilebank = 0; memset(m_control_0, 0, sizeof(m_control_0)); } diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index e0b4f73c54c..702d43c7b7d 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -40,7 +40,6 @@ public: tilemap_t *m_pf2_tilemap; tilemap_t *m_pf2_alt_tilemap; UINT16 m_control_0[8]; - int m_flipscreen; UINT16 m_tilebank; /* devices */ diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index 32bb1570fec..3d287937cf9 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -304,15 +304,15 @@ UINT32 tumbleb_state::screen_update_tumblepb(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (m_flipscreen) + if (flip_screen()) offs = 1; else offs = -1; - if (m_flipscreen) + if (flip_screen()) offs2 = -3; else offs2 = -5; @@ -326,15 +326,15 @@ UINT32 tumbleb_state::screen_update_jumpkids(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (m_flipscreen) + if (flip_screen()) offs = 1; else offs = -1; - if (m_flipscreen) + if (flip_screen()) offs2 = -3; else offs2 = -5; @@ -347,15 +347,15 @@ UINT32 tumbleb_state::screen_update_semicom(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (m_flipscreen) + if (flip_screen()) offs = 1; else offs = -1; - if (m_flipscreen) + if (flip_screen()) offs2 = -3; else offs2 = -5; @@ -368,7 +368,7 @@ UINT32 tumbleb_state::screen_update_semicom_altoffsets(screen_device &screen, bi { int offsx, offsy, offsx2; - m_flipscreen = m_control_0[0] & 0x80; + flip_screen_set(m_control_0[0] & 0x80); offsx = -1; offsy = 2; @@ -383,17 +383,17 @@ UINT32 tumbleb_state::screen_update_bcstory(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* not sure of this */ - if (m_flipscreen) + if (flip_screen()) offs = 1; else offs = 8; /* not sure of this */ - if (m_flipscreen) + if (flip_screen()) offs2 = -3; else offs2 = 8; @@ -406,8 +406,8 @@ UINT32 tumbleb_state::screen_update_semibase(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); offs = -1; offs2 = -2; @@ -420,8 +420,8 @@ UINT32 tumbleb_state::screen_update_sdfight(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); offs = -1; offs2 = -5; // foreground scroll.. @@ -435,15 +435,15 @@ UINT32 tumbleb_state::screen_update_fncywld(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (m_flipscreen) + if (flip_screen()) offs = 1; else offs = -1; - if (m_flipscreen) + if (flip_screen()) offs2 = -3; else offs2 = -5; @@ -457,15 +457,15 @@ UINT32 tumbleb_state::screen_update_pangpang(screen_device &screen, bitmap_ind16 { int offs, offs2; - m_flipscreen = m_control_0[0] & 0x80; - machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + flip_screen_set(m_control_0[0] & 0x80); + machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (m_flipscreen) + if (flip_screen()) offs = 1; else offs = -1; - if (m_flipscreen) + if (flip_screen()) offs2 = -3; else offs2 = -5;