Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-28 15:14:21 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

removed disclaimer since it was not shown anyway and it is known fact (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-03-28 08:58:18 +02:00
parent 775777e70b
commit 4dfeec15c6
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/machine.cpp
View File

@ -356,7 +356,7 @@ int running_machine::run(bool firstrun)
ui().initialize(*this); ui().initialize(*this);
// display the startup screens // display the startup screens
ui().display_startup_screens(firstrun, false); ui().display_startup_screens(firstrun);
// perform a soft reset -- this takes us to the running phase // perform a soft reset -- this takes us to the running phase
soft_reset(); soft_reset();

33
src/emu/ui/ui.cpp
View File

@ -359,9 +359,9 @@ UINT32 ui_manager::set_handler(ui_callback callback, UINT32 param)
// various startup screens // various startup screens
//------------------------------------------------- //-------------------------------------------------
void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer) void ui_manager::display_startup_screens(bool first_time)
{ {
const int maxstate = 4; const int maxstate = 3;
int str = machine().options().seconds_to_run(); int str = machine().options().seconds_to_run();
bool show_gameinfo = !machine().options().skip_gameinfo(); bool show_gameinfo = !machine().options().skip_gameinfo();
bool show_warnings = true, show_mandatory_fileman = true; bool show_warnings = true, show_mandatory_fileman = true;
@ -370,11 +370,11 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
// disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver, // disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver,
// or if we are debugging // or if we are debugging
if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0) if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE; show_gameinfo = show_warnings = show_mandatory_fileman = FALSE;
#if defined(EMSCRIPTEN) #if defined(EMSCRIPTEN)
// also disable for the JavaScript port since the startup screens do not run asynchronously // also disable for the JavaScript port since the startup screens do not run asynchronously
show_gameinfo = show_warnings = show_disclaimer = FALSE; show_gameinfo = show_warnings = FALSE;
#endif #endif
// loop over states // loop over states
@ -388,11 +388,6 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
switch (state) switch (state)
{ {
case 0: case 0:
if (show_disclaimer && disclaimer_string(messagebox_text).length() > 0)
set_handler(handler_messagebox_anykey, 0);
break;
case 1:
if (show_warnings && warnings_string(messagebox_text).length() > 0) if (show_warnings && warnings_string(messagebox_text).length() > 0)
{ {
set_handler(handler_messagebox_anykey, 0); set_handler(handler_messagebox_anykey, 0);
@ -403,12 +398,12 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
} }
break; break;
case 2: case 1:
if (show_gameinfo && game_info_astring(messagebox_text).length() > 0) if (show_gameinfo && game_info_astring(messagebox_text).length() > 0)
set_handler(handler_messagebox_anykey, 0); set_handler(handler_messagebox_anykey, 0);
break; break;
case 3: case 2:
if (show_mandatory_fileman && machine().image().mandatory_scan(messagebox_text).length() > 0) if (show_mandatory_fileman && machine().image().mandatory_scan(messagebox_text).length() > 0)
{ {
std::string warning; std::string warning;
@ -1032,22 +1027,6 @@ bool ui_manager::show_timecode_total()
TEXT GENERATORS TEXT GENERATORS
***************************************************************************/ ***************************************************************************/
//-------------------------------------------------
// disclaimer_string - print the disclaimer
// text to the given buffer
//-------------------------------------------------
std::string &ui_manager::disclaimer_string(std::string &str)
{
str = string_format(
_("Usage of emulators in conjunction with ROMs you don't own is forbidden by copyright law.\n\n"
"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS ESC.\n\n"
"Otherwise, type OK or move the joystick left then right to continue"),
machine().system().description);
return str;
}
//------------------------------------------------- //-------------------------------------------------
// warnings_string - print the warning flags // warnings_string - print the warning flags
// text to the given buffer // text to the given buffer

3
src/emu/ui/ui.h
View File

@ -129,7 +129,7 @@ public:
// methods // methods
void initialize(running_machine &machine); void initialize(running_machine &machine);
UINT32 set_handler(ui_callback callback, UINT32 param); UINT32 set_handler(ui_callback callback, UINT32 param);
void display_startup_screens(bool first_time, bool show_disclaimer); void display_startup_screens(bool first_time);
void set_startup_text(const char *text, bool force); void set_startup_text(const char *text, bool force);
void update_and_render(render_container *container); void update_and_render(render_container *container);
render_font *get_font(); render_font *get_font();
@ -213,7 +213,6 @@ private:
static slider_state *slider_current; static slider_state *slider_current;
// text generators // text generators
std::string &disclaimer_string(std::string &buffer);
std::string &warnings_string(std::string &buffer); std::string &warnings_string(std::string &buffer);
// UI handlers // UI handlers