Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 00:29:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed MameTesters bug #6621

Browse Source
This commit is contained in:
Nathan Woods 2017-08-17 08:17:58 -04:00 committed by Vas Crabb
parent b1275ccf6c
commit 098cfab5b8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/machine.h
View File

@ -250,6 +250,7 @@ public:
u32 rand(); u32 rand();
std::string describe_context() const; std::string describe_context() const;
std::string compose_saveload_filename(std::string &&base_filename, const char **searchpath = nullptr); std::string compose_saveload_filename(std::string &&base_filename, const char **searchpath = nullptr);
std::string get_statename(const char *statename_opt) const;
// CPU information // CPU information
cpu_device * firstcpu; // first CPU cpu_device * firstcpu; // first CPU
@ -293,7 +294,6 @@ private:
template <typename T> struct is_null<T *> { template <typename U> static bool value(U &&x) { return !x; } }; template <typename T> struct is_null<T *> { template <typename U> static bool value(U &&x) { return !x; } };
void start(); void start();
void set_saveload_filename(std::string &&filename); void set_saveload_filename(std::string &&filename);
std::string get_statename(const char *statename_opt) const;
void handle_saveload(); void handle_saveload();
void soft_reset(void *ptr = nullptr, s32 param = 0); void soft_reset(void *ptr = nullptr, s32 param = 0);
std::string nvram_filename(device_t &device) const; std::string nvram_filename(device_t &device) const;

5
src/frontend/mame/ui/state.cpp
View File

@ -353,15 +353,16 @@ const menu_load_save_state_base::file_entry &menu_load_save_state_base::file_ent
//------------------------------------------------- //-------------------------------------------------
// is_present // state_name
//------------------------------------------------- //-------------------------------------------------
std::string menu_load_save_state_base::state_directory() const std::string menu_load_save_state_base::state_directory() const
{ {
const char *stateopt = machine().options().state_name();
return util::string_format("%s%s%s", return util::string_format("%s%s%s",
machine().options().state_directory(), machine().options().state_directory(),
PATH_SEPARATOR, PATH_SEPARATOR,
machine().system().name); machine().get_statename(stateopt));
} }