Previous 15994 Revisions Next

r15862 Sunday 12th August, 2012 at 12:18:21 UTC by Miodrag Milanović
Display correct software load messages depending of supported attribute value (no whatsnew)
[src/emu]romload.c romload.h ui.c

src/emu/ui.c
r15861r15862
909909   string.reset();
910910
911911   /* if no warnings, nothing to return */
912   if (rom_load_warnings(machine) == 0 && rom_load_knownbad(machine) == 0 && !(machine.system().flags & WARNING_FLAGS))
912   if (rom_load_warnings(machine) == 0 && rom_load_knownbad(machine) == 0 && !(machine.system().flags & WARNING_FLAGS) && software_load_warnings_message(machine).len()==0)
913913      return string;
914914
915915   /* add a warning if any ROMs were loaded with warnings */
r15861r15862
922922         string.cat("\n");
923923   }
924924
925   if (software_load_warnings_message(machine).len()) {
926      string.cat(software_load_warnings_message(machine));
927      if (machine.system().flags & WARNING_FLAGS)
928         string.cat("\n");
929   }
925930   /* if we have at least one warning flag, print the general header */
926931   if ((machine.system().flags & WARNING_FLAGS) || rom_load_knownbad(machine) > 0)
927932   {
src/emu/romload.c
r15861r15862
7979   memory_region *   region;            /* info about current region */
8080
8181   astring         errorstring;      /* error string */
82   astring         softwarningstring;   /* software warning string */
8283};
8384
8485
r15861r15862
12991300   assert(device != NULL);
13001301
13011302   romdata->errorstring.reset();
1303   romdata->softwarningstring.reset();
13021304
13031305   if (software_get_support(device->machine().options(), swlist, swname) == SOFTWARE_SUPPORTED_PARTIAL)
13041306   {
13051307      romdata->errorstring.catprintf("WARNING: support for software %s (in list %s) is only partial\n", swname, swlist);
1308      romdata->softwarningstring.catprintf("Support for software %s (in list %s) is only partial\n", swname, swlist);
13061309      romdata->warnings++;
13071310   }
13081311   if (software_get_support(device->machine().options(), swlist, swname) == SOFTWARE_SUPPORTED_NO)
13091312   {
13101313      romdata->errorstring.catprintf("WARNING: support for software %s (in list %s) is only preliminary\n", swname, swlist);
1314      romdata->softwarningstring.catprintf("Support for software %s (in list %s) is only preliminary\n", swname, swlist);
13111315      romdata->warnings++;
13121316   }
13131317
r15861r15862
14911495
14921496
14931497/*-------------------------------------------------
1498    software_load_warnings_message - return the
1499    software load warnings we generated
1500-------------------------------------------------*/
1501
1502astring& software_load_warnings_message(running_machine &machine)
1503{
1504   return machine.romload_data->softwarningstring;
1505}
1506
1507/*-------------------------------------------------
14941508    rom_load_knownbad - return the number of
14951509    BAD_DUMP/NO_DUMP warnings we generated
14961510-------------------------------------------------*/
src/emu/romload.h
r15861r15862
264264
265265/* return the number of warnings we generated */
266266int rom_load_warnings(running_machine &machine);
267astring& software_load_warnings_message(running_machine &machine);
267268
268269/* return the number of BAD_DUMP/NO_DUMP warnings we generated */
269270int rom_load_knownbad(running_machine &machine);

Previous 15994 Revisions Next


© 1998-2018 The MESS Team