diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2017-04-06 18:00:43 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2017-04-06 18:00:43 -0400 |
commit | cb68159154a5586dc92cae779fac4a9ecde4abf4 (patch) | |
tree | 0de47e8a30c0a364bee8813132a1ba249d956f13 /src/emu | |
parent | 0eebf8c69c5401b9fa74bb0c3453e2f5d92294e8 (diff) |
Palette device fixes (nw)
- Enforce dependencies in various Konami, Sega & Seta GFX devices
- Disable palette uniqueness check in divideo
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/divideo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/divideo.cpp b/src/emu/divideo.cpp index a8e86fe0bd1..4abe607dab3 100644 --- a/src/emu/divideo.cpp +++ b/src/emu/divideo.cpp @@ -137,9 +137,9 @@ void device_video_interface::interface_pre_start() // resolve the palette for the sake of register_screen_bitmap m_screen->resolve_palette(); - // no other palette may be specified - if (m_screen->has_palette() && palintf != &m_screen->palette()) - throw emu_fatalerror("Device '%s' cannot control screen '%s' with palette '%s'", m_screen_tag, device().tag(), m_screen->palette().device().tag()); + // no other palette may be specified (FIXME: breaks meritm.cpp) + if (0 && m_screen->has_palette() && palintf != &m_screen->palette()) + throw emu_fatalerror("Device '%s' cannot control screen '%s' with palette '%s'", device().tag(), m_screen_tag, m_screen->palette().device().tag()); } } } |