Changeset 20 for trunk/ScreenTools.pas

Timestamp:

Jan 8, 2017, 12:23:55 PM (7 years ago)

Author:

chronos

Message:

• Fixed: More linux platform fixes.
• Fixed: Use correct DirectorySeparator.

File:

• trunk/ScreenTools.pas (modified) (7 diffs)

trunk/ScreenTools.pas

@@ -249 +249 @@
     (WAVFileName <> '*');
   if result then
-    // SndPlaySound(pchar(HomeDir+'Sounds\'+WAVFileName+'.wav'),SND_ASYNC)
-    PlaySound(HomeDir + 'Sounds\' + WAVFileName)
+    // SndPlaySound(pchar(HomeDir+'Sounds' +DirectorySeparator+WAVFileName+'.wav'),SND_ASYNC)
+    PlaySound(HomeDir + 'Sounds' + DirectorySeparator + WAVFileName)
 {$ENDIF}
 end;
@@ -267 +267 @@
   if (WAVFileName <> '') and (WAVFileName[1] <> '[') and (WAVFileName <> '*')
   then
-    PrepareSound(HomeDir + 'Sounds\' + WAVFileName)
+    PrepareSound(HomeDir + 'Sounds' + DirectorySeparator + WAVFileName)
 {$ENDIF}
 end;
@@ -523 +523 @@
   if i = nGrExt then
   begin
-    FileName := HomeDir + 'Graphics\' + Name;
-    Source := TBitmap.create;
+    FileName := HomeDir + 'Graphics' + DirectorySeparator + Name + '.bmp';
+    Source := TBitmap.Create;
     try
-      Source.loadfromfile(FileName + '.bmp')
+      Source.LoadFromFile(FileName)
     except
-      result := -1;
+      Result := -1;
       Application.MessageBox(PChar(Format(Phrases.Lookup('FILENOTFOUND'),
-        ['Graphics\' + Name])), 'C-evo', 0);
+        [FileName])), 'C-evo', 0);
       exit;
     end;
@@ -1438 +1438 @@
         begin
           MainTextureAge := Age;
-          LoadGraphicFile(Image, HomeDir + 'Graphics\Texture' +
+          LoadGraphicFile(Image, HomeDir + 'Graphics' + DirectorySeparator + 'Texture' +
             IntToStr(Age + 1), gfJPG);
           clBevelLight := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelLight];
@@ -1495 +1495 @@
 Phrases2 := TStringTable.create;
 Phrases2FallenBackToEnglish := false;
-if FileExists(DataDir + 'Localization\Language.txt') then
-begin
-  Phrases.loadfromfile(DataDir + 'Localization\Language.txt');
-  if FileExists(DataDir + 'Localization\Language2.txt') then
-    Phrases2.loadfromfile(DataDir + 'Localization\Language2.txt')
+if FileExists(DataDir + 'Localization' + DirectorySeparator + 'Language.txt') then
+begin
+  Phrases.loadfromfile(DataDir + 'Localization' + DirectorySeparator + ' + Language.txt');
+  if FileExists(DataDir + 'Localization' + DirectorySeparator + 'Language2.txt') then
+    Phrases2.loadfromfile(DataDir + 'Localization' + DirectorySeparator + 'Language2.txt')
   else
   begin
@@ -1513 +1513 @@
 
 Sounds := TStringTable.create;
-if not Sounds.loadfromfile(HomeDir + 'Sounds\sound.txt') then
+if not Sounds.loadfromfile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.txt') then
 begin
   Sounds.Free;
@@ -1578 +1578 @@
 HGrSystem2 := LoadGraphicSet('System2');
 Templates := TBitmap.create;
-LoadGraphicFile(Templates, HomeDir + 'Graphics\Templates', gfNoGamma);
+LoadGraphicFile(Templates, HomeDir + 'Graphics' + DirectorySeparator + 'Templates', gfNoGamma);
 Templates.PixelFormat := pf24bit;
 Colors := TBitmap.create;
-LoadGraphicFile(Colors, HomeDir + 'Graphics\Colors');
+LoadGraphicFile(Colors, HomeDir + 'Graphics' + DirectorySeparator + 'Colors');
 Paper := TBitmap.create;
-LoadGraphicFile(Paper, HomeDir + 'Graphics\Paper', gfJPG);
+LoadGraphicFile(Paper, HomeDir + 'Graphics' + DirectorySeparator + 'Paper', gfJPG);
 BigImp := TBitmap.create;
-LoadGraphicFile(BigImp, HomeDir + 'Graphics\Icons');
+LoadGraphicFile(BigImp, HomeDir + 'Graphics' + DirectorySeparator + 'Icons');
 MainTexture.Image := TBitmap.create;
 MainTextureAge := -2;