Changeset 240 for trunk

Timestamp:

May 18, 2020, 2:28:16 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Saved and predefined maps were not correctly copied from application directory to user home data directory.

Location:

trunk

Files:

• Install/win/Common.iss (modified) (2 diffs)
• Packages/CevoComponents/Directories.pas (modified) (2 diffs)

trunk/Install/win/Common.iss

@@ -73 +73 @@
 Source: "{#MyAppSubDir}\Sounds\*.*"; DestDir: "{app}\Sounds"; Flags: ignoreversion; Components: main
 Source: "{#MyAppSubDir}\Tribes\*.*"; DestDir: "{app}\Tribes"; Flags: ignoreversion; Components: main
+Source: "{#MyAppSubDir}\Saved\*.*"; DestDir: "{app}\Saved"; Flags: ignoreversion; Components: main
+Source: "{#MyAppSubDir}\Maps\*.*"; DestDir: "{app}\Maps"; Flags: ignoreversion; Components: maps
 Source: "{#MyAppSubDir}\Localization\cs\*.*"; DestDir: "{app}\Localization\cs"; Flags: ignoreversion recursesubdirs; Components: lang\cs
 Source: "{#MyAppSubDir}\Localization\de\*.*"; DestDir: "{app}\Localization\de"; Flags: ignoreversion recursesubdirs; Components: lang\de
@@ -86 +88 @@
 Source: "{#MyAppSubDir}\AI\StdAI\StdAI.png"; DestDir: "{app}\AI\StdAI"; Flags: ignoreversion; Components: ai\stdai
 Source: "{#MyAppSubDir}\AI\StdAI\StdAI.ai.txt"; DestDir: "{app}\AI\StdAI"; Flags: ignoreversion; Components: ai\stdai
-Source: "{#MyAppSubDir}\Maps\*.*"; DestDir: "{localappdata}\c-evo\Maps"; Flags: ignoreversion; Components: maps
-Source: "{#MyAppSubDir}\Saved\*.*"; DestDir: "{localappdata}\c-evo\Saved"; Flags: ignoreversion; Components: main
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

trunk/Packages/CevoComponents/Directories.pas

@@ -63 +63 @@
 end;
 
+procedure CopyDir(SourceDir, DestinationDir, Filter: string);
+var
+  Src, Dst: TSearchRec;
+begin
+  if not DirectoryExists(DestinationDir) then CreateDir(DestinationDir);
+  if FindFirst(SourceDir + DirectorySeparator + Filter, $21, Src) = 0 then
+    repeat
+      if (FindFirst(DestinationDir + DirectorySeparator + Src.Name, $21, Dst) <> 0) or
+        (Dst.Time < Src.Time) then
+        CopyFile(SourceDir + DirectorySeparator + Src.Name,
+          DestinationDir + DirectorySeparator + Src.Name, false);
+      FindClose(Dst);
+    until FindNext(Src) <> 0;
+  FindClose(Src);
+end;
+
 procedure UnitInit;
 var
   AppDataDir: string;
-  src, dst: TSearchRec;
 begin
   LocaleCode := '';
@@ -79 +94 @@
     DataDir := AppDataDir;
   end;
-  if not DirectoryExists(GetSavedDir) then CreateDir(GetSavedDir);
-  if not DirectoryExists(GetMapsDir) then CreateDir(GetMapsDir);
 
-  // Copy appdata if not done yet
-  if FindFirst(GetSavedDir(True) + DirectorySeparator + '*.cevo', $21, src) = 0 then
-    repeat
-      if (FindFirst(GetSavedDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
-        (dst.Time < src.Time) then
-        CopyFile(PChar(GetSavedDir(True) + DirectorySeparator + src.Name),
-          PChar(GetSavedDir(True) + DirectorySeparator + src.Name), false);
-      FindClose(dst);
-    until FindNext(src) <> 0;
-  FindClose(src);
-
-  // Copy appdata if not done yet
-  if FindFirst(GetMapsDir(True) + DirectorySeparator + '*.*', $21, src) = 0 then
-    repeat
-      if (FindFirst(GetMapsDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
-        (dst.Time < src.Time) then
-        CopyFile(PChar(GetMapsDir(True) + DirectorySeparator + src.Name),
-          PChar(GetMapsDir(True) + DirectorySeparator + src.Name), false);
-      FindClose(dst);
-    until FindNext(src) <> 0;
-  FindClose(src);
+  CopyDir(GetSavedDir(True), GetSavedDir(False), '*.*');
+  CopyDir(GetMapsDir(True), GetMapsDir(False), '*.*');
 end;