Changeset 68 for trunk

Timestamp:

Sep 28, 2014, 2:36:03 PM (10 years ago)

Author:

chronos

Message:

• Added: Option to change animation speed.
• Fixed: Shifted view during computer turn.

Location:

trunk

Files:

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

trunk/Forms/UFormSettings.lfm

@@ -29 +29 @@
   object Label1: TLabel
     Left = 20
-    Height = 25
+    Height = 22
     Top = 26
-    Width = 95
+    Width = 80
     Caption = 'Language:'
     ParentColor = False
@@ -37 +37 @@
   object ComboBoxLanguage: TComboBox
     Left = 178
-    Height = 37
+    Height = 34
     Top = 24
     Width = 196
@@ -46 +46 @@
   object CheckBoxDevelMode: TCheckBox
     Left = 16
-    Height = 27
+    Height = 24
     Top = 80
-    Width = 176
+    Width = 157
     Caption = 'Developer mode'
     TabOrder = 3
   end
+  object SpinEditAnimSpeed: TSpinEdit
+    Left = 184
+    Height = 32
+    Top = 120
+    Width = 122
+    TabOrder = 4
+  end
+  object Label2: TLabel
+    Left = 19
+    Height = 22
+    Top = 126
+    Width = 140
+    Caption = 'Animation speed:'
+    ParentColor = False
+  end
+  object Label3: TLabel
+    Left = 311
+    Height = 22
+    Top = 128
+    Width = 15
+    Caption = '%'
+    ParentColor = False
+  end
 end

trunk/Forms/UFormSettings.lrt

@@ -4 +4 @@
 TFORMSETTINGS.LABEL1.CAPTION=Language:
 TFORMSETTINGS.CHECKBOXDEVELMODE.CAPTION=Developer mode
+TFORMSETTINGS.LABEL2.CAPTION=Animation speed:
+TFORMSETTINGS.LABEL3.CAPTION=%

trunk/Forms/UFormSettings.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  Spin;
 
 type
@@ -18 +19 @@
     ComboBoxLanguage: TComboBox;
     Label1: TLabel;
+    Label2: TLabel;
+    Label3: TLabel;
+    SpinEditAnimSpeed: TSpinEdit;
   private
     { private declarations }
@@ -40 +44 @@
 begin
   Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
-   ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
-   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
-   CheckBoxDevelMode.Checked := Core.DevelMode;
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
+  if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+  CheckBoxDevelMode.Checked := Core.DevelMode;
+  SpinEditAnimSpeed.Value := Core.AnimationSpeed;
 end;
 
@@ -50 +55 @@
     Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   Core.DevelMode := CheckBoxDevelMode.Checked;
+  Core.AnimationSpeed := SpinEditAnimSpeed.Value;
 end;
 

trunk/Languages/xtactics.cs.po

@@ -355 +355 @@
 msgstr "Jazyk:"
 
+#: tformsettings.label2.caption
+msgid "Animation speed:"
+msgstr ""
+
+#: tformsettings.label3.caption
+#, fuzzy
+msgctxt "tformsettings.label3.caption"
+msgid "%"
+msgstr "%"
+
 #: ucore.sendgame
 msgid "End game?"

trunk/Languages/xtactics.po

@@ -343 +343 @@
 msgstr ""
 
+#: tformsettings.label2.caption
+msgid "Animation speed:"
+msgstr ""
+
+#: tformsettings.label3.caption
+msgctxt "TFORMSETTINGS.LABEL3.CAPTION"
+msgid "%"
+msgstr ""
+
 #: ucore.sendgame
 msgid "End game?"

trunk/UCore.pas

@@ -48 +48 @@
       CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
     procedure DoOnWin(Player: TPlayer);
+    procedure Delay(Time: Integer);
   public
     Game: TGame;
@@ -53 +54 @@
     DevelMode: Boolean;
     LastMapFileName: string;
-    View: TView;
+    AnimationSpeed: Integer;
     procedure UpdateActions;
     procedure Init;
@@ -106 +107 @@
 end;
 
+procedure TCore.Delay(Time: Integer);
+var
+  I: Integer;
+const
+  Slice = 50; // ms
+begin
+  while Time > 0 do begin
+    Application.ProcessMessages;
+    if Time > Slice then Sleep(Slice) else Sleep(Time);
+    Dec(Time, Slice);
+  end;
+end;
+
 procedure TCore.UpdateActions;
 begin
@@ -146 +160 @@
       Computer.Free;
       FormMain.Redraw;
-      for I := 0 to 10 do begin
-        Application.ProcessMessages;
-        Sleep(100);
-      end;
+      Delay(Trunc((100 - AnimationSpeed) / 100 * 2000));
     end;
     Game.NextTurn;
@@ -232 +243 @@
   XMLConfig1.SetValue('LastMapFileName', LastMapFileName);
   XMLConfig1.SetValue('DevelMode', DevelMode);
+  XMLConfig1.SetValue('AnimationSpeed', AnimationSpeed);
   FreeAndNil(Game);
 end;
@@ -242 +254 @@
   LastMapFileName := XMLConfig1.GetValue('LastMapFileName', '');
   DevelMode := XMLConfig1.GetValue('DevelMode', false);
+  AnimationSpeed := XMLConfig1.GetValue('AnimationSpeed', 50);
   CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(XMLConfig1.GetValue('Language', ''));
   for I := 0 to Game.Players.Count - 1 do

trunk/UGame.pas

@@ -1092 +1092 @@
 begin
   SourceRect := Source.SourceRect;
-  DestRect := Source.DestRect;
-  Zoom := Source.Zoom;
+  FDestRect := Source.DestRect;
+  FZoom := Source.Zoom;
   SelectedCell := Source.SelectedCell;
   FocusedCell := Source.FocusedCell;

trunk/xtactics.lpi

@@ -118 +118 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormSettings"/>
       </Unit4>
       <Unit5>