Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-07 23:02:33 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed debug asserts (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2012-02-23 15:36:18 +00:00
parent 266db132cc
commit 8e20ddb184
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emu/info.c
View File

@ -404,13 +404,12 @@ void info_xml_creator::output_one_device(device_t &device, const char *innertag,
// in slots // in slots
//------------------------------------------------- //-------------------------------------------------
typedef tagmap_t<const game_driver *> slot_map; typedef tagmap_t<FPTR> slot_map;
void info_xml_creator::output_devices() void info_xml_creator::output_devices()
{ {
m_drivlist.reset(); m_drivlist.reset();
slot_map desc; slot_map desc;
const game_driver &driver = m_drivlist.driver();
// first, run through slot devices // first, run through slot devices
while (m_drivlist.next()) while (m_drivlist.next())
@ -420,7 +419,7 @@ void info_xml_creator::output_devices()
for (device_t *device = deviter.next(); device != NULL; device = deviter.next()) { for (device_t *device = deviter.next(); device != NULL; device = deviter.next()) {
if (device->rom_region() != NULL && device->shortname()!= NULL) if (device->rom_region() != NULL && device->shortname()!= NULL)
{ {
if (desc.add(device->name(), &driver, FALSE) != TMERR_DUPLICATE) if (desc.add(device->name(), 0, FALSE) != TMERR_DUPLICATE)
output_one_device(*device, device->tag(), emulator_info::get_xml_top()); output_one_device(*device, device->tag(), emulator_info::get_xml_top());
} }
} }
@ -440,7 +439,7 @@ void info_xml_creator::output_devices()
if (!device->configured()) if (!device->configured())
device->config_complete(); device->config_complete();
if (desc.add(dev->name(), &driver, FALSE) != TMERR_DUPLICATE) if (desc.add(dev->name(), 0, FALSE) != TMERR_DUPLICATE)
output_one_device(*dev, temptag.cstr(), emulator_info::get_xml_top()); output_one_device(*dev, temptag.cstr(), emulator_info::get_xml_top());
const_cast<machine_config &>(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), temptag.cstr()); const_cast<machine_config &>(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), temptag.cstr());

2
src/emu/input.h
View File

@ -535,7 +535,7 @@ private:
input_class & m_class; // reference to our class input_class & m_class; // reference to our class
astring m_name; // string name of device astring m_name; // string name of device
int m_devindex; // device index of this device int m_devindex; // device index of this device
input_device_item * m_item[ITEM_ID_ABSOLUTE_MAXIMUM]; // array of pointers to items input_device_item * m_item[ITEM_ID_ABSOLUTE_MAXIMUM+1]; // array of pointers to items
input_item_id m_maxitem; // maximum item index input_item_id m_maxitem; // maximum item index
void * m_internal; // internal callback pointer void * m_internal; // internal callback pointer