- Added XML storage for Random Presets

Client/UfrmMain.lfm

@@ -3,7 +3,7 @@ object frmMain: TfrmMain
   Height = 603
   Top = 135
   Width = 766
-  ActiveControl = cbTerrain
+  ActiveControl = oglGameWindow
   Caption = 'UO CentrED'
   ClientHeight = 580
   ClientWidth = 766
@@ -531,6 +531,7 @@ object frmMain: TfrmMain
           BorderSpacing.Bottom = 4
           ItemHeight = 0
           OnChange = cbRandomPresetChange
+          Sorted = True
           Style = csDropDownList
           TabOrder = 1
         end
@@ -820,7 +821,7 @@ object frmMain: TfrmMain
           item
             Position = 1
             Text = 'Name'
-            Width = 133
+            Width = 131
           end>
         Header.DefaultHeight = 17
         Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoVisible]

Client/UfrmMain.pas

@@ -304,7 +304,8 @@ type
     FVLayerMaterial: TMaterial;
     FOverlayUI: TOverlayUI;
     FLocationsFile: string;
-    FRandomPresetLocation: string;
+    FRandomPresetsFile: string;
+    FRandomPresetsDoc: TXMLDocument;
     FLastDraw: TDateTime;
     FAccessChangedListeners: array of TAccessChangedListener;
     FRepaintNeeded: Boolean;
@@ -314,6 +315,7 @@ type
     { Methods }
     procedure BuildTileList;
     function  ConfirmAction: Boolean;
+    function  FindRandomPreset(AName: String): TDOMElement;
     procedure ForceUpdateCurrentTile;
     procedure GetDrawOffset(ARelativeX, ARelativeY: Integer; out DrawX,
       DrawY: Integer); inline;
@@ -322,6 +324,7 @@ type
     procedure InitRender;
     procedure InitSize;
     procedure LoadLocations;
+    procedure LoadRandomPresets;
     procedure MoveBy(AOffsetX, AOffsetY: Integer); inline;
     procedure PrepareMapCell(AMapCell: TMapCell);
     procedure PrepareScreenBlock(ABlockInfo: PBlockInfo);
@@ -330,6 +333,7 @@ type
     procedure RebuildScreenBuffer;
     procedure Render;
     procedure SaveLocations;
+    procedure SaveRandomPresets;
     procedure SetCurrentTile(const AValue: TWorldItem);
     procedure SetDarkLights; inline;
     procedure SetNormalLights; inline;
@@ -835,8 +839,6 @@ begin
 end;
 
 procedure TfrmMain.FormCreate(Sender: TObject);
-var
-  searchRec: TSearchRec;
 begin
   FAppDir := IncludeTrailingPathDelimiter(ExtractFilePath(Application.ExeName));
   FConfigDir := GetAppConfigDir(False);
@@ -888,17 +890,8 @@ begin
   FVirtualTiles := TWorldItemList.Create(True);
   FUndoList := TPacketList.Create(True);
 
-  FRandomPresetLocation := FConfigDir + 'RandomPresets' + PathDelim;
+  FRandomPresetsFile := FConfigDir + 'RandomPresets.xml';
-  if not DirectoryExists(FRandomPresetLocation) then
+  LoadRandomPresets;
-    CreateDir(FRandomPresetLocation);
-
-  if FindFirst(FRandomPresetLocation + '*.dat', faAnyFile, searchRec) = 0 then
-  begin
-    repeat
-      cbRandomPreset.Items.Add(ChangeFileExt(searchRec.Name, ''));
-    until FindNext(searchRec) <> 0;
-  end;
-  FindClose(searchRec);
 
   DoubleBuffered := True;
   pnlBottom.DoubleBuffered := True;
@@ -912,10 +905,13 @@ begin
 end;
 
 procedure TfrmMain.btnRandomPresetDeleteClick(Sender: TObject);
+var
+  preset: TDOMElement;
 begin
   if cbRandomPreset.ItemIndex > -1 then
   begin
