Changeset 20

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Back.pas (modified) (1 diff)
• Directories.pas (modified) (2 diffs)
• Drag.cur (moved) (moved from trunk/drag.cur )
• FlatHand.cur (moved) (moved from trunk/flathand.cur )
• Fonts.txt (moved) (moved from trunk/fonts.txt )
• GameServer.pas (modified) (2 diffs)
• Language.txt (moved) (moved from trunk/language.txt )
• Language2.txt (moved) (moved from trunk/language2.txt )
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (3 diffs)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/PVSB.pas (modified) (2 diffs)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (4 diffs)
• LocalPlayer/Tribes.pas (modified) (3 diffs)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• Messg.pas (modified) (1 diff)
• ScreenTools.pas (modified) (7 diffs)
• Start.pas (modified) (17 diffs)

trunk/Back.pas

@@ -41 +41 @@
   if FullScreen then
   begin
-    if FileExists(HomeDir + 'Graphics\Background.bmp') or
-      FileExists(HomeDir + 'Graphics\Background.png') then
+    if FileExists(HomeDir + 'Graphics' + DirectorySeparator + 'Background.bmp') or
+      FileExists(HomeDir + 'Graphics' + DirectorySeparator + 'Background.png') then
     begin
       img := TBitmap.Create;
-      LoadGraphicFile(img, HomeDir + 'Graphics\Background');
+      LoadGraphicFile(img, HomeDir + 'Graphics' + DirectorySeparator + 'Background');
     end
   end

trunk/Directories.pas

@@ -28 +28 @@
 function LocalizedFilePath(path: string): string;
 begin
-  result := DataDir + 'Localization\' + path;
+  result := DataDir + 'Localization' + DirectorySeparator + path;
   if not FileExists(result) then
     result := HomeDir + path
@@ -52 +52 @@
 
   // Copy appdata if not done yet
-  if FindFirst(HomeDir + 'AppData\Saved\*.cevo', $21, src) = 0 then
+  if FindFirst(HomeDir + 'AppData' + DirectorySeparator + 'Saved' + DirectorySeparator + '*.cevo', $21, src) = 0 then
     repeat
