feature(load): sort savegames by timestamp

Author: usidedown

src/fheroes2/dialog/dialog_selectfile.cpp

@@ -244,7 +244,14 @@ namespace
             }
         }
 
-        std::sort( mapInfos.begin(), mapInfos.end(), Maps::FileInfo::sortByFileName );
+        const SaveFileSortType sortType = Settings::Get().GetSaveFileSortType();
+        if ( sortType == SaveFileSortType::FILENAME ) {
+            std::sort( mapInfos.begin(), mapInfos.end(), Maps::FileInfo::sortByFileName );
+        }
+        else {
+            assert( sortType == SaveFileSortType::LATEST );
+            std::sort( mapInfos.begin(), mapInfos.end(), Maps::FileInfo::sortByTimestampDescending );
+        }
 
         return mapInfos;
     }

src/fheroes2/maps/maps_fileinfo.cpp

@@ -563,6 +563,12 @@ bool Maps::FileInfo::sortByMapName( const FileInfo & lhs, const FileInfo & rhs )
     return CaseInsensitiveCompare( lhs.name, rhs.name );
 }
 
+bool Maps::FileInfo::sortByTimestampDescending( const FileInfo & lhs, const FileInfo & rhs )
+{
+    // we want the latest timestamp first
+    return lhs.timestamp > rhs.timestamp;
+}
+
 int Maps::FileInfo::KingdomRace( int color ) const
 {
     switch ( color ) {

src/fheroes2/maps/maps_fileinfo.h

@@ -145,6 +145,7 @@ namespace Maps
         static bool sortByFileName( const FileInfo & lhs, const FileInfo & rhs );
 
         static bool sortByMapName( const FileInfo & lhs, const FileInfo & rhs );
+        static bool sortByTimestampDescending( const FileInfo & lhs, const FileInfo & rhs );
 
         // Only Resurrection Maps contain supported language.
         std::optional<fheroes2::SupportedLanguage> getSupportedLanguage() const

src/fheroes2/system/settings.cpp

@@ -101,6 +101,7 @@ std::string Settings::GetVersion()
 Settings::Settings()
     : _resolutionInfo( fheroes2::Display::DEFAULT_WIDTH, fheroes2::Display::DEFAULT_HEIGHT )
     , _gameDifficulty( Difficulty::NORMAL )
+    , _saveFileSortType( SaveFileSortType::FILENAME )
     , sound_volume( 6 )
     , music_volume( 6 )
     , _musicType( MUSIC_EXTERNAL )
@@ -355,6 +356,15 @@ bool Settings::Read( const std::string & filePath )
         setEditorPassability( config.StrParams( "editor passability" ) == "on" );
     }
 
+    if ( config.Exists( "save load order" ) ) {
+        if ( config.StrParams( "save load order" ) == "date" ) {
+            _saveFileSortType = SaveFileSortType::LATEST;
+        }
+        else {
+            _saveFileSortType = SaveFileSortType::FILENAME;
+        }
+    }
+
     return true;
 }
 
@@ -519,6 +529,9 @@ std::string Settings::String() const
     os << std::endl << "# display object passability in the Editor: on/off" << std::endl;
     os << "editor passability = " << ( _editorOptions.Modes( EDITOR_PASSABILITY ) ? "on" : "off" ) << std::endl;
 
+    os << std::endl << "# sort game saves when loading: name/date" << std::endl;
+    os << "save load order = " << ( _saveFileSortType == SaveFileSortType::LATEST ? "date" : "name" ) << std::endl;
+
     return os.str();
 }
 
@@ -589,6 +602,11 @@ void Settings::SetProgramPath( const char * path )
     _programPath = path;
 }
 
+SaveFileSortType Settings::GetSaveFileSortType() const
+{
+    return _saveFileSortType;
+}
+
 const std::vector<std::string> & Settings::GetRootDirs()
 {
     static const std::vector<std::string> rootDirs = []() {

src/fheroes2/system/settings.h

@@ -71,6 +71,12 @@ enum class InterfaceType : uint8_t
     DYNAMIC = 2
 };
 
+enum class SaveFileSortType : uint8_t
+{
+    FILENAME = 0,
+    LATEST = 1,
+};
+
 class Settings
 {
 public:
@@ -354,6 +360,8 @@ class Settings
 
     void SetProgramPath( const char * path );
 
+    SaveFileSortType GetSaveFileSortType() const;
+
     static std::string GetVersion();
 
     static const std::vector<std::string> & GetRootDirs();
@@ -387,6 +395,8 @@ class Settings
 
     Maps::FileInfo _currentMapInfo;
 
+    SaveFileSortType _saveFileSortType;
+
     int sound_volume;
     int music_volume;
     MusicSource _musicType;