Merge pull request #4297 from cam900/namcos1_prifix

namcos1.cpp : Fix priority issue
This commit is contained in:
R. Belmont 2018-11-14 15:22:01 -05:00 committed by GitHub
commit 2bc52ddaaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -125,14 +125,14 @@ void namco_c123tmap_device::init_scroll(int flip) // 8 bit control with external
} }
} }
void namco_c123tmap_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri, int prival) void namco_c123tmap_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri, int prival, int primask)
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// bit 3 : disable layer // bit 3 : disable layer
if ((m_tilemapinfo.control[0x20 / 2 + i] & 0x7) == pri) if ((m_tilemapinfo.control[0x20 / 2 + i] & 0x7) == pri)
{ {
m_tilemapinfo.tmap[i]->draw(screen, bitmap, cliprect, 0, prival); m_tilemapinfo.tmap[i]->draw(screen, bitmap, cliprect, 0, prival, primask);
} }
} }
} /* draw */ } /* draw */

View File

@ -39,7 +39,7 @@ public:
void mark_all_dirty(void); void mark_all_dirty(void);
void init_scroll(int flip); void init_scroll(int flip);
void draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri, int prival = 0); void draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri, int prival = 0, int primask = 0xff);
protected: protected:
// device-level overrides // device-level overrides

View File

@ -237,7 +237,7 @@ uint32_t namcos1_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
/* bit 3 disable */ /* bit 3 disable */
for (int priority = 0; priority < 8; priority++) for (int priority = 0; priority < 8; priority++)
{ {
m_c123tmap->draw(screen, bitmap, new_clip, priority, priority); m_c123tmap->draw(screen, bitmap, new_clip, priority, priority, 0);
} }
draw_sprites(screen, bitmap, new_clip); draw_sprites(screen, bitmap, new_clip);