Changeset 306 for trunk

Timestamp:

Sep 5, 2020, 8:10:03 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 2.0.10.

Location:

trunk

Files:

• Packages/Common/URegistry.pas (modified) (8 diffs)
• Read me.txt (modified) (1 diff)
• Release notes.txt (modified) (3 diffs)
• UGeometry.pas (modified) (3 diffs)

trunk/Packages/Common/URegistry.pas

@@ -1 +1 @@
 unit URegistry;
 
-{$MODE Delphi}
+{$MODE delphi}
 
 interface
@@ -17 +17 @@
     RootKey: HKEY;
     Key: string;
+    class function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; static; overload;
+    class function Create(RootKey: HKEY; Key: string): TRegistryContext; static; overload;
     class operator Equal(A, B: TRegistryContext): Boolean;
-    function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; overload;
-    function Create(RootKey: HKEY; Key: string): TRegistryContext; overload;
   end;
 
@@ -29 +29 @@
     procedure SetCurrentContext(AValue: TRegistryContext);
   public
+    function ReadChar(const Name: string): Char;
+    procedure WriteChar(const Name: string; Value: Char);
     function ReadBoolWithDefault(const Name: string;
       DefaultValue: Boolean): Boolean;
     function ReadIntegerWithDefault(const Name: string; DefaultValue: Integer): Integer;
     function ReadStringWithDefault(const Name: string; DefaultValue: string): string;
+    function ReadCharWithDefault(const Name: string; DefaultValue: Char): Char;
     function ReadFloatWithDefault(const Name: string;
       DefaultValue: Double): Double;
@@ -55 +58 @@
 end;
 
-function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
 begin
   Result.RootKey := RegistryRootHKEY[RootKey];
@@ -61 +64 @@
 end;
 
-function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
 begin
   Result.RootKey := RootKey;
@@ -85 +88 @@
     else begin
       WriteString(Name, DefaultValue);
+      Result := DefaultValue;
+    end;
+end;
+
+function TRegistryEx.ReadCharWithDefault(const Name: string; DefaultValue: Char
+  ): Char;
+begin
+  if ValueExists(Name) then Result := ReadChar(Name)
+    else begin
+      WriteChar(Name, DefaultValue);
       Result := DefaultValue;
     end;
@@ -120 +133 @@
 begin
   {$IFDEF Linux}
-  CloseKey;
+  //CloseKey;
   {$ENDIF}
   Result := inherited OpenKey(Key, CanCreate);
@@ -137 +150 @@
 end;
 
+function TRegistryEx.ReadChar(const Name: string): Char;
+var
+  S: string;
+begin
+  S := ReadString(Name);
+  if Length(S) > 0 then Result := S[1]
+    else Result := #0;
+end;
+
+procedure TRegistryEx.WriteChar(const Name: string; Value: Char);
+begin
+  WriteString(Name, Value);
+end;
+
 function TRegistryEx.ReadBoolWithDefault(const Name: string;
   DefaultValue: Boolean): Boolean;

trunk/Read me.txt

@@ -1 @@
-Developed using Lazarus 2.0.0 (http://www.lazarus-ide.org/)
+Developed using Lazarus 2.0.10 (http://www.lazarus-ide.org/)

trunk/Release notes.txt

@@ -43 +43 @@
 * Added: Map can have rounded shape.
 * Added: New Unit moves window available from Tools menu.
-* Modified: Improved code for symetric map generation.
+* Modified: Improved code for symmetric map generation.
 * Modified: Store player settings for new game separately to current game players.
 * Modified: Implemented better algorithm for initialization of players start cell to maintain minimal distance between players.
@@ -49 +49 @@
 * Modified: Improved attack to neutral units if computer have more units available when necessary.
 * Fixed: Show error message if not all players were placed to the map.
-* Fixed: Build cell bridges correctly if symetric map is selected.
-* Fixed: Avoid possible negative cell power if player unit was previously unsucessfully attacked and weaken by enemy.
+* Fixed: Build cell bridges correctly if symmetric map is selected.
+* Fixed: Avoid possible negative cell power if player unit was previously unsuccessfully attacked and weaken by enemy.
 * Fixed: Same game structures were not correctly initialized during load from file.
 * Fixed: Show other players cells with normal power and cells of current player with power lowered by unit moves.
@@ -92 +92 @@
 * Added: Auto save game to file option in settings.
 * Added: New game option "Map shape" which can use image in file as base for map generation. Black color is used as void.
-* Added: Support for symetric map usable for two players game.
+* Added: Support for symmetric map usable for two players game.
 * Added: Confirmation dialog for ending game.
 * Added: Support for switching large icons in toolbar.

trunk/UGeometry.pas

@@ -26 +26 @@
     //class operator Divide(const A, B: TGPoint<T>): TGPoint<T>;
     //class operator Modulus(A: TGPoint<T>; B: TGPoint<T>): TGPoint<T>;
-    function Min(const A, B: TGPoint<T>): TGPoint<T>;
-    function Max(const A, B: TGPoint<T>): TGPoint<T>;
+    class function Min(const A, B: TGPoint<T>): TGPoint<T>; static;
+    class function Max(const A, B: TGPoint<T>): TGPoint<T>; static;
     procedure Rotate(Base: TGPoint<T>; Angle: Double);
   end;
@@ -500 +500 @@
 end;
 
-function TGPoint<T>.Min(const A, B: TGPoint<T>): TGPoint<T>;
+class function TGPoint<T>.Min(const A, B: TGPoint<T>): TGPoint<T>;
 begin
   if A.X < B.X then Result.X := A.X else Result.X := B.X;
@@ -506 +506 @@
 end;
 
-function TGPoint<T>.Max(const A, B: TGPoint<T>): TGPoint<T>;
+class function TGPoint<T>.Max(const A, B: TGPoint<T>): TGPoint<T>;
 begin
   if A.X > B.X then Result.X := A.X else Result.X := B.X;