diff --git a/manual.lyx b/manual.lyx index decad070..e107d374 100644 --- a/manual.lyx +++ b/manual.lyx @@ -947,11 +947,19 @@ Misc. \end_layout \begin_layout Subsubsection -reload-rom [] +load-rom \end_layout \begin_layout Standard -Reloads the main ROM image from . +Loads ROM (format autodetected) from . +\end_layout + +\begin_layout Subsubsection +reload-rom +\end_layout + +\begin_layout Standard +Reloads the main ROM image from. \end_layout \begin_layout Subsubsection diff --git a/manual.txt b/manual.txt index 43ac4a4e..afcf16f6 100644 --- a/manual.txt +++ b/manual.txt @@ -448,20 +448,24 @@ Enable/Disable sound. 5.8 Misc. -5.8.1 reload-rom [] +5.8.1 load-rom -Reloads the main ROM image from . +Loads ROM (format autodetected) from . -5.8.2 +tangent +5.8.2 reload-rom + +Reloads the main ROM image from. + +5.8.3 +tangent Tangent for recording voice for commentary track. While pressed, record a stream. -5.8.3 advance-subframe-timeout +5.8.4 advance-subframe-timeout Subframe advance timeout in milliseconds. Default is 100. -5.8.4 set-speed +5.8.5 set-speed Set the speed multiplier. may be positive number (1 is normal speed) or “turbo” for turbo. diff --git a/src/cmdhelp/loadsave.json b/src/cmdhelp/loadsave.json index 2ce172ce..764d1b6a 100644 --- a/src/cmdhelp/loadsave.json +++ b/src/cmdhelp/loadsave.json @@ -164,6 +164,10 @@ "flushslots", "Flush slotinfo cache", {"":"Flush slotinfo cache"} ], + "load-rom":[ + "lrom", "Load specified ROM", + {"":"Load as packfile"} + ], "reload-rom":[ "rlrom", "Reload the current ROM", {"":"Reload the currently loaded ROM from disk"} diff --git a/src/core/mainloop.cpp b/src/core/mainloop.cpp index 21865970..bc1879a7 100644 --- a/src/core/mainloop.cpp +++ b/src/core/mainloop.cpp @@ -561,6 +561,13 @@ namespace mark_pending_save(args, SAVE_MOVIE, 0); }); + command::fnptr CMD_load_rom(lsnes_cmds, CLOADSAVE::lrom, + [](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) { + romload_request req; + req.packfile = args; + load_new_rom(req); + }); + command::fnptr<> CMD_reload_rom(lsnes_cmds, CLOADSAVE::rlrom, []() throw(std::bad_alloc, std::runtime_error) { reload_current_rom();