Changeset 77 for trunk

Timestamp:

Oct 5, 2014, 7:13:38 PM (10 years ago)

Author:

chronos

Message:

• Added: Auto save game to file option in settings.

Location:

trunk

Files:

• Forms/UFormSettings.lfm (modified) (6 diffs)
• Forms/UFormSettings.lrt (modified) (1 diff)
• Forms/UFormSettings.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.po (modified) (1 diff)
• UCore.pas (modified) (6 diffs)
• UGame.pas (modified) (22 diffs)

trunk/Forms/UFormSettings.lfm

@@ -29 +29 @@
   object Label1: TLabel
     Left = 20
-    Height = 22
+    Height = 25
     Top = 26
-    Width = 80
+    Width = 95
     Caption = 'Language:'
     ParentColor = False
@@ -37 +37 @@
   object ComboBoxLanguage: TComboBox
     Left = 178
-    Height = 34
+    Height = 37
     Top = 24
     Width = 196
@@ -46 +46 @@
   object CheckBoxDevelMode: TCheckBox
     Left = 16
-    Height = 24
+    Height = 27
     Top = 80
-    Width = 157
+    Width = 176
     Caption = 'Developer mode'
     TabOrder = 3
@@ -54 +54 @@
   object SpinEditAnimSpeed: TSpinEdit
     Left = 184
-    Height = 32
+    Height = 35
     Top = 120
     Width = 122
@@ -61 +61 @@
   object Label2: TLabel
     Left = 19
-    Height = 22
+    Height = 25
     Top = 126
-    Width = 140
+    Width = 162
     Caption = 'Animation speed:'
     ParentColor = False
@@ -69 +69 @@
   object Label3: TLabel
     Left = 311
-    Height = 22
+    Height = 25
     Top = 128
-    Width = 15
+    Width = 17
     Caption = '%'
     ParentColor = False
   end
+  object CheckBox1: TCheckBox
+    Left = 16
+    Height = 27
+    Top = 160
+    Width = 287
+    Caption = 'Autosave game on each turn'
+    TabOrder = 5
+  end
 end

trunk/Forms/UFormSettings.lrt

@@ -6 +6 @@
 TFORMSETTINGS.LABEL2.CAPTION=Animation speed:
 TFORMSETTINGS.LABEL3.CAPTION=%
+TFORMSETTINGS.CHECKBOX1.CAPTION=Autosave game on each turn

trunk/Forms/UFormSettings.pas

@@ -16 +16 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
+    CheckBox1: TCheckBox;
     CheckBoxDevelMode: TCheckBox;
     ComboBoxLanguage: TComboBox;

trunk/Languages/xtactics.cs.po

@@ -367 +367 @@
 msgstr "Nastavení"
 
+#: tformsettings.checkbox1.caption
+msgid "Autosave game on each turn"
+msgstr ""
+
 #: tformsettings.checkboxdevelmode.caption
 msgid "Developer mode"
@@ -537 +541 @@
 msgid "Wrong file format"
 msgstr "Chybný formát souboru"
+

trunk/Languages/xtactics.po

@@ -353 +353 @@
 msgstr ""
 
+#: tformsettings.checkbox1.caption
+msgid "Autosave game on each turn"
+msgstr ""
+
 #: tformsettings.checkboxdevelmode.caption
 msgid "Developer mode"

trunk/UCore.pas

@@ -49 +49 @@
     procedure DoOnWin(Player: TPlayer);
     procedure Delay(Time: Integer);
+    procedure GameNewTurnExecute(Sender: TObject);
+    procedure AutoSave;
   public
     Game: TGame;
@@ -55 +57 @@
     LastMapFileName: string;
     AnimationSpeed: Integer;
+    AutoSaveEnabled: Boolean;
     procedure UpdateActions;
     procedure Init;
@@ -129 +132 @@
 end;
 
+procedure TCore.GameNewTurnExecute(Sender: TObject);
+begin
+  if AutoSaveEnabled then AutoSave;
+end;
+
+procedure TCore.AutoSave;
+begin
+  Game.SaveToFile(GetAppConfigDir(False) + 'AutoSave.xtg');
+  GetUserDir;
+end;
+
 procedure TCore.UpdateActions;
 begin
@@ -249 +263 @@
   Game.OnMove := DoOnMove;
   Game.OnWin := DoOnWin;
+  Game.OnNewTurn := GameNewTurnExecute;
 end;
 
@@ -258 +273 @@
   XMLConfig1.SetValue('DevelMode', DevelMode);
   XMLConfig1.SetValue('AnimationSpeed', AnimationSpeed);
+  XMLConfig1.SetValue('AutoSave', AutoSaveEnabled);
   FreeAndNil(Game);
 end;
@@ -269 +285 @@
   DevelMode := XMLConfig1.GetValue('DevelMode', false);
   AnimationSpeed := XMLConfig1.GetValue('AnimationSpeed', 50);
+  AutoSaveEnabled := XMLConfig1.GetValue('AutoSave', True);
   CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(XMLConfig1.GetValue('Language', ''));
   for I := 0 to Game.Players.Count - 1 do

trunk/UGame.pas

@@ -25 +25 @@
   TUnitMoves = class;
   TCells = class;
+  TMap = class;
 
   TFloatPoint = record
@@ -38 +39 @@
   TCell = class
   private
+    FMap: TMap;
     FPower: Integer;
     procedure SetPower(AValue: Integer);
@@ -45 +47 @@
     Polygon: TPointArray;
     Terrain: TTerrainType;
+    PlayerId: Integer;
     Player: TPlayer;
     MovesFrom: TUnitMoves;
     MovesTo: TUnitMoves;
+    NeighborsId: array of Integer;
     Neighbors: TCells;
     Mark: Boolean;