-    DeleteFile(FRandomPresetLocation + cbRandomPreset.Text + '.dat');
+    preset := TDOMElement(cbRandomPreset.Items.Objects[cbRandomPreset.ItemIndex]);
+    FRandomPresetsDoc.DocumentElement.RemoveChild(preset);
     cbRandomPreset.Items.Delete(cbRandomPreset.ItemIndex);
     cbRandomPreset.ItemIndex := -1;
   end;
@@ -923,39 +919,65 @@ end;
 
 procedure TfrmMain.btnRandomPresetSaveClick(Sender: TObject);
 var
-  fileName: string;
+  presetName: string;
-  index: Integer;
+  i, index: Integer;
+  preset, tile: TDOMElement;
+  children: TDOMNodeList;
+  tileNode: PVirtualNode;
+  tileInfo: PTileInfo;
 begin
-  fileName := cbRandomPreset.Text;
+  presetName := cbRandomPreset.Text;
-  if InputQuery('Save Preset', 'Enter the name of the preset:', fileName) then
+  if InputQuery('Save Preset', 'Enter the name of the preset:', presetName) then
   begin
-    vdtRandom.SaveToFile(FRandomPresetLocation + fileName + '.dat');;
+    preset := FindRandomPreset(presetName);
-    index := cbRandomPreset.Items.IndexOf(fileName);
+    if preset = nil then
-    if index = -1 then
     begin
-      cbRandomPreset.Items.Add(fileName);
+      preset := FRandomPresetsDoc.CreateElement('Preset');
-      index := cbRandomPreset.Items.Count - 1;
+      preset.AttribStrings['Name'] := presetName;
+      FRandomPresetsDoc.DocumentElement.AppendChild(preset);
+      cbRandomPreset.Items.AddObject(presetName, preset);
+    end else
+    begin
+      children := preset.ChildNodes;
+      for i := children.Count - 1 downto 0 do
+        preset.RemoveChild(children[i]);
     end;
-    cbRandomPreset.ItemIndex := index;
+
+    tileNode := vdtRandom.GetFirst;
+    while tileNode <> nil do
+    begin
+      tileInfo := vdtRandom.GetNodeData(tileNode);
+      tile := FRandomPresetsDoc.CreateElement('Tile');
+      tile.AttribStrings['ID'] := IntToStr(tileInfo^.ID);
+      preset.AppendChild(tile);
+      tileNode := vdtRandom.GetNext(tileNode);
+    end;
+
+    cbRandomPreset.ItemIndex := cbRandomPreset.Items.IndexOfObject(preset);
   end;
 end;
 
 procedure TfrmMain.cbRandomPresetChange(Sender: TObject);
+var
+  preset, tile: TDOMElement;
+  tiles: TDOMNodeList;
+  tileNode: PVirtualNode;
+  tileInfo: PTileInfo;
+  i: Integer;
 begin
   if cbRandomPreset.ItemIndex > -1 then
   begin
-    try
+    vdtRandom.Clear;
-      vdtRandom.LoadFromFile(FRandomPresetLocation + cbRandomPreset.Text + '.dat');
+    preset := TDOMElement(cbRandomPreset.Items.Objects[cbRandomPreset.ItemIndex]);
-    except
+    tiles := preset.ChildNodes;
-      on EVirtualTreeError do
+    for i := 0 to tiles.Count - 1 do
+    begin
+      tile := TDOMElement(tiles[i]);
+      if tile.NodeName = 'Tile' then
       begin
-        if MessageDlg('Error', 'The profile could not be loaded. Most likely it is an' + LineEnding +
+        tileNode := vdtRandom.AddChild(nil);
-          'outdated version or the file is damaged.' + LineEnding + LineEnding +
+        tileInfo := vdtRandom.GetNodeData(tileNode);
-          'Should this profile be deleted now?', mtError, [mbYes, mbNo], 0) = mrYes then
+        tileInfo^.ID := StrToInt(tile.AttribStrings['ID']);
-        begin
-          DeleteFile(FRandomPresetLocation + cbRandomPreset.Text + '.dat');
-          cbRandomPreset.Items.Delete(cbRandomPreset.ItemIndex);
-        end;
       end;
     end;
   end;
@@ -1185,6 +1207,7 @@ begin
   SelectedTile := nil;
 
   SaveLocations;