-      if (FindFirst(DataDir + 'Saved\' + src.Name, $21, dst) <> 0) or
+      if (FindFirst(DataDir + 'Saved' + DirectorySeparator + src.Name, $21, dst) <> 0) or
         (dst.Time < src.Time) then
-        CopyFile(PChar(HomeDir + 'AppData\Saved\' + src.Name),
-          PChar(DataDir + 'Saved\' + src.Name), false);
+        CopyFile(PChar(HomeDir + 'AppData' + DirectorySeparator + 'Saved' + DirectorySeparator + src.Name),
+          PChar(DataDir + 'Saved' + DirectorySeparator + src.Name), false);
     until FindNext(src) <> 0;
 end;

trunk/GameServer.pas

@@ -530 +530 @@
   s: string[255];
 begin
-  MapFile := TFileStream.Create(DataDir + 'Maps\' + FileName,
+  MapFile := TFileStream.Create(DataDir + 'Maps' + DirectorySeparator + FileName,
     fmCreate or fmShareExclusive);
   MapFile.Position := 0;
@@ -553 +553 @@
   MapFile := nil;
   try
-    MapFile := TFileStream.Create(DataDir + 'Maps\' + FileName,
+    MapFile := TFileStream.Create(DataDir + 'Maps' + DirectorySeparator + FileName,
       fmOpenRead or fmShareExclusive);
     MapFile.Position := 0;

trunk/LocalPlayer/CityScreen.pas

@@ -216 +216 @@
   Back.Height := ClientHeight;
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics\City', gfNoGamma);
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'City', gfNoGamma);
   Template.PixelFormat := pf8bit;
   CityMapTemplate := TBitmap.Create;
-  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics\BigCityMap', gfNoGamma);
+  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'BigCityMap', gfNoGamma);
   CityMapTemplate.PixelFormat := pf8bit;
   SmallCityMapTemplate := TBitmap.Create;
-  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics\SmallCityMap',
+  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'SmallCityMap',
     gfNoGamma);
   SmallCityMapTemplate.PixelFormat := pf24bit;

trunk/LocalPlayer/Draft.pas

@@ -91 +91 @@
   Back.Height := ClientHeight;
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics\MiliRes', gfNoGamma);
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes', gfNoGamma);
   Template.PixelFormat := pf8bit;
 end;

trunk/LocalPlayer/Help.pas

@@ -1165 +1165 @@
     List := TStringList.Create;
     plus := TStringList.Create;
-    if FindFirst(HomeDir + 'Graphics\*.credits.txt', $27, sr) = 0 then
+    if FindFirst(HomeDir + 'Graphics' + DirectorySeparator + '*.credits.txt', $27, sr) = 0 then
       repeat
-        plus.LoadFromFile(HomeDir + 'Graphics\' + sr.Name);
+        plus.LoadFromFile(HomeDir + 'Graphics' + DirectorySeparator + sr.Name);
         List.AddStrings(plus);
       until FindNext(sr) <> 0;
@@ -1199 +1199 @@
   begin
     List := TStringList.Create;
-    List.LoadFromFile(HomeDir + 'Sounds\sound.credits.txt');
+    List.LoadFromFile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.credits.txt');
     for i := 0 to List.Count - 1 do
     begin
@@ -1913 +1913 @@
         case Link and $FF of
           1:
-             OpenDocument(pchar(HomeDir + 'AI Template\AI development manual.html'));{ *Převedeno z ShellExecute* }
+             OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));{ *Převedeno z ShellExecute* }
           2:
             OpenURL('http://c-evo.org');{ *Převedeno z ShellExecute* }

trunk/LocalPlayer/NatStat.pas

@@ -92 +92 @@
   Back.Height := ClientHeight;
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics\Nation', gfNoGamma);
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Nation', gfNoGamma);
   Template.PixelFormat := pf8bit;
 end;

trunk/LocalPlayer/PVSB.pas

@@ -41 +41 @@
 procedure InitPVSB;
 begin
+  {$IFDEF WINDOWS}
   with sb.si do
   begin
@@ -54 +55 @@
   else
     ShowWindow(sb.h, SW_SHOW)
+  {$ENDIF}
 end;
 

trunk/LocalPlayer/TechTree.pas

@@ -130 +130 @@
   begin
     Image := TBitmap.Create;
-    LoadGraphicFile(Image, HomeDir + 'Help\AdvTree', gfNoGamma);
+    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree', gfNoGamma);
     Image.PixelFormat := pf24bit;
 

trunk/LocalPlayer/Term.pas

@@ -733 +733 @@
 function CreateTribe(p: integer; FileName: string; Original: boolean): boolean;
 begin
-  if not FileExists(LocalizedFilePath('Tribes\' + FileName + '.tribe.txt')) then
+  if not FileExists(LocalizedFilePath('Tribes' + DirectorySeparator + FileName + '.tribe.txt')) then
   begin
     result := false;
@@ -1272 +1272 @@
     begin
       UnusedTribeFiles.Clear;
-      ok := FindFirst(DataDir + 'Localization\' + 'Tribes\*.tribe.txt',
+      ok := FindFirst(DataDir + 'Localization' + DirectorySeparator + 'Tribes' + DirectorySeparator + '*.tribe.txt',
         faArchive + faReadOnly, SearchRec) = 0;
       if not ok then
       begin
         FindClose(SearchRec);
-        ok := FindFirst(HomeDir + 'Tribes\*.tribe.txt', faArchive + faReadOnly,
+        ok := FindFirst(HomeDir + 'Tribes' + DirectorySeparator + '*.tribe.txt', faArchive + faReadOnly,
           SearchRec) = 0;
       end;
@@ -3410 +3410 @@
     doinit := true;
     if Reg.KeyExists('SOFTWARE\cevo\RegVer9') then
-    begin
+    with Reg do begin
       doinit := false;
-      Reg.OpenKey('SOFTWARE\cevo\RegVer9', false);
+      OpenKey('SOFTWARE\cevo\RegVer9', false);
       try
-        xxt := Reg.ReadInteger('TileWidth') div 2;
-        yyt := Reg.ReadInteger('TileHeight') div 2;
-        OptionChecked := Reg.ReadInteger('OptionChecked');
-        MapOptionChecked := Reg.ReadInteger('MapOptionChecked');
-        CityRepMask := Cardinal(Reg.ReadInteger('CityReport'));
+        if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2;
+        if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2;
+        if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked');
+        if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked');
+        if ValueExists('CityMapMask') then CityRepMask := Cardinal(ReadInteger('CityReport'));
       except
         doinit := true;
       end;
-      Reg.closekey;
+      CloseKey;
       if OptionChecked and (7 shl 16) = 0 then
         OptionChecked := OptionChecked or (1 shl 16);
@@ -3457 +3457 @@
     i, j: integer;
   begin
+    {$IFDEF WINDOWS}{TODO}
     Screen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
     Screen.Cursors[crFlatHand] := LoadCursor(HInstance, 'FLATHAND');
+    {$ENDIF}
 
     // tag-controlled language

trunk/LocalPlayer/Tribes.pas

@@ -81 +81 @@
     begin
       StdUnitScript := tstringlist.Create;
-      StdUnitScript.LoadFromFile(LocalizedFilePath('Tribes\StdUnits.txt'));
+      StdUnitScript.LoadFromFile(LocalizedFilePath('Tribes' + DirectorySeparator + 'StdUnits.txt'));
       nPictureList := 0;
       PictureList := nil;
@@ -244 +244 @@
     Color := $FFFFFF;
     found := 0;
-    AssignFile(TribeScript, LocalizedFilePath('Tribes\' + FileName +
+    AssignFile(TribeScript, LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
       '.tribe.txt'));
     Reset(TribeScript);
@@ -280 +280 @@
       Name[variant] := '';
     Script := tstringlist.Create;
-    Script.LoadFromFile(LocalizedFilePath('Tribes\' + FileName + '.tribe.txt'));
+    Script.LoadFromFile(LocalizedFilePath('Tribes' + DirectorySeparator + FileName + '.tribe.txt'));
     CityLine0 := 0;
     nCityLines := 0;

trunk/LocalPlayer/UnitStat.pas

@@ -83 +83 @@
   Back.Height := hMax;
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics\Unit', gfNoGamma);
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Unit', gfNoGamma);
   Template.PixelFormat := pf8bit;
 end;

trunk/Messg.pas

@@ -126 +126 @@
       TButtonBase(Components[cix]).Graphic := GrExt[HGrSystem].Data;
       // if ButtonDownSound<>'*' then
-      // DownSound:=HomeDir+'Sounds\'+ButtonDownSound+'.wav';
+      // DownSound:=HomeDir+'Sounds'+DirectorySeparator+ButtonDownSound+'.wav';
       // if ButtonUpSound<>'*' then
-      // UpSound:=HomeDir+'Sounds\'+ButtonUpSound+'.wav';
+      // UpSound:=HomeDir+'Sounds'+DirectorySeparator+ButtonUpSound+'.wav';
       if Components[cix] is TButtonA then
         TButtonA(Components[cix]).Font := UniFont[ftButton];

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;

trunk/Start.pas

@@ -194 +194 @@
 
   if FirstStart then
-  begin
+  with Reg do begin
     // initialize AI assignment
-    Reg.OpenKey('SOFTWARE\cevo\RegVer9\Start', true);
-    for i := 0 to nPlOffered - 1 do
+    OpenKey('SOFTWARE\cevo\RegVer9\Start', true);
+    for I := 0 to nPlOffered - 1 do
     begin
       if i = 0 then
@@ -203 +203 @@
       else
         s := 'StdAI';
-      Reg.WriteString('Control' + IntToStr(i), s);
-      Reg.WriteInteger('Diff' + IntToStr(i), 2);
+      WriteString('Control' + IntToStr(i), s);
+      WriteInteger('Diff' + IntToStr(i), 2);
     end;
-    Reg.WriteInteger('MultiControl', 0);
-    Reg.closekey;
-  end
-  else
-  begin
-    Reg.OpenKey('SOFTWARE\cevo\RegVer9\Start', false);
-    try
-      WorldSize := Reg.ReadInteger('WorldSize');
-      StartLandMass := Reg.ReadInteger('LandMass');
-      MaxTurn := Reg.ReadInteger('MaxTurn');
-      DefaultAI := Reg.ReadString('DefaultAI');
-      AutoEnemies := Reg.ReadInteger('AutoEnemies');
-      AutoDiff := Reg.ReadInteger('AutoDiff');
-    except
-      FirstStart := true;
-    end;
-    Reg.closekey;
+    WriteInteger('MultiControl', 0);
+    CloseKey;
+  end;
+
+  with Reg do begin
+    OpenKey('SOFTWARE\cevo\RegVer9\Start', False);
+    if ValueExists('WorldSize') then WorldSize := Reg.ReadInteger('WorldSize')
+      else WorldSize := DefaultWorldSize;
+    if ValueExists('LandMass') then StartLandMass := Reg.ReadInteger('LandMass')
+      else StartLandMass := DefaultLandMass;
+    if ValueExists('MaxTurn') then MaxTurn := Reg.ReadInteger('MaxTurn')
+      else MaxTurn := 800;
+    if ValueExists('DefaultAI') then DefaultAI := Reg.ReadString('DefaultAI')
+      else DefaultAI := 'StdAI';
+    if ValueExists('AutoEnemies') then AutoEnemies := Reg.ReadInteger('AutoEnemies')
+      else AutoEnemies := 8;
+    if ValueExists('AutoDiff') then AutoDiff := Reg.ReadInteger('AutoDiff')
+      else AutoDiff := 1;
+    CloseKey;
   end;
 
   FullScreen := true;
-  if FirstStart then
-  begin
-    WorldSize := DefaultWorldSize;
-    StartLandMass := DefaultLandMass;
-    MaxTurn := 800;
-    DefaultAI := 'StdAI';
-    AutoEnemies := 8;
-    AutoDiff := 1;
-  end
-  else
-  begin
-    Reg.OpenKey('SOFTWARE\cevo\RegVer9', false);
-    if Reg.ValueExists('ScreenMode') then
-      ScreenMode := Reg.ReadInteger('ScreenMode');
+  with Reg do begin
+    OpenKey('SOFTWARE\cevo\RegVer9', False);
+    if ValueExists('ScreenMode') then
+      ScreenMode := ReadInteger('ScreenMode')
+      else ScreenMode := 1;
     FullScreen := ScreenMode > 0;
-    if Reg.ValueExists('ResolutionX') then
-      ResolutionX := Reg.ReadInteger('ResolutionX');
-    if Reg.ValueExists('ResolutionY') then
-      ResolutionY := Reg.ReadInteger('ResolutionY');
-    if Reg.ValueExists('ResolutionBPP') then
-      ResolutionBPP := Reg.ReadInteger('ResolutionBPP');
-    if Reg.ValueExists('ResolutionFreq') then
-      ResolutionFreq := Reg.ReadInteger('ResolutionFreq');
+    if ValueExists('ResolutionX') then
+      ResolutionX := ReadInteger('ResolutionX');
+    if ValueExists('ResolutionY') then
+      ResolutionY := ReadInteger('ResolutionY');
+    if ValueExists('ResolutionBPP') then
+      ResolutionBPP := ReadInteger('ResolutionBPP');
+    if ValueExists('ResolutionFreq') then
+      ResolutionFreq := ReadInteger('ResolutionFreq');
     {$IFDEF WINDOWS}
     if ScreenMode = 2 then
@@ -254 +247 @@
         ResolutionFreq);
     {$ENDIF}
-    Reg.closekey;
+    CloseKey;
   end;
   Reg.Free;
@@ -260 +253 @@
   ActionsOffered := [maManual, maCredits, maWeb];
   if FileExists(HomeDir + 'Configurator.exe') then
-    include(ActionsOffered, maConfig);
-  if FileExists(HomeDir + 'AI Template\AI development manual.html') then
-    include(ActionsOffered, maAIDev);
+    Include(ActionsOffered, maConfig);
+  if FileExists(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html') then
+    Include(ActionsOffered, maAIDev);
 
   bixDefault := -1;
@@ -887 +880 @@
       begin // load
         FileName := List.Items[List.ItemIndex];
-        if LoadGame(DataDir + 'Saved\', FileName + '.cevo', LoadTurn, false)
+        if LoadGame(DataDir + 'Saved' + DirectorySeparator, FileName + '.cevo', LoadTurn, false)
         then
           UnlistBackupFile(FileName)
@@ -907 +900 @@
         Reg := TRegistry.Create;
         Reg.OpenKey('SOFTWARE\cevo\RegVer9\Start', true);
-        try
-          GameCount := Reg.ReadInteger('GameCount');
-        except
-          GameCount := 0;
-        end;
+        if Reg.ValueExists('GameCount') then GameCount := Reg.ReadInteger('GameCount')
+          else GameCount := 0;
 
         if (AutoDiff < 0) and (bixView[0] = bixNoTerm) then
@@ -983 +973 @@
         Reg.Free;
 
-        StartNewGame(DataDir + 'Saved\', FileName + '.cevo', MapFileName,
+        StartNewGame(DataDir + 'Saved' + DirectorySeparator, FileName + '.cevo', MapFileName,
           lxpre[WorldSize], lypre[WorldSize], StartLandMass, MaxTurn);
         UnlistBackupFile(FileName);
@@ -1125 +1115 @@
     pgLoad:
       begin
-        AssignFile(LogFile, DataDir + 'Saved\' + List.Items[List.ItemIndex]
+        AssignFile(LogFile, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex]
           + '.cevo');
         try
@@ -1180 +1170 @@
         if Page = pgEditMap then
           MapFileName := List.Items[List.ItemIndex] + '.cevo map';
-        if LoadGraphicFile(Mini, DataDir + 'Maps\' + Copy(MapFileName, 1,
+        if LoadGraphicFile(Mini, DataDir + 'Maps' + DirectorySeparator + Copy(MapFileName, 1,
           Length(MapFileName) - 9), gfNoError) then
         begin
@@ -1197 +1187 @@
         end;
 
-        AssignFile(MapFile, DataDir + 'Maps\' + MapFileName);
+        AssignFile(MapFile, DataDir + 'Maps' + DirectorySeparator + MapFileName);
         try
           Reset(MapFile, 4);
@@ -1372 +1362 @@
 begin
   FormerGames.Clear;
-  if FindFirst(DataDir + 'Saved\*.cevo', $21, f) = 0 then
+  if FindFirst(DataDir + 'Saved' + DirectorySeparator + '*.cevo', $21, f) = 0 then
     repeat
       i := FormerGames.Count;
@@ -1391 +1381 @@
 begin
   Maps.Clear;
-  if FindFirst(DataDir + 'Maps\*.cevo map', $21, f) = 0 then
+  if FindFirst(DataDir + 'Maps' + DirectorySeparator + '*.cevo map', $21, f) = 0 then
     repeat
       Maps.Add(Copy(f.Name, 1, Length(f.Name) - 9));
@@ -1589 +1579 @@
         DirectHelp(cStartCredits);
       maAIDev:
-         OpenDocument(pchar(HomeDir + 'AI Template\AI development manual.html'));{ *Převedeno z ShellExecute* }
+         OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));{ *Převedeno z ShellExecute* }
       maWeb:
         OpenURL('http://c-evo.org'){ *Převedeno z ShellExecute* }
@@ -1756 +1746 @@
         end;
       if Page = pgLoad then
-        AssignFile(f, DataDir + 'Saved\' + List.Items[List.ItemIndex] + '.cevo')
+        AssignFile(f, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex] + '.cevo')
       else
-        AssignFile(f, DataDir + 'Maps\' + List.Items[List.ItemIndex] +
+        AssignFile(f, DataDir + 'Maps'+ DirectorySeparator + List.Items[List.ItemIndex] +
           '.cevo map');
       ok := true;
       try
         if Page = pgLoad then
-          Rename(f, DataDir + 'Saved\' + NewName + '.cevo')
+          Rename(f, DataDir + 'Saved'+ DirectorySeparator + NewName + '.cevo')
         else
-          Rename(f, DataDir + 'Maps\' + NewName + '.cevo map');
+          Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + '.cevo map');
       except
         // Play('INVALID');
@@ -1772 +1762 @@
       if Page <> pgLoad then
         try // rename map picture
-          AssignFile(f, DataDir + 'Maps\' + List.Items[List.ItemIndex]
+          AssignFile(f, DataDir + 'Maps'+ DirectorySeparator + List.Items[List.ItemIndex]
             + '.bmp');
-          Rename(f, DataDir + 'Maps\' + NewName + '.bmp');
+          Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + '.bmp');
         except
         end;
@@ -1808 +1798 @@
     begin
       if Page = pgLoad then
-        AssignFile(f, DataDir + 'Saved\' + List.Items[List.ItemIndex] + '.cevo')
+        AssignFile(f, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex] + '.cevo')
       else
-        AssignFile(f, DataDir + 'Maps\' + List.Items[List.ItemIndex] +
+        AssignFile(f, DataDir + 'Maps' + DirectorySeparator + List.Items[List.ItemIndex] +
           '.cevo map');
       Erase(f);
@@ -2002 +1992 @@
 procedure TStartDlg.ReplayBtnClick(Sender: TObject);
 begin
-  LoadGame(DataDir + 'Saved\', List.Items[List.ItemIndex] + '.cevo',
+  LoadGame(DataDir + 'Saved' + DirectorySeparator, List.Items[List.ItemIndex] + '.cevo',
     LastTurn, true);
   SlotAvailable := -1;