From 8e20ddb18464d88912181c9e372470a054ac27d0 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 23 Feb 2012 15:36:18 +0000 Subject: [PATCH] Fixed debug asserts (no whatsnew) --- src/emu/info.c | 7 +++---- src/emu/input.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/emu/info.c b/src/emu/info.c index 13884e32dae..47ca17f67e8 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -404,13 +404,12 @@ void info_xml_creator::output_one_device(device_t &device, const char *innertag, // in slots //------------------------------------------------- -typedef tagmap_t slot_map; +typedef tagmap_t slot_map; void info_xml_creator::output_devices() { m_drivlist.reset(); slot_map desc; - const game_driver &driver = m_drivlist.driver(); // first, run through slot devices 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()) { 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()); } } @@ -440,7 +439,7 @@ void info_xml_creator::output_devices() if (!device->configured()) 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()); const_cast(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), temptag.cstr()); diff --git a/src/emu/input.h b/src/emu/input.h index 22fb8f6d339..2fd586ee664 100644 --- a/src/emu/input.h +++ b/src/emu/input.h @@ -535,7 +535,7 @@ private: input_class & m_class; // reference to our class astring m_name; // string name of 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 void * m_internal; // internal callback pointer