diff --git a/base/commandLine.cpp b/base/commandLine.cpp index d41e2931888..628aec4dbd0 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -151,6 +151,7 @@ static const char HELP_STRING[] = " pce, segacd, wii, windows)\n" " --savepath=PATH Path to where saved games are stored\n" " --extrapath=PATH Extra path to additional game data\n" + " --iconspath=PATH Path to additional icons for the launcher grid view\n" " --soundfont=FILE Select the SoundFont for MIDI playback (only\n" " supported by some MIDI drivers)\n" " --multi-midi Enable combination AdLib and native MIDI\n" @@ -838,6 +839,15 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha } END_OPTION + DO_LONG_OPTION("iconspath") + Common::FSNode path(option); + if (!path.exists()) { + usage("Non-existent icons path '%s'", option); + } else if (!path.isReadable()) { + usage("Non-readable icons path '%s'", option); + } + END_OPTION + DO_LONG_OPTION("md5-path") // While the --md5 command expect a file name, the --md5mac may take a base name. // Thus we do not check that the file exists here. @@ -1847,6 +1857,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo "subtitles", "savepath", "extrapath", + "iconspath", "screenshotpath", "soundfont", "multi-midi", diff --git a/doc/docportal/advanced_topics/command_line.rst b/doc/docportal/advanced_topics/command_line.rst index 646ebf9e7ce..7f180cbfedc 100755 --- a/doc/docportal/advanced_topics/command_line.rst +++ b/doc/docportal/advanced_topics/command_line.rst @@ -129,6 +129,7 @@ Short options are listed where they are available. ``--dump-scripts``,``-u``,"Enables script dumping if a directory called 'dumps' exists in the current directory" ``--enable-gs``,,":ref:`Enables Roland GS mode for MIDI playback `" ``--extrapath=PATH``,,":ref:`Extra path to additional game data `" + ``--iconspath=PATH``,,":ref:`Path to additional icons for the launcher grid view `" ``--filtering``,,":ref:`Forces filtered graphics mode `" ``--fullscreen``,``-f``,":ref:`Forces full-screen mode `" ``--game=NAME``,,"In combination with ``--add`` or ``--detect`` only adds or attempts to detect the game with id NAME." diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst index e63099a5906..c66daca60a4 100755 --- a/doc/docportal/advanced_topics/configuration_file.rst +++ b/doc/docportal/advanced_topics/configuration_file.rst @@ -163,6 +163,7 @@ There are many recognized configuration keys. In the table below, each key is ei enable_unsupported_game_warning,boolean,true, Shows a warning when adding a game that is unsupported. extra,string, ,"Shows additional information about a game, such as version" ":ref:`extrapath `",string,None, + ":ref:`iconspath `",string,None, ":ref:`fade_style `",boolean,true, ":ref:`filtering `",boolean,false, ":ref:`floating_cursors `",boolean,false, diff --git a/doc/docportal/settings/paths.rst b/doc/docportal/settings/paths.rst index e17cab6092d..1991ec1831c 100644 --- a/doc/docportal/settings/paths.rst +++ b/doc/docportal/settings/paths.rst @@ -41,3 +41,9 @@ Extra Path *extrapath* +.. _iconspath: + +Icons Path + Sets the path to the folder in which ScummVM will look for additional icons for the launcher grid view. + + *iconspath* diff --git a/doc/se/LasMig b/doc/se/LasMig index 8a489c0dc22..4a3f9586f7d 100644 --- a/doc/se/LasMig +++ b/doc/se/LasMig @@ -705,6 +705,7 @@ Ordning: scummvm [INSTÄLLNINGAR]... [SPEL] pce, segacd, windows) --savepath=PATH Sökväg dit spardata lagras --extrapath=PATH ”Extra”-sökväg för ytterligare speldata + --iconspath=PATH --soundfont=FILE Välj SoundFont för MIDI-uppspelning (Stöds endast av vissa MIDI-drivers) --multi-midi Aktivera kombination av AdLib och Native MIDI