MESS SVN History

15994 Revisions

r14564 Tuesday 21st February, 2012 at 12:46:28 UTC by Miodrag Milanović
Give more proper name and disabled loading of soflist items in open_image_file call, fixing loading of softlist items (no whatsnew)

[src/emu]	diimage.c diimage.h
[src/mess/machine]	c64exp.c

src/emu/diimage.c
r14563	r14564
873	873	goto done;
874	874
875	875	/* Check if there's a software list defined for this device and use that if we're not creating an image */
876		if (!filename_has_period)
	876	if (!filename_has_period && !just_load)
877	877	{
878	878	softload = load_software_part( device().machine().options(), this, path, &m_software_info_ptr, &m_software_part_ptr, &m_full_software_name, &m_software_list_name );
879	879	// if we had launched from softlist with a specified part, e.g. "shortname:part"
r14563	r14564
971	971	}
972	972
973	973	/*-------------------------------------------------
974		load_f~~or_s~~lot - load an image f~~or slot dev~~ice
	974	open_image_file - opening plain image file
975	975	-------------------------------------------------*/
976	976
977		bool device_image_interface::load_f~~or_s~~lot(emu_options &options)
	977	bool device_image_interface::open_image_file(emu_options &options)
978	978	{
979	979	const char* path = options.value(instance_name());
980	980	if (strlen(path)>0)

src/emu/diimage.h
r14563	r14564
246	246	image_device_format *formatlist() const { return m_formatlist; }
247	247
248	248	bool load(const char *path);
249		bool load_f~~or_s~~lot(emu_options &options);
	249	bool open_image_file(emu_options &options);
250	250	bool finish_load();
251	251	void unload();
252	252	bool create(const char path, const image_device_format create_format, option_resolution *create_args);

src/mess/machine/c64exp.c
r14563	r14564
399	399
400	400	const char * c64_expansion_slot_device::get_default_card_software(const machine_config &config, emu_options &options)
401	401	{
402		if (load_f~~or_s~~lot(options))
	402	if (open_image_file(options))
403	403	{
404	404	if (!mame_stricmp(filetype(), "crt"))
405	405	{
r14563	r14564
413	413	return CRT_C64_SLOT_NAMES[hardware];
414	414	}
415	415	}
	416	clear();
416	417	}
417	418	return software_get_default_slot(config, options, this, "standard");
418	419	}

15994 Revisions