Ticket #4413: 4413_load.2.patch

binaries/data/mods/public/gui/common/functions_utility_loadsave.js

@@ -3 +3 @@
     return b.metadata.time - a.metadata.time;
 }
 
-function generateLabel(metadata, engineInfo)
+function isCompatibleSavegame(metadata, engineInfo)
 {
+    return engineInfo ?
+            hasSameSavegameVersion(metadata, engineInfo) &&
+            hasSameEngineVersion(metadata, engineInfo) &&
+            hasSameMods(metadata, engineInfo)
+            :
+            false;
+}
+
+function generateDateString(metadata, engineInfo)
+{
     let dateTimeString = Engine.FormatMillisecondsIntoDateString(metadata.time*1000, translate("yyyy-MM-dd HH:mm:ss"));
-    let dateString = sprintf(translate("\\[%(date)s]"), { "date": dateTimeString });
+    let dateString = sprintf(translate("%(date)s"), { "date": dateTimeString });
 
     if (engineInfo)
     {
@@ -16 +26 @@
             dateString = "[color=\"orange\"]" + dateString + "[/color]";
     }
 
+    return dateString;
+}
+
+function generateLabel(metadata, engineInfo)
+{
     return sprintf(
         metadata.description ?
             translate("%(dateString)s %(map)s - %(description)s") :
             translate("%(dateString)s %(map)s"),
         {
-            "dateString": dateString,
+            "dateString": "\\[" + generateDateString(metadata, engineInfo) + "]",
             "map": metadata.initAttributes.map,
             "description": metadata.description || ""
         }

binaries/data/mods/public/gui/savedgames/load.js

@@ -7 +7 @@
 
 function init()
 {
+    let savedGames = Engine.GetSavedGames();
+
+    // Get current game version and loaded mods
+    let engineInfo = Engine.GetEngineInfo();
+
+    // Filter incompatible saved games
+    if (Engine.GetGUIObjectByName("compatibilityFilter").checked)
+        savedGames = savedGames.filter(game => isCompatibleSavegame(game.metadata, engineInfo));
+
     let gameSelection = Engine.GetGUIObjectByName("gameSelection");
-    let savedGames = Engine.GetSavedGames().sort(sortDecreasingDate);
     gameSelection.enabled = !!savedGames.length;
-    if (!savedGames.length)
+    Engine.GetGUIObjectByName("gameSelectionFeedback").hidden = !!savedGames.length;
+
+    let selectedGameId = gameSelection.list_data[gameSelection.selected];
+
+    // Save metadata for the detailed view
+    g_SavedGamesMetadata = savedGames.map(game =>
     {
-        gameSelection.list = [translate("No saved games found")];
-        gameSelection.selected = -1;
-        return;
-    }
+        game.metadata["id"] = game.id;
+        return game.metadata;
+    });
 
-    // Get current game version and loaded mods
-    let engineInfo = Engine.GetEngineInfo();
+    const sortKey = gameSelection.selected_column;
+    const sortOrder = gameSelection.selected_column_order;
+    g_SavedGamesMetadata = g_SavedGamesMetadata.sort((a, b) =>
+    {
+        let cmpA, cmpB;
+        switch (sortKey)
+        {
+        case 'date':
+            cmpA = +a.time;
+            cmpB = +b.time;
+            break;
+        case 'mapName':
+            cmpA = translate(a.initAttributes.settings.Name);
+            cmpB = translate(b.initAttributes.settings.Name);
+            break;
+        case 'mapType':
+            cmpA = translateMapType(a.initAttributes.mapType);
+            cmpB = translateMapType(b.initAttributes.mapType);
+            break;
+        case 'description':
+            cmpA = a.description;
+            cmpB = b.description;
+            break;
+        }
+        
+        if (cmpA < cmpB)
+            return -sortOrder;
+        else if (cmpA > cmpB)
+            return +sortOrder;
 
-    g_SavedGamesMetadata = savedGames.map(game => game.metadata);
+        return 0;
+    });
+    
+    let list = g_SavedGamesMetadata.map(metadata => {
+        return {
+            "date": generateDateString(metadata, engineInfo),
+            "mapName": translate(metadata.initAttributes.settings.Name),
+            "mapType": translateMapType(metadata.initAttributes.mapType),
+            "description": metadata.description
+        };
+    });
 
-    gameSelection.list = savedGames.map(game => generateLabel(game.metadata, engineInfo));
-    gameSelection.list_data = savedGames.map(game => game.id);
+    if (list.length)
+        list = prepareForDropdown(list);
 
-    if (gameSelection.selected == -1)
+    gameSelection.list_date = list.date || [];
+    gameSelection.list_mapName = list.mapName || [];
+    gameSelection.list_mapType = list.mapType || [];
+    gameSelection.list_description = list.description || [];
+
+    // Change these last, otherwise crash
+    gameSelection.list = g_SavedGamesMetadata.map(metadata => generateLabel(metadata, engineInfo));
+    gameSelection.list_data = g_SavedGamesMetadata.map(metadata => metadata.id);
+
+    if (gameSelection.selected == -1 && !!savedGames.length)
         gameSelection.selected = 0;
-    else if (gameSelection.selected >= savedGames.length) // happens when deleting the last saved game
-        gameSelection.selected = savedGames.length - 1;
+    else if (gameSelection.selected >= g_SavedGamesMetadata.length) // happens when deleting the last saved game
+        gameSelection.selected = g_SavedGamesMetadata.length - 1;
     else
-        selectionChanged();
+        gameSelection.selected = g_SavedGamesMetadata.findIndex(metadata => metadata.id == selectedGameId);
 
     Engine.GetGUIObjectByName("deleteGameButton").tooltip = deleteTooltip();
 }

binaries/data/mods/public/gui/savedgames/load.xml

@@ -14 +14 @@
     <!-- Add a translucent black background to fade out the menu page -->
     <object type="image" z="0" sprite="BackgroundTranslucent"/>
 
-    <object type="image" style="ModernDialog" size="50%-420 50%-325 50%+420 50%+325">
+    <object type="image" style="ModernDialog" size="50%-460 50%-325 50%+460 50%+325">
 
         <object type="text" style="TitleText" size="50%-128 -18 50%+128 14">
             <translatableAttribute id="caption">Load Game</translatableAttribute>
         </object>
 
-        <object type="image" size="0 20 550 100%">
-            <object name="gameSelection" style="ModernList" type="list" size="24 12 100%-24 100%-90">
+        <object type="image" size="0 20 630 100%">
+            <object name="gameSelection"
+                selected_column="date"
+                selected_column_order="-1"
+                sortable="true"
+                size="24 4 100%-24 100%-70"
+                sprite_asc="ModernArrowDown"
+                sprite_desc="ModernArrowUp"
+                sprite_not_sorted="ModernNotSorted"
+                style="ModernList"
+                type="olist"
+            >
                 <action on="SelectionChange">selectionChanged();</action>
+                <action on="SelectionColumnChange">init();</action>
+                <action on="mouseleftdoubleclickitem">loadGame();</action>
+
+                <column id="date" color="255 255 255" width="25%">
+                    <translatableAttribute id="heading" context="replay">Date / Time</translatableAttribute>
+                </column>
+
+                <column id="mapType" color="255 255 255" width="15%">
+                    <translatableAttribute id="heading" context="replay">Map Type</translatableAttribute>
+                </column>
+
+                <column id="mapName" color="255 255 255" width="35%">
+                    <translatableAttribute id="heading" context="replay">Map Name</translatableAttribute>
+                </column>
+
+                <column id="description" color="255 255 255" width="25%">
+                    <translatableAttribute id="heading" context="replay">Description</translatableAttribute>
+                </column>
             </object>
 
+            <object name="gameSelectionFeedback" size="24 12 100%-24 100" type="text" style="ModernLabelText" hidden="true">
+                <translatableAttribute id="caption">No saved games found.</translatableAttribute>
+            </object>
+
             <object type="button" size="0%+25 100%-60 33%+10 100%-32" style="StoneButton" hotkey="cancel">
                 <translatableAttribute id="caption">Cancel</translatableAttribute>
                 <action on="Press">Engine.PopGuiPage();</action>
@@ -42 +74 @@
 
         </object>
 
-        <object name="validGame" type="image" size="550 20 100%-20 100%">
+        <object name="filterPanel" size="630 25 100%-20 60">
+            <object name="compatibilityFilter" type="checkbox" checked="false" style="ModernTickBox" size="0 0 20 20">
+                <action on="Press">init();</action>
+            </object>
+
+            <object type="text" size="25 0 100% 100%" text_align="left" textcolor="white">
+                <translatableAttribute id="caption">Filter compatible saved games</translatableAttribute>
+            </object>
+        </object>
+
+        <object name="validGame" type="image" size="630 60 100%-20 100%">
+            <object size="0 0 100%-15 1" type="image" sprite="ModernWhiteLine" z="25" />
             <object name="savedMapName" size="0 0 100% 20" type="text" style="ModernLabelText" />
             <object name="savedInfoPreview" size="20 20 240 240" type="image" sprite="" />
 
@@ -76 +119 @@
             <object size="0 100%-32 100%-15 100%-31" type="image" sprite="ModernWhiteLine" z="25" />
         </object>
 
-        <object name="invalidGame" size="570 55 790 155" type="image" sprite="logo" />
+        <object name="invalidGame" size="650 105 870 205" type="image" sprite="logo" />
     </object>
 
 </objects>