Changeset 20 for trunk/LocalPlayer

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/LocalPlayer

Files:

• CityScreen.pas (modified) (1 diff)
• Draft.pas (modified) (1 diff)
• Help.pas (modified) (3 diffs)
• NatStat.pas (modified) (1 diff)
• PVSB.pas (modified) (2 diffs)
• TechTree.pas (modified) (1 diff)
• Term.pas (modified) (4 diffs)
• Tribes.pas (modified) (3 diffs)
• UnitStat.pas (modified) (1 diff)

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;