+    procedure FixRefId;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -60 +65 @@
     destructor Destroy; override;
     property Power: Integer read FPower write SetPower;
+    property Map: TMap read FMap write FMap;
   end;
 
@@ -67 +73 @@
 
   TCells = class(TObjectList)
+    Map: TMap;
+    procedure FixRefId;
     function FindById(Id: Integer): TCell;
     procedure LoadFromNode(Node: TDOMNode);
@@ -235 +243 @@
     Game: TGame;
     NewPlayerId: Integer;
+    function FindById(Id: Integer): TPlayer;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
     function GetNewPlayerId: Integer;
@@ -285 +294 @@
     FMapType: TMapType;
     FOnMove: TMoveEvent;
+    FOnNewTurn: TNotifyEvent;
     FOnWin: TWinEvent;
     FRunning: Boolean;
@@ -334 +344 @@
     property OnMove: TMoveEvent read FOnMove write FOnMove;
     property OnWin: TWinEvent read FOnWin write FOnWin;
+    property OnNewTurn: TNotifyEvent read FOnNewTurn write FOnNewTurn;
   end;
 
@@ -427 +438 @@
 { TCells }
 
+procedure TCells.FixRefId;
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+  TCell(Items[I]).FixRefId;
+end;
+
 function TCells.FindById(Id: Integer): TCell;
 var
@@ -432 +451 @@
 begin
   I := 0;
-  while (I < 0) and (TCell(Items[I]).Id <> Id) do Inc(I);
+  while (I < Count) and (TCell(Items[I]).Id <> Id) do Inc(I);
   if I < Count then Result := TCell(Items[I])
     else Result := nil;
@@ -446 +465 @@
   while Assigned(Node2) and (Node2.NodeName = 'Cell') do begin
     NewCell := TCell.Create;
+    NewCell.Map := Map;
     NewCell.LoadFromNode(Node2);
     Add(NewCell);
@@ -466 +486 @@
 
 { TPlayers }
+
+function TPlayers.FindById(Id: Integer): TPlayer;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TPlayer(Items[I]).Id <> Id) do Inc(I);
+  if I < Count then Result := TPlayer(Items[I])
+    else Result := nil;
+end;
 
 procedure TPlayers.New(Name: string; Color: TColor; Mode: TPlayerMode);
@@ -574 +604 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
+    NewCell.Map := Self;
     NewCell.PosPx := Point(Trunc(Random * FSize.X * DefaultCellSize.X), Trunc(Random * FSize.Y * DefaultCellSize.Y));
     SetLength(NewCell.Polygon, 1);
@@ -618 +649 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
+    NewCell.Map := Self;
     Reverse := Boolean(X mod 2) xor Boolean(Y mod 2);
     if Reverse then Rev := -1
@@ -658 +690 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
+    NewCell.Map := Self;
     NewCell.PosPx := Point(Trunc(X * DefaultCellSize.X * SquareCellMulX),
       Trunc(Y * DefaultCellSize.Y * SquareCellMulY));
@@ -960 +993 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
+    NewCell.Map := Self;
     NewCell.PosPx := Point(X, Y);
     NewCell.Id := GetNewCellId;
@@ -971 +1005 @@
   DefaultCellSize := Point(220, 220);
   Cells := TCells.create;
+  Cells.Map := Self;
   Size := Point(0, 0);
   Image := TImage.Create(nil);
@@ -1145 +1180 @@
 end;
 
+procedure TCell.FixRefId;
+var
+  I: Integer;
+begin
+  Player := Map.Game.Players.FindById(PlayerId);
+
+  Neighbors.Count := Length(NeighborsId);
+  for I := 0 to Length(NeighborsId) - 1 do begin
+     Neighbors[I] := Map.Cells.FindById(NeighborsId[I]);
+  end;
+end;
+
 procedure TCell.LoadFromNode(Node: TDOMNode);
 var
@@ -1156 +1203 @@
   PosPx.X := ReadInteger(Node, 'PosX', 0);
   PosPx.Y := ReadInteger(Node, 'PosY', 0);
-  //Player := Map.Game.Players.FindById(ReadInteger(Node, 'Player', 0));
+  PlayerId := ReadInteger(Node, 'Player', 0);
+
+  Node3 := Node.FindNode('Neighbours');
+  if Assigned(Node3) then begin
+    SetLength(NeighborsId, 0);
+    Node2 := Node3.FirstChild;
+    while Assigned(Node2) and (Node2.NodeName = 'Neighbour') do begin
+      SetLength(NeighborsId, Length(NeighborsId) + 1);
+      NeighborsId[High(NeighborsId)] := ReadInteger(Node2, 'Id', 0);
+      Node2 := Node2.NextSibling;
+    end;
+  end;
 
   Node3 := Node.FindNode('Polygon');
@@ -1977 +2035 @@
       if Assigned(NewNode) then
         Moves.LoadFromNode(NewNode);
+
+      Map.Cells.FixRefId;
     end;
   finally
@@ -2078 +2138 @@
     CurrentPlayer := TPlayer(Players[(Players.IndexOf(CurrentPlayer) + 1) mod Players.Count]);
   until CurrentPlayer.TotalCells > 0;
-  if Players.IndexOf(CurrentPlayer) < Players.IndexOf(PrevPlayer) then Inc(TurnCounter);
+  if Players.IndexOf(CurrentPlayer) < Players.IndexOf(PrevPlayer) then begin
+    Inc(TurnCounter);
+    if Assigned(FOnNewTurn) then
+      FOnNewTurn(Self);
+  end;
   CheckWinObjective;
   // For computers take view from previous human
@@ -2364 +2428 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
+    NewCell.Map := Self;
     PX := X;
     PY := Y;