diff options
author | 2016-06-24 23:28:42 +0200 | |
---|---|---|
committer | 2016-06-24 23:28:42 +0200 | |
commit | 798bb7956756fcb8f356dcaeeaf7fe1e31dab8da (patch) | |
tree | 038713be6e2512f886d55a9ac9a9afc92a70d9c8 /src/emu/machine.cpp | |
parent | bc37304ef96e335810e7dc10367e7e7faa2d3c1d (diff) | |
parent | b3491464e41b6afea81e188fe6a350d4f778854b (diff) |
Merge remote-tracking branch 'origin/master' into netlist_dev
Diffstat (limited to 'src/emu/machine.cpp')
-rw-r--r-- | src/emu/machine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 778403ef8a4..ae797fc81d2 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -568,7 +568,7 @@ void running_machine::set_saveload_filename(const char *filename) // take into account the statename option const char *stateopt = options().state_name(); std::string statename = get_statename(stateopt); - m_saveload_pending_file.assign(statename.c_str()).append(PATH_SEPARATOR).append(filename).append(".sta"); + m_saveload_pending_file = string_format("%s%s%s.sta", statename, PATH_SEPARATOR, filename); } } @@ -844,7 +844,7 @@ void running_machine::handle_saveload() break; case STATERR_INVALID_HEADER: - popmessage("Error: Unable to %s state due to an invalid header. Make sure the save state is correct for this game.", opname); + popmessage("Error: Unable to %s state due to an invalid header. Make sure the save state is correct for this machine.", opname); break; case STATERR_READ_ERROR: @@ -857,7 +857,7 @@ void running_machine::handle_saveload() case STATERR_NONE: if (!(m_system.flags & MACHINE_SUPPORTS_SAVE)) - popmessage("State successfully %s.\nWarning: Save states are not officially supported for this game.", opnamed); + popmessage("State successfully %s.\nWarning: Save states are not officially supported for this machine.", opnamed); else popmessage("State successfully %s.", opnamed); break; |