Changeset 20 for trunk/LocalPlayer/Term.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/LocalPlayer/Term.pas (modified) (4 diffs)

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