+  SaveRandomPresets;
 
   FreeAndNil(FTextureManager);
   FreeAndNil(FScreenBuffer);
@@ -1194,6 +1217,7 @@ begin
   FreeAndNil(FVirtualTiles);
   FreeAndNil(FUndoList);
   FreeAndNil(FGLFont);
+  FreeAndNil(FRandomPresetsDoc);
   
   RegisterPacketHandler($0C, nil);
 end;
@@ -1913,19 +1937,22 @@ begin
       for i := 0 to locations.Count - 1 do
       begin
         location := TDOMElement(locations[i]);
-        locationNode := vstLocations.AddChild(nil);
+        if location.NodeName = 'Location' then
-        locationInfo := vstLocations.GetNodeData(locationNode);
+        begin
-        locationInfo^.Name := location.AttribStrings['Name'];
+          locationNode := vstLocations.AddChild(nil);
+          locationInfo := vstLocations.GetNodeData(locationNode);
+          locationInfo^.Name := location.AttribStrings['Name'];
 
-        if TryStrToInt(location.AttribStrings['X'], j) then
+          if TryStrToInt(location.AttribStrings['X'], j) then
-          locationInfo^.X := j
+            locationInfo^.X := j
-        else
+          else
-          locationInfo^.X := 0;
+            locationInfo^.X := 0;
 
-        if TryStrToInt(location.AttribStrings['Y'], j) then
+          if TryStrToInt(location.AttribStrings['Y'], j) then
-          locationInfo^.Y := j
+            locationInfo^.Y := j
-        else
+          else
-          locationInfo^.Y := 0;
+            locationInfo^.Y := 0;
+        end;
       end;
     end;
 
@@ -1933,6 +1960,33 @@ begin
   end;
 end;
 
+procedure TfrmMain.LoadRandomPresets;
+var
+  presets: TDOMNodeList;
+  i: Integer;
+begin
+  cbRandomPreset.Clear;
+
+  FreeAndNil(FRandomPresetsDoc);
+  if FileExists(FRandomPresetsFile) then
+  begin
+    ReadXMLFile(FRandomPresetsDoc, FRandomPresetsFile);
+    presets := FRandomPresetsDoc.DocumentElement.ChildNodes;
+    for i := 0 to presets.Count - 1 do
+    begin
+      if presets[i].NodeName = 'Preset' then
+      begin
+        cbRandomPreset.Items.AddObject(TDOMElement(presets[i]).AttribStrings['Name'],
+          presets[i]);
+      end;
+    end;
+  end else
+  begin
+    FRandomPresetsDoc := TXMLDocument.Create;
+    FRandomPresetsDoc.AppendChild(FRandomPresetsDoc.CreateElement('RandomPresets'));
+  end;
+end;
+
 procedure TfrmMain.MoveBy(AOffsetX, AOffsetY: Integer); inline;
 begin
   SetPos(EnsureRange(FX + AOffsetX, 0, FLandscape.CellWidth - 1),
@@ -2276,6 +2330,11 @@ begin
   xmlDoc.Free;
 end;
 
+procedure TfrmMain.SaveRandomPresets;
+begin
+  WriteXMLFile(FRandomPresetsDoc, FRandomPresetsFile);
+end;
+
 procedure TfrmMain.OnLandscapeChanged;
 begin
   InvalidateScreenBuffer;
@@ -2896,6 +2955,25 @@ begin
     oglGameWindowMouseLeave(nil);
 end;
 
+function TfrmMain.FindRandomPreset(AName: String): TDOMElement;
+var
+  preset: TDOMElement;
+  presets: TDOMNodeList;
+  i: Integer;
+begin
+  presets := FRandomPresetsDoc.DocumentElement.ChildNodes;
+  Result := nil;
+  i := 0;
+  while (i < presets.Count) and (Result = nil) do
+  begin
+    preset := TDOMElement(presets[i]);
+    if SameText(preset.AttribStrings['Name'], AName) then
+      Result := preset
+    else
+      Inc(i);
+  end;
+end;
+
 procedure TfrmMain.ForceUpdateCurrentTile;
 begin
   CurrentTile := nil;