Changeset 304 for trunk/UGame.pas

Timestamp:

Aug 11, 2019, 4:53:05 PM (5 years ago)

Author:

chronos

Message:

• Fixed: First game system was rewritten by game system stored in game file.
• Modified: Each TGame instance has own TGameSystem instance and different game systems are assigned.

File:

• trunk/UGame.pas (modified) (10 diffs)

trunk/UGame.pas

@@ -37 +37 @@
   TGame = class
   private
-    FGameSystem: TGameSystem;
     FMapType: TMapType;
     FOnChange: TNotifyEvent;
@@ -49 +48 @@
     ProbabilityMatrix: array of array of Single;
     procedure RecordTurnStats;
-    procedure SetGameSystem(AValue: TGameSystem);
     procedure SetMapType(AValue: TMapType);
     procedure SetRunning(AValue: Boolean);
@@ -61 +59 @@
     procedure WinObjectiveMapPrepare;
   public
+    GameSystem: TGameSystem;
     FileName: string;
     DevelMode: Boolean;
@@ -87 +86 @@
     StoredRandSeed: Cardinal;
     GeneratePlayers: Boolean;
-    GameSystemName: string;
     procedure PostConfig;
     procedure Assign(Source: TGame);
@@ -105 +103 @@
     property Running: Boolean read FRunning write SetRunning;
     property MapType: TMapType read FMapType write SetMapType;
-    property GameSystem: TGameSystem read FGameSystem write SetGameSystem;
   published
     property OnMoveUpdated: TMoveUpdatedEvent read FOnMoveUpdated write FOnMoveUpdated;
@@ -504 +501 @@
   BridgeEnabled := Source.BridgeEnabled;
   MaxPower := Source.MaxPower;
-  GameSystem := Source.GameSystem;
+  GameSystem.Assign(Source.GameSystem);
 end;
 
@@ -532 +529 @@
     SetValue(DOMString(Path + '/MaxPower'), MaxPower);
     Players.SaveConfig(Config, Path + '/Players');
-    SetValue(DOMString(Path + '/GameSystemName'), DOMString(GameSystemName));
+    SetValue(DOMString(Path + '/GameSystemName'), DOMString(GameSystem.GetName));
   end;
 end;
@@ -733 +730 @@
 end;
 
-procedure TGame.SetGameSystem(AValue: TGameSystem);
-begin
-  if FGameSystem = AValue then Exit;
-  FGameSystem := AValue;
-  if Assigned(FGameSystem) then GameSystemName := FGameSystem.GetName
-    else GameSystemName := '';
-end;
-
 procedure TGame.NextPlayer;
 var
@@ -860 +849 @@
 constructor TGame.Create;
 begin
+  GameSystem := TGameSystem.Create;
   Units := TUnits.Create;
   Units.Game := Self;
@@ -889 +879 @@
   FreeAndNil(Buildings);
   FreeAndNil(Units);
+  FreeAndNil(GameSystem);
   inherited Destroy;
 end;