Fixed MT04990 (nw)

This commit is contained in:
Osso 2014-11-06 18:13:48 +01:00
parent e0c35889d9
commit a54d8e6257
3 changed files with 29 additions and 32 deletions

View File

@ -2026,7 +2026,6 @@ MACHINE_START_MEMBER(tumbleb_state,tumbleb)
save_item(NAME(m_music_is_playing)); save_item(NAME(m_music_is_playing));
save_item(NAME(m_control_0)); save_item(NAME(m_control_0));
save_item(NAME(m_flipscreen));
save_item(NAME(m_tilebank)); save_item(NAME(m_tilebank));
} }
@ -2035,7 +2034,6 @@ MACHINE_RESET_MEMBER(tumbleb_state,tumbleb)
m_music_command = 0; m_music_command = 0;
m_music_bank = 0; m_music_bank = 0;
m_music_is_playing = 0; m_music_is_playing = 0;
m_flipscreen = 0;
m_tilebank = 0; m_tilebank = 0;
memset(m_control_0, 0, sizeof(m_control_0)); memset(m_control_0, 0, sizeof(m_control_0));
} }

View File

@ -40,7 +40,6 @@ public:
tilemap_t *m_pf2_tilemap; tilemap_t *m_pf2_tilemap;
tilemap_t *m_pf2_alt_tilemap; tilemap_t *m_pf2_alt_tilemap;
UINT16 m_control_0[8]; UINT16 m_control_0[8];
int m_flipscreen;
UINT16 m_tilebank; UINT16 m_tilebank;
/* devices */ /* devices */

View File

@ -304,15 +304,15 @@ UINT32 tumbleb_state::screen_update_tumblepb(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen) if (flip_screen())
offs = 1; offs = 1;
else else
offs = -1; offs = -1;
if (m_flipscreen) if (flip_screen())
offs2 = -3; offs2 = -3;
else else
offs2 = -5; offs2 = -5;
@ -326,15 +326,15 @@ UINT32 tumbleb_state::screen_update_jumpkids(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen) if (flip_screen())
offs = 1; offs = 1;
else else
offs = -1; offs = -1;
if (m_flipscreen) if (flip_screen())
offs2 = -3; offs2 = -3;
else else
offs2 = -5; offs2 = -5;
@ -347,15 +347,15 @@ UINT32 tumbleb_state::screen_update_semicom(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen) if (flip_screen())
offs = 1; offs = 1;
else else
offs = -1; offs = -1;
if (m_flipscreen) if (flip_screen())
offs2 = -3; offs2 = -3;
else else
offs2 = -5; offs2 = -5;
@ -368,7 +368,7 @@ UINT32 tumbleb_state::screen_update_semicom_altoffsets(screen_device &screen, bi
{ {
int offsx, offsy, offsx2; int offsx, offsy, offsx2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
offsx = -1; offsx = -1;
offsy = 2; offsy = 2;
@ -383,17 +383,17 @@ UINT32 tumbleb_state::screen_update_bcstory(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* not sure of this */ /* not sure of this */
if (m_flipscreen) if (flip_screen())
offs = 1; offs = 1;
else else
offs = 8; offs = 8;
/* not sure of this */ /* not sure of this */
if (m_flipscreen) if (flip_screen())
offs2 = -3; offs2 = -3;
else else
offs2 = 8; offs2 = 8;
@ -406,8 +406,8 @@ UINT32 tumbleb_state::screen_update_semibase(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
offs = -1; offs = -1;
offs2 = -2; offs2 = -2;
@ -420,8 +420,8 @@ UINT32 tumbleb_state::screen_update_sdfight(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
offs = -1; offs = -1;
offs2 = -5; // foreground scroll.. offs2 = -5; // foreground scroll..
@ -435,15 +435,15 @@ UINT32 tumbleb_state::screen_update_fncywld(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen) if (flip_screen())
offs = 1; offs = 1;
else else
offs = -1; offs = -1;
if (m_flipscreen) if (flip_screen())
offs2 = -3; offs2 = -3;
else else
offs2 = -5; offs2 = -5;
@ -457,15 +457,15 @@ UINT32 tumbleb_state::screen_update_pangpang(screen_device &screen, bitmap_ind16
{ {
int offs, offs2; int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80; flip_screen_set(m_control_0[0] & 0x80);
machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen) if (flip_screen())
offs = 1; offs = 1;
else else
offs = -1; offs = -1;
if (m_flipscreen) if (flip_screen())
offs2 = -3; offs2 = -3;
else else
offs2 = -5; offs2 = -5;