Changeset 301 for trunk/LocalPlayer/Term.pas

Timestamp:

Mar 8, 2021, 10:11:47 PM (4 years ago)

Author:

chronos

Message:

• Modified: CevoTribeExt string defined on single place.
• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Term.pas (modified) (3 diffs)

trunk/LocalPlayer/Term.pas

@@ -786 +786 @@
 function CreateTribe(p: integer; FileName: string; Original: boolean): boolean;
 begin
-  if not FileExists(LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
-    '.tribe.txt')) then
-  begin
-    result := false;
-    exit
+  FileName := LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
+    CevoTribeExt);
+  if not FileExists(FileName) then
+  begin
+    Result := False;
+    Exit;
   end;
 
@@ -1413 +1414 @@
 begin
   UnusedTribeFiles.Clear;
-  ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*.tribe.txt',
+  ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*' + CevoTribeExt,
     faArchive + faReadOnly, SearchRec) = 0;
   if not ok then
   begin
     FindClose(SearchRec);
-    ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*.tribe.txt'),
+    ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*' + CevoTribeExt),
       faArchive + faReadOnly, SearchRec) = 0;
   end;
   if ok then
     repeat
-      SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - 10);
+      SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - Length(CevoTribeExt));
       if GetTribeInfo(SearchRec.Name, Name, Color) then
         UnusedTribeFiles.AddObject(SearchRec.Name, TObject(Color));
@@ -1432 +1433 @@
 function TMainScreen.ChooseUnusedTribe: integer;
 var
-  i, j, ColorDistance, BestColorDistance, TestColorDistance,
-    CountBest: integer;
+  i: Integer;
+  j: Integer;
+  ColorDistance: Integer;
+  BestColorDistance: Integer;
+  TestColorDistance: Integer;
+  CountBest: Integer;
 begin
   assert(UnusedTribeFiles.Count > 0);