Changeset 596 for trunk/Start.pas

Timestamp:

Aug 11, 2024, 9:39:45 PM (3 months ago)

Author:

chronos

Message:

• Modified: Remember last selected map between application restarts.

File:

• trunk/Start.pas (modified) (6 diffs)

trunk/Start.pas

@@ -122 +122 @@
     MiniMap: TMiniMap;
     LastGame: string;
+    LastMap: string;
     procedure DrawAction(Y, IconIndex: Integer; HeaderItem, TextItem: string);
     procedure InitPopup(PlayerIndex: Integer);
@@ -403 +404 @@
     if ValueExists('LastGame') then LastGame := Reg.ReadString('LastGame')
        else LastGame := '';
+    if ValueExists('LastMap') then LastMap := Reg.ReadString('LastMap')
+       else LastMap := '';
     if ValueExists('NetworkEnabled') then NetworkEnabled := Reg.ReadBool('NetworkEnabled')
        else NetworkEnabled := False;
@@ -463 +466 @@
     WriteInteger('StartTab', Integer(ShowTab));
     WriteString('LastGame', LastGame);
+    WriteString('LastMap', LastMap);
     WriteBool('NetworkEnabled', NetworkEnabled);
   finally
@@ -1307 +1311 @@
 procedure TStartDlg.UpdateMaps;
 var
+  I: Integer;
   F: TSearchRec;
 begin
@@ -1317 +1322 @@
   Maps.Sort;
   Maps.Insert(0, Phrases.Lookup('RANMAP'));
-  ListIndex[tbMain] := Maps.IndexOf(ExtractFileNameOnly(MapFileName));
+  I := Maps.IndexOf(LastMap);
+  if I > 0 then begin // Skip random map on index 0
+    ListIndex[tbMap] := I;
+    MapFileName := GetMapsDir + DirectorySeparator + Maps[I] + CevoMapExt;
+  end else ListIndex[tbMap] := Maps.IndexOf(ExtractFileNameOnly(MapFileName));
+  if ListIndex[tbMap] < 0 then
+    ListIndex[tbMap] := 0;
+  ListIndex[tbMain] := ListIndex[tbMap];
   if ListIndex[tbMain] < 0 then
     ListIndex[tbMain] := 0;
@@ -1801 +1813 @@
     LastGame := FormerGames[ListIndex[tbPrevious]]
     else LastGame := '';
+  if (ListIndex[tbMap] >= 0) and (ListIndex[tbMap] < Maps.Count) then
+    LastMap := Maps[ListIndex[tbMap]]
+    else LastMap := '';
 end;