mirror of
https://github.com/holub/mame
synced 2025-04-23 00:39:36 +03:00
address_map: Internal maps must now be constructed last to have priority (nw)
This fixes sound in mpatrol.
This commit is contained in:
parent
5ed941c5a5
commit
fe500377ad
@ -348,12 +348,6 @@ address_map::address_map(device_t &device, int spacenum)
|
||||
if (spaceconfig == nullptr)
|
||||
throw emu_fatalerror("No memory address space configuration found for device '%s', space %d\n", m_device->tag(), spacenum);
|
||||
|
||||
// construct the internal device map (first so it takes priority)
|
||||
if (spaceconfig->m_internal_map != nullptr)
|
||||
(*spaceconfig->m_internal_map)(*this);
|
||||
if (!spaceconfig->m_internal_map_delegate.isnull())
|
||||
spaceconfig->m_internal_map_delegate(*this);
|
||||
|
||||
// append the map provided by the owner
|
||||
if (memintf->address_map(spacenum) != nullptr)
|
||||
{
|
||||
@ -369,6 +363,12 @@ address_map::address_map(device_t &device, int spacenum)
|
||||
if (!spaceconfig->m_default_map_delegate.isnull())
|
||||
spaceconfig->m_default_map_delegate(*this);
|
||||
}
|
||||
|
||||
// construct the internal device map (last so it takes priority)
|
||||
if (spaceconfig->m_internal_map != nullptr)
|
||||
(*spaceconfig->m_internal_map)(*this);
|
||||
if (!spaceconfig->m_internal_map_delegate.isnull())
|
||||
spaceconfig->m_internal_map_delegate(*this);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user