Changeset 648

Timestamp:

Feb 19, 2025, 9:43:42 AM (3 days ago)

Author:

chronos

Message:

• Fixed: Tribes were not propertly detected in usr/share/c-evo directory.

Location:

trunk

Files:

• Brain.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/CevoComponents/Directories.pas (modified) (7 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (2 diffs)
• Start.pas (modified) (3 diffs)

trunk/Brain.pas

@@ -80 +80 @@
   TextSize: TSize;
 begin
-  if not LoadGraphicFile(Picture, GetAiDir + DirectorySeparator +
-    FileName + DirectorySeparator + FileName + '.png', [gfNoError]) then begin
+  if not LoadGraphicFile(Picture, GetAiDir + DirectorySeparator + FileName + DirectorySeparator + FileName + '.png', [gfNoError]) then begin
     with Picture.Canvas do begin
       Brush.Color := $904830;

trunk/LocalPlayer/Help.pas

@@ -1982 +1982 @@
       if Category = hkInternet then
         case Index of
-          1: OpenDocument(GetAppShareFile(AITemplateFileName));
+          1: OpenDocument(GetAppSharePath(AITemplateFileName));
           2: OpenURL(CevoHomepage);
           3: OpenURL(CevoContact);

trunk/LocalPlayer/TechTree.pas

@@ -176 +176 @@
     Image := TBitmap.Create;
     Image.PixelFormat := TPixelFormat.pf24bit;
-    LoadGraphicFile(Image, GetAppShareFile('Help' + DirectorySeparator + 'AdvTree.png'),
+    LoadGraphicFile(Image, GetAppSharePath('Help' + DirectorySeparator + 'AdvTree.png'),
       [gfNoGamma]);
 

trunk/LocalPlayer/Term.pas

@@ -1386 +1386 @@
     if AILogo[P] = nil then
       AILogo[P] := TBitmap.Create;
-    if not LoadGraphicFile(AILogo[P], GetAppShareFile(Name + '.png'), [gfNoError]) then
+    if not LoadGraphicFile(AILogo[P], GetAppSharePath(Name + '.png'), [gfNoError]) then
     begin
       FreeAndNil(AILogo[P]);

trunk/Packages/CevoComponents/Directories.pas

@@ -15 +15 @@
 function GetSoundsDir: string;
 function GetAiDir: string;
-function GetAppShareDir(Dir: string): string;
-function GetAppShareFile(FileName: string): string;
+function GetAppSharePath(Path: string): string;
 
 
@@ -24 +23 @@
   FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils, LazFileUtils, Forms;
 
-function GetAppShareDir(Dir: string): string;
+function GetAppSharePath(Path: string): string;
 {$IFDEF UNIX}
 var
-  NewDir: string;
+  NewPath: string;
 {$ENDIF}
 begin
-  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
+  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Path;
   {$IFDEF UNIX}
   // If installed in Linux system then try to use different installation directory
   if not DirectoryExists(Result) then begin
-    NewDir := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
       DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
-    if DirectoryExists(NewDir) then Result := NewDir;
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
+    if DirectoryExists(NewPath) then begin
+      Result := NewPath;
+      Exit;
+    end;
   end;
-  {$ENDIF}
-end;
-
-function GetAppShareFile(FileName: string): string;
-{$IFDEF UNIX}
-var
-  NewFile: string;
-{$ENDIF}
-begin
-  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + FileName;
-  {$IFDEF UNIX}
-  // If installed in Linux system then try to use different installation directory
   if not FileExists(Result) then begin
-    NewFile := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
       DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + FileName;
-    if FileExists(NewFile) then Result := NewFile;
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
+    if FileExists(NewPath) then begin
+      Result := NewPath;
+      Exit;
+    end;
   end;
   {$ENDIF}
@@ -94 +87 @@
 
   if LocaleCode <> 'en' then begin
-    Result := GetAppShareFile('Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path);
+    Result := GetAppSharePath('Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path);
     if not DirectoryExists(Result) and not FileExists(Result) then
-      Result := GetAppShareFile(Path);
-  end else Result := GetAppShareFile(Path);
+      Result := GetAppSharePath(Path);
+  end else Result := GetAppSharePath(Path);
 end;
 
@@ -131 +124 @@
 
   AppDataDir := GetAppConfigDir(False);
-  if AppDataDir = '' then DataDir := GetAppShareDir('')
+  if AppDataDir = '' then DataDir := GetAppSharePath('')
   else begin
     if not DirectoryExists(AppDataDir) then ForceDirectories(AppDataDir);
@@ -141 +134 @@
 function GetSavedDir(Home: Boolean = False): string;
 begin
-  if Home then Result := GetAppShareDir('Saved')
+  if Home then Result := GetAppSharePath('Saved')
     else Result := DataDir + 'Saved';
 end;
@@ -147 +140 @@
 function GetMapsDir(Home: Boolean = False): string;
 begin
-  if Home then Result := GetAppShareDir('Maps')
+  if Home then Result := GetAppSharePath('Maps')
     else Result := DataDir + 'Maps';
 end;
@@ -153 +146 @@
 function GetGraphicsDir: string;
 begin
-  Result := GetAppShareDir('Graphics');
+  Result := GetAppSharePath('Graphics');
 end;
 
 function GetSoundsDir: string;
 begin
-  Result := GetAppShareDir('Sounds');
+  Result := GetAppSharePath('Sounds');
 end;
 
 function GetAiDir: string;
 begin
-  Result := GetAppShareDir('AI');
+  Result := GetAppSharePath('AI');
 end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -1609 +1609 @@
     else
     begin
-      Phrases2.LoadFromFile(GetAppShareFile('Language2.txt'));
+      Phrases2.LoadFromFile(GetAppSharePath('Language2.txt'));
       Phrases2FallenBackToEnglish := True;
     end;
@@ -1615 +1615 @@
   else
   begin
-    Phrases.LoadFromFile(GetAppShareFile('Language.txt'));
-    Phrases2.LoadFromFile(GetAppShareFile('Language2.txt'));
+    Phrases.LoadFromFile(GetAppSharePath('Language.txt'));
+    Phrases2.LoadFromFile(GetAppSharePath('Language2.txt'));
   end;
 

trunk/Start.pas

@@ -235 +235 @@
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
-  if FileExists(GetAppShareFile(AITemplateFileName)) then
+  if FileExists(GetAppSharePath(AITemplateFileName)) then
     Include(ActionsOffered, maAIDev);
 
@@ -484 +484 @@
     for I := 1 to Languages.Count - 1 do
     with Languages[I] do begin
-      Available := DirectoryExists(GetAppShareDir('Localization' + DirectorySeparator + Code)) or (Code = 'en');
+      Available := DirectoryExists(GetAppSharePath('Localization' + DirectorySeparator + Code)) or (Code = 'en');
     end;
   end;
@@ -1517 +1517 @@
       maManual: DirectHelp(cStartHelp);
       maCredits: DirectHelp(cStartCredits);
-      maAIDev: OpenDocument(GetAppShareFile(AITemplateFileName));
+      maAIDev: OpenDocument(GetAppSharePath(AITemplateFileName));
       maWeb: OpenURL(CevoHomepage);
     end;