mirror of
https://github.com/holub/mame
synced 2025-05-29 00:53:09 +03:00
Fix handling of shared features in softlists (no whatsnew)
This commit is contained in:
parent
332613a611
commit
80acaef257
@ -893,14 +893,6 @@ static void end_handler(void *data, const char *name)
|
|||||||
case POS_ROOT:
|
case POS_ROOT:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case POS_SOFT:
|
|
||||||
if ( ! strcmp( name, "part" ) && swlist->softinfo )
|
|
||||||
{
|
|
||||||
/* ROM_END */
|
|
||||||
add_rom_entry( swlist, NULL, NULL, 0, 0, ROMENTRYTYPE_END );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case POS_MAIN:
|
case POS_MAIN:
|
||||||
if ( swlist->softinfo )
|
if ( swlist->softinfo )
|
||||||
{
|
{
|
||||||
@ -908,20 +900,27 @@ static void end_handler(void *data, const char *name)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case POS_PART:
|
case POS_SOFT:
|
||||||
/* Add shared_info inherited from the software_info level, if any */
|
if ( ! strcmp( name, "part" ) && swlist->softinfo )
|
||||||
if ( swlist->softinfo && swlist->softinfo->shared_info )
|
|
||||||
{
|
{
|
||||||
feature_list *list = swlist->softinfo->shared_info;
|
/* ROM_END */
|
||||||
|
add_rom_entry( swlist, NULL, NULL, 0, 0, ROMENTRYTYPE_END );
|
||||||
while( list->next )
|
/* Add shared_info inherited from the software_info level, if any */
|
||||||
|
if ( swlist->softinfo && swlist->softinfo->shared_info )
|
||||||
{
|
{
|
||||||
add_feature( swlist, list->next->name, list->next->value );
|
feature_list *list = swlist->softinfo->shared_info;
|
||||||
list = list->next;
|
|
||||||
|
while( list->next )
|
||||||
|
{
|
||||||
|
add_feature( swlist, list->next->name, list->next->value );
|
||||||
|
list = list->next;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case POS_PART:
|
||||||
|
break;
|
||||||
case POS_DATA:
|
case POS_DATA:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user