Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

From Micko: fixed chd image loading? (mainly for MESS)

Browse Source
This commit is contained in:
Angelo Salese 2010-09-07 20:47:30 +00:00
parent 9afc457ab6
commit a31bca0720
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/emu/machine.c
View File

@ -332,9 +332,6 @@ void running_machine::start()
// start up the devices // start up the devices
m_devicelist.start_all(); m_devicelist.start_all();
// finish image devices init process
image_postdevice_init(this);
// if we're coming in with a savegame request, process it now // if we're coming in with a savegame request, process it now
const char *savegame = options_get_string(&m_options, OPTION_STATE); const char *savegame = options_get_string(&m_options, OPTION_STATE);
if (savegame[0] != 0) if (savegame[0] != 0)
@ -977,8 +974,8 @@ void driver_device_config_base::static_set_game(device_config *device, const gam
//------------------------------------------------- //-------------------------------------------------
// static_set_machine_start - set the legacy // static_set_machine_start - set the legacy
// machine start callback in the device // machine start callback in the device
// configuration // configuration
//------------------------------------------------- //-------------------------------------------------
@ -989,8 +986,8 @@ void driver_device_config_base::static_set_callback(device_config *device, callb
//------------------------------------------------- //-------------------------------------------------
// static_set_palette_init - set the legacy // static_set_palette_init - set the legacy
// palette init callback in the device // palette init callback in the device
// configuration // configuration
//------------------------------------------------- //-------------------------------------------------
@ -1001,8 +998,8 @@ void driver_device_config_base::static_set_palette_init(device_config *device, p
//------------------------------------------------- //-------------------------------------------------
// static_set_video_update - set the legacy // static_set_video_update - set the legacy
// video update callback in the device // video update callback in the device
// configuration // configuration
//------------------------------------------------- //-------------------------------------------------
@ -1013,7 +1010,7 @@ void driver_device_config_base::static_set_video_update(device_config *device, v
//------------------------------------------------- //-------------------------------------------------
// rom_region - return a pointer to the ROM // rom_region - return a pointer to the ROM
// regions specified for the current game // regions specified for the current game
//------------------------------------------------- //-------------------------------------------------
@ -1175,7 +1172,7 @@ void driver_device::device_start()
// reschedule ourselves to be last // reschedule ourselves to be last
if (next() != NULL) if (next() != NULL)
throw device_missing_dependencies(); throw device_missing_dependencies();
// find all the registered devices // find all the registered devices
for (auto_finder_base *autodev = m_auto_finder_list; autodev != NULL; autodev = autodev->m_next) for (auto_finder_base *autodev = m_auto_finder_list; autodev != NULL; autodev = autodev->m_next)
autodev->findit(*this); autodev->findit(*this);
@ -1183,7 +1180,10 @@ void driver_device::device_start()
// call the game-specific init // call the game-specific init
if (m_config.m_game->driver_init != NULL) if (m_config.m_game->driver_init != NULL)
(*m_config.m_game->driver_init)(&m_machine); (*m_config.m_game->driver_init)(&m_machine);
// finish image devices init process
image_postdevice_init(&m_machine);
// call palette_init if present // call palette_init if present
if (m_config.m_palette_init != NULL) if (m_config.m_palette_init != NULL)
(*m_config.m_palette_init)(&m_machine, memory_region(machine, "proms")); (*m_config.m_palette_init)(&m_machine, memory_region(machine, "proms"));