Changeset 381 for trunk

Timestamp:

Apr 25, 2021, 11:00:24 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Error if map without map picture was renamed.
• Fixed: Copy default map files and example saved game only once if such target directories don't exist yet.

Location:

trunk

Files:

• Global.pas (modified) (1 diff)
• Packages/CevoComponents/Directories.pas (modified) (2 diffs)
• Start.pas (modified) (3 diffs)
• UMiniMap.pas (modified) (1 diff)

trunk/Global.pas

@@ -6 +6 @@
   CevoExt = '.cevo';
   CevoMapExt = '.cevomap';
+  CevoMapPictureExt = '.png';
   CevoTribeExt = '.tribe.txt';
   CevoHomepageShort = 'app.zdechov.net/c-evo';

trunk/Packages/CevoComponents/Directories.pas

@@ -79 +79 @@
 end;
 
+procedure CopyFiles;
+begin
+  if DirectoryExists(GetSavedDir(True)) and not DirectoryExists(GetSavedDir(False)) then
+    CopyDir(GetSavedDir(True), GetSavedDir(False), '*.*');
+  if DirectoryExists(GetMapsDir(True)) and not DirectoryExists(GetMapsDir(False)) then
+    CopyDir(GetMapsDir(True), GetMapsDir(False), '*.*');
+end;
+
 procedure UnitInit;
 var
@@ -87 +95 @@
 
   AppDataDir := GetAppConfigDir(False);
-  if AppDataDir = '' then
-    DataDir := HomeDir
-  else
-  begin
+  if AppDataDir = '' then DataDir := HomeDir
+  else begin
     if not DirectoryExists(AppDataDir) then ForceDirectories(AppDataDir);
     DataDir := AppDataDir;
   end;
-
-  CopyDir(GetSavedDir(True), GetSavedDir(False), '*.*');
-  CopyDir(GetMapsDir(True), GetMapsDir(False), '*.*');
+  CopyFiles;
 end;
 

trunk/Start.pas

@@ -1624 +1624 @@
   f: file;
   ok: boolean;
+  MapPictureFileName: string;
 begin
   if List.ItemIndex >= 0 then
@@ -1644 +1645 @@
         begin
           SimpleMessage(Format(Phrases.Lookup('NOFILENAME'), [NewName[i]]));
-          exit
+          Exit;
         end;
       if Page = pgLoad then
@@ -1659 +1660 @@
       except
         // Play('INVALID');
-        ok := false
-      end;
-      if Page <> pgLoad then
-        try // rename map picture
+        ok := False;
+      end;
+      if Page <> pgLoad then begin
+        // Rename map picture
+        MapPictureFileName := GetMapsDir + DirectorySeparator +
+          List.Items[List.ItemIndex] + CevoMapPictureExt;
+        if FileExists(MapPictureFileName) then
+        try
           AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex]
-            + '.png');
-          Rename(f, GetMapsDir + DirectorySeparator + NewName + '.png');
+            + CevoMapPictureExt);
+          Rename(f, GetMapsDir + DirectorySeparator + NewName + CevoMapPictureExt);
         except
         end;
-      if ok then
-      begin
+      end;
+      if ok then begin
         if Page = pgLoad then
           FormerGames[List.ItemIndex] := NewName

trunk/UMiniMap.pas

@@ -115 +115 @@
   ImageFileName: string;
 begin
-  ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + '.png';
+  ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + CevoMapPictureExt;
   Mode := mmPicture;
   if LoadGraphicFile(Bitmap, ImageFileName, [gfNoError]) then