Changeset 301 for trunk/LocalPlayer

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/LocalPlayer

Files:

• IsoEngine.pas (modified) (1 diff)
• Term.pas (modified) (3 diffs)
• Tribes.pas (modified) (10 diffs)

trunk/LocalPlayer/IsoEngine.pas

@@ -703 +703 @@
     end;
     Textout(xShield + 2, yShield - 1, LabelTextColor, s);
-  end
+  end;
 end; { PaintCity }
 

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);

trunk/LocalPlayer/Tribes.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils;
+  Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global;
 
 type
@@ -49 +49 @@
 {$IFNDEF SCR} function TString(Template: string): string;
     function TPhrase(Item: string): string; {$ENDIF}
-    procedure SetModelPicture(const Info: TModelPictureInfo; IsNew: boolean);
+    procedure SetModelPicture(const Info: TModelPictureInfo; IsNew: Boolean);
     function ChooseModelPicture(var Picture: TModelPictureInfo;
-      Code, Turn: Integer; ForceNew: boolean): boolean;
+      Code, Turn: Integer; ForceNew: Boolean): Boolean;
     procedure InitAge(Age: Integer);
   protected
@@ -68 +68 @@
 function CityName(Founder: Integer): string;
 function ModelCode(const ModelInfo: TModelInfo): Integer;
-procedure FindStdModelPicture(code: Integer; var pix: Integer; var Name: string);
-function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): boolean;
+procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
+function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): Boolean;
 procedure FindPosition(HGr, x, y, xmax, ymax: Integer; Mark: TColor;
   var xp, yp: Integer);
@@ -231 +231 @@
 end;
 
-procedure FindStdModelPicture(code: Integer; var pix: Integer; var Name: string);
+procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
 var
   i: Integer;
@@ -239 +239 @@
     Input := StdUnitScript[i];
     pix := GetNum;
-    if code = GetNum then
+    if Code = GetNum then
     begin
       Name := Get;
@@ -249 +249 @@
 
 function GetTribeInfo(FileName: string; var Name: string;
-  var Color: TColor): boolean;
+  var Color: TColor): Boolean;
 var
   Found: Integer;
@@ -258 +258 @@
   Found := 0;
   AssignFile(TribeScript, LocalizedFilePath('Tribes' + DirectorySeparator +
-    FileName + '.tribe.txt'));
+    FileName + CevoTribeExt));
   Reset(TribeScript);
   while not EOF(TribeScript) do
@@ -285 +285 @@
 var
   Line: Integer;
-  Variant: char;
+  Variant: Char;
   Item: string;
 begin
@@ -292 +292 @@
     Name[Variant] := '';
   Script := TStringList.Create;
-  Script.LoadFromFile(LocalizedFilePath('Tribes' + DirectorySeparator +
-    FileName + '.tribe.txt'));
+  Script.LoadFromFile(FileName);
   CityLine0 := 0;
   nCityLines := 0;
@@ -476 +475 @@
 end;
 
-procedure TTribe.SetModelPicture(const Info: TModelPictureInfo; IsNew: boolean);
+procedure TTribe.SetModelPicture(const Info: TModelPictureInfo; IsNew: Boolean);
 var
   i: Integer;