close Warning: Can't synchronize with repository "(default)" (No changeset 184 in the repository). Look in the Trac log for more information.

Changeset 145


Ignore:
Timestamp:
Nov 12, 2017, 1:47:20 PM (6 years ago)
Author:
chronos
Message:
  • Modified: Do not create settings form on application start but just if form is opened.
  • Fixed: Removed various compilation warnings.
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormCharts.lfm

    r128 r145  
    99  OnClose = FormClose
    1010  OnShow = FormShow
    11   LCLVersion = '1.6.4.0'
     11  LCLVersion = '1.8.0.4'
    1212  object Chart1: TChart
    1313    Left = 8
    … …  
    3535  object ComboBox1: TComboBox
    3636    Left = 24
    37     Height = 34
     37    Height = 36
    3838    Top = 8
    3939    Width = 392

  • trunk/Forms/UFormCharts.pas

    r130 r145  
    77uses
    88  Classes, SysUtils, FileUtil, TAGraph, TASeries, Forms, Controls, Graphics,
    9   Dialogs, StdCtrls, LMessages;
     9  Dialogs, StdCtrls;
    1010
    1111type

  • trunk/Forms/UFormMain.lfm

    r132 r145  
    55  Width = 775
    66  Caption = 'xTactics'
    7   ClientHeight = 596
     7  ClientHeight = 587
    88  ClientWidth = 775
    99  Menu = MainMenu1
    … …  
    1313  OnKeyUp = FormKeyUp
    1414  OnShow = FormShow
    15   LCLVersion = '1.6.2.0'
     15  LCLVersion = '1.8.0.4'
    1616  WindowState = wsMaximized
    1717  object StatusBar1: TStatusBar
    1818    Left = 0
    19     Height = 28
    20     Top = 568
     19    Height = 30
     20    Top = 557
    2121    Width = 775
    2222    Panels = <   
    … …  
    3434  object ToolBar1: TToolBar
    3535    Left = 0
    36     Height = 568
     36    Height = 557
    3737    Top = 0
    3838    Width = 80
    … …  
    7272    object ToolButton6: TToolButton
    7373      Left = 1
    74       Top = 194
     74      Top = 170
    7575      Action = AZoomIn
    7676    end
    7777    object ToolButton7: TToolButton
    7878      Left = 1
    79       Top = 226
     79      Top = 202
    8080      Action = AZoomOut
    8181    end
    8282    object ToolButton8: TToolButton
    8383      Left = 1
    84       Top = 258
     84      Top = 234
    8585      Action = AZoomAll
    8686    end
    8787    object ToolButton9: TToolButton
    8888      Left = 1
    89       Height = 32
    9089      Top = 162
    9190      Width = 32
    … …  
    9493    object ToolButton10: TToolButton
    9594      Left = 1
    96       Height = 32
    97       Top = 290
     95      Top = 266
    9896      Width = 32
    9997      Style = tbsSeparator
    … …  
    10199    object ToolButton11: TToolButton
    102100      Left = 1
    103       Top = 322
     101      Top = 274
    104102      Action = Core.AGameLoad
    105103    end
    106104    object ToolButton12: TToolButton
    107105      Left = 1
    108       Top = 354
     106      Top = 306
    109107      Action = Core.AGameSave
    110108    end
    111109    object ToolButton13: TToolButton
    112110      Left = 1
    113       Top = 386
     111      Top = 338
    114112      Action = Core.AExit
    115113    end
    … …  
    117115  object PaintBox1: TPaintBox
    118116    Left = 80
    119     Height = 568
     117    Height = 557
    120118    Top = 0
    121119    Width = 695

  • trunk/Forms/UFormMain.pas

    r133 r145  
    77uses
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
    9   UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils, XMLConf;
     9  UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils, XMLConf, DOM;
    1010
    1111const
    … …  
    193193begin
    194194  with Config do begin
    195     AToolBarBigIcons.Checked := GetValue(Path + '/LargeIcons', False);
    196     AToolBarVisible.Checked := GetValue(Path + '/ToolBarVisible', True);
    197     AStatusBarVisible.Checked := GetValue(Path + '/StatusBarVisible', False);
     195    AToolBarBigIcons.Checked := GetValue(DOMString(Path + '/LargeIcons'), False);
     196    AToolBarVisible.Checked := GetValue(DOMString(Path + '/ToolBarVisible'), True);
     197    AStatusBarVisible.Checked := GetValue(DOMString(Path + '/StatusBarVisible'), False);
    198198  end;
    199199end;
    … …  
    202202begin
    203203  with Config do begin
    204     SetValue(Path + '/LargeIcons', AToolBarBigIcons.Checked);
    205     SetValue(Path + '/ToolBarVisible', AToolBarVisible.Checked);
    206     SetValue(Path + '/StatusBarVisible', AStatusBarVisible.Checked);
     204    SetValue(DOMString(Path + '/LargeIcons'), AToolBarBigIcons.Checked);
     205    SetValue(DOMString(Path + '/ToolBarVisible'), AToolBarVisible.Checked);
     206    SetValue(DOMString(Path + '/StatusBarVisible'), AStatusBarVisible.Checked);
    207207  end;
    208208end;
    … …  
    289289
    290290procedure TFormMain.AZoomOutExecute(Sender: TObject);
    291 var
    292   D: TPoint;
     291//var
     292//  D: TPoint;
    293293begin
    294294  with Core.CurrentClient do begin

  • trunk/Forms/UFormSettings.lfm

    r107 r145  
    1313  OnShow = FormShow
    1414  Position = poMainFormCenter
    15   LCLVersion = '1.4.4.0'
     15  LCLVersion = '1.8.0.4'
    1616  object ButtonOk: TButton
    1717    Left = 444
    … …  
    4747    object TabSheetGeneral: TTabSheet
    4848      Caption = 'General'
    49       ClientHeight = 226
    50       ClientWidth = 538
     49      ClientHeight = 220
     50      ClientWidth = 540
    5151      object Label2: TLabel
    5252        Left = 27
    53         Height = 25
     53        Height = 26
    5454        Top = 78
    55         Width = 139
     55        Width = 150
    5656        Caption = 'Animation speed:'
    5757        ParentColor = False
    … …  
    5959      object SpinEditAnimSpeed: TSpinEdit
    6060        Left = 232
    61         Height = 33
     61        Height = 36
    6262        Top = 72
    6363        Width = 122
    … …  
    6666      object Label3: TLabel
    6767        Left = 368
    68         Height = 25
     68        Height = 26
    6969        Top = 82
    7070        Width = 15
    … …  
    7272        ParentColor = False
    7373      end
    74       object CheckBox1: TCheckBox
     74      object CheckBoxAutoSaveTurn: TCheckBox
    7575        Left = 8
    7676        Height = 27
    7777        Top = 112
    78         Width = 584
     78        Width = 586
    7979        Anchors = [akTop, akLeft, akRight]
    8080        AutoSize = False
    … …  
    8484      object Label1: TLabel
    8585        Left = 20
    86         Height = 25
     86        Height = 26
    8787        Top = 26
    88         Width = 81
     88        Width = 88
    8989        Caption = 'Language:'
    9090        ParentColor = False
    … …  
    9292      object ComboBoxLanguage: TComboBox
    9393        Left = 178
    94         Height = 33
     94        Height = 40
    9595        Top = 24
    9696        Width = 196
    97         ItemHeight = 25
     97        ItemHeight = 0
    9898        Style = csDropDownList
    9999        TabOrder = 2
    … …  
    102102    object TabSheetDebug: TTabSheet
    103103      Caption = 'Debug'
    104       ClientHeight = 226
    105       ClientWidth = 538
     104      ClientHeight = 220
     105      ClientWidth = 540
    106106      object CheckBoxDevelMode: TCheckBox
    107107        Left = 16

  • trunk/Forms/UFormSettings.pas

    r104 r145  
    1616    ButtonOk: TButton;
    1717    ButtonCancel: TButton;
    18     CheckBox1: TCheckBox;
     18    CheckBoxAutoSaveTurn: TCheckBox;
    1919    CheckBox2: TCheckBox;
    2020    CheckBoxDevelMode: TCheckBox;
    … …  
    6262begin
    6363  PageControl1.TabIndex := 0;
     64  Core.CoolTranslator1.TranslateComponentRecursive(Self);
    6465end;
    6566
    … …  
    8384  SpinEditX.Value := Core.ScaleDPI1.DPI.X;
    8485  SpinEditY.Value := Core.ScaleDPI1.DPI.Y;
     86  CheckBoxAutoSaveTurn.Checked := Core.AutoSaveEnabled;
    8587end;
    8688
    … …  
    9395  Core.ScaleDPI1.AutoDetect := CheckBox2.Checked;
    9496  Core.ScaleDPI1.DPI := Point(SpinEditX.Value, SpinEditY.Value);
     97  Core.AutoSaveEnabled := CheckBoxAutoSaveTurn.Checked;
    9598end;
    9699

  • trunk/Languages/xtactics.cs.po

    r136 r145  
    172172msgstr "Nápověda"
    173173
    174 #: tformmain.menuitem19.caption
    175 msgctxt "tformmain.menuitem19.caption"
    176 msgid "-"
    177 msgstr "-"
    178 
    179 #: tformmain.menuitem5.caption
    180 msgctxt "tformmain.menuitem5.caption"
    181 msgid "-"
    182 msgstr "-"
    183 
    184174#: tformmain.menuitem8.caption
    185175#| msgid "Settings"
    … …  
    436426msgstr "Nastavení"
    437427
    438 #: tformsettings.checkbox1.caption
    439 msgid "Autosave game on each turn"
    440 msgstr "Automaticky uložit hru po každém tahu"
    441 
    442428#: tformsettings.checkbox2.caption
    443429msgid "Automatic DPI"
    444430msgstr "Automatické DPI"
     431
     432#: tformsettings.checkboxautosaveturn.caption
     433#, fuzzy
     434msgctxt "tformsettings.checkboxautosaveturn.caption"
     435msgid "Autosave game on each turn"
     436msgstr "Automaticky uložit hru po každém tahu"
    445437
    446438#: tformsettings.checkboxdevelmode.caption
    … …  
    667659msgid "Zero zoom not allowed"
    668660msgstr "Nulové přiblížení není povoleno"
     661

  • trunk/Languages/xtactics.po

    r136 r145  
    162162msgstr ""
    163163
    164 #: tformmain.menuitem19.caption
    165 msgctxt "TFORMMAIN.MENUITEM19.CAPTION"
    166 msgid "-"
    167 msgstr ""
    168 
    169 #: tformmain.menuitem5.caption
    170 msgctxt "tformmain.menuitem5.caption"
    171 msgid "-"
    172 msgstr ""
    173 
    174164#: tformmain.menuitem8.caption
    175165msgctxt "tformmain.menuitem8.caption"
    … …  
    421411msgstr ""
    422412
    423 #: tformsettings.checkbox1.caption
    424 msgid "Autosave game on each turn"
    425 msgstr ""
    426 
    427413#: tformsettings.checkbox2.caption
    428414msgid "Automatic DPI"
     415msgstr ""
     416
     417#: tformsettings.checkboxautosaveturn.caption
     418msgctxt "tformsettings.checkboxautosaveturn.caption"
     419msgid "Autosave game on each turn"
    429420msgstr ""
    430421

  • trunk/Packages/Common/UScaleDPI.pas

    r116 r145  
    226226    Temp[I] := TBitmap.Create;
    227227    Temp[I].SetSize(NewWidth, NewHeight);
     228    {$ifdef linux}
     229    Temp[I].PixelFormat := pf24bit;
     230    {$else}
    228231    Temp[I].PixelFormat := pf32bit;
     232    {$endif}
    229233    Temp[I].TransparentColor := TempBmp.TransparentColor;
    230234    //Temp[I].TransparentMode := TempBmp.TransparentMode;

  • trunk/UCore.pas

    r134 r145  
    357357procedure TCore.ASettingsExecute(Sender: TObject);
    358358begin
    359   FormSettings.Load;
    360   if FormSettings.ShowModal = mrOk then begin
    361     FormSettings.Save;
    362     Game.SaveConfig(XMLConfig1, 'Game');
     359  FormSettings := TFormSettings.Create(nil);
     360  try
     361    FormSettings.Load;
     362    if FormSettings.ShowModal = mrOk then begin
     363      FormSettings.Save;
     364      Game.SaveConfig(XMLConfig1, 'Game');
     365    end;
     366  finally
     367    FreeAndNil(FormSettings);
    363368  end;
    364369end;

  • trunk/UGame.pas

    r142 r145  
    77uses
    88  Classes, SysUtils, ExtCtrls, Graphics, Contnrs, XMLConf, XMLRead, XMLWrite,
    9   DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf;
     9  DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf, fgl;
    1010
    1111const
    … …  
    417417    procedure BuildMapAreas;
    418418    procedure InitClients;
     419    procedure SelectPlayerStartCell(Player: TPlayer);
    419420  public
    420421    Players: TPlayers;
    … …  
    13021303
    13031304procedure TMap.Assign(Source: TMap);
    1304 var
    1305   I: Integer;
     1305//var
     1306//  I: Integer;
    13061307begin
    13071308  MaxPower := Source.MaxPower;
    … …  
    13541355var
    13551356  NewNode: TDOMNode;
    1356   NewNode2: TDOMNode;
    1357   I: Integer;
    13581357begin
    13591358  WriteInteger(Node, 'DefaultCellSizeX', DefaultCellSize.X);
    … …  
    14891488var
    14901489  X, Y: Integer;
    1491   I: Integer;
    14921490  NewCell: TCell;
    14931491begin
    … …  
    17121710  Node2: TDOMNode;
    17131711  Node3: TDOMNode;
    1714   NewCell: TCell;
    17151712begin
    17161713  Id := ReadInteger(Node, 'Id', 0);
    … …  
    19791976  AttackPower: Integer;
    19801977  TotalAttackPower: Integer;
    1981   I, J: Integer;
     1978  I: Integer;
    19821979  C: Integer;
    19831980  CanAttack: Integer;
    19841981  TargetCells: TCells;
    1985   S: string;
    19861982const
    19871983  AttackDiff = 1;
    … …  
    20412037  AttackPower: Integer;
    20422038  TotalAttackPower: Integer;
    2043   I, J: Integer;
     2039  I: Integer;
    20442040  C: Integer;
    20452041  CanAttack: Integer;
    20462042  TargetCells: TCells;
    2047   S: string;
    2048 const
    2049   AttackDiff = 2;
    20502043begin
    20512044  if Game.CurrentPlayer.Defensive then Exit;
    … …  
    23712364{ TGame }
    23722365
    2373 function ComparePointer(Item1, Item2: Pointer): Integer;
    2374 begin
    2375   Result := -CompareValue(Integer(Item1), Integer(Item2));
     2366function ComparePointer(const Item1, Item2: Integer): Integer;
     2367begin
     2368  Result := -CompareValue(Item1, Item2);
    23762369end;
    23772370
    … …  
    23822375  S: string;
    23832376  I: Integer;
    2384   AttackRolls: TList;
    2385   DefendRolls: TList;
    2386 begin
    2387   AttackRolls := TList.Create;
    2388   DefendRolls := TList.Create;
     2377  AttackRolls: TFPGList<Integer>;
     2378  DefendRolls: TFPGList<Integer>;
     2379begin
     2380  AttackRolls := TFPGList<Integer>.Create;
     2381  DefendRolls := TFPGList<Integer>.Create;
    23892382  if AttackPower < 1 then
    23902383    raise Exception.Create('Attacker power have to be higher then 0.');
    … …  
    24002393    AttackRolls.Count := AttackerDiceCount;
    24012394    for I := 0 to AttackerDiceCount - 1 do begin
    2402       AttackRolls[I] := Pointer(Random(7));
     2395      AttackRolls[I] := Random(7);
    24032396    end;
    24042397    AttackRolls.Sort(ComparePointer);
    … …  
    24082401    DefendRolls.Count := DefenderDiceCount;
    24092402    for I := 0 to DefenderDiceCount - 1 do begin
    2410       DefendRolls[I] := Pointer(Random(7));
     2403      DefendRolls[I] := Random(7);
    24112404    end;
    24122405    DefendRolls.Sort(ComparePointer);
    … …  
    28252818end;
    28262819
     2820procedure TGame.SelectPlayerStartCell(Player: TPlayer);
     2821var
     2822  Counter: Integer;
     2823begin
     2824  with Player do begin
     2825    // Try to obtain start cell for each player
     2826    StartCell := nil;
     2827    Counter := 0;
     2828    while not Assigned(StartCell) or Assigned(StartCell.Player) or
     2829    (StartCell.Terrain = ttVoid) do begin
     2830      StartCell := TCell(Map.Cells[Random(Map.Cells.Count)]);
     2831      Inc(Counter);
     2832      if Counter > 100 then
     2833        raise Exception.Create(SCannotSetPlayerStartCells);
     2834    end;
     2835  end;
     2836end;
     2837
    28272838procedure TGame.SaveConfig(Config: TXmlConfig; Path: string);
    28282839begin
    28292840  with Config do begin
    2830     SetValue(Path + '/GridType', Integer(MapType));
    2831     SetValue(Path + '/MapImage', MapImageFileName);
    2832     SetValue(Path + '/SymetricMap', SymetricMap);
    2833     SetValue(Path + '/FogOfWar', FogOfWar);
    2834     SetValue(Path + '/VoidEnabled', VoidEnabled);
    2835     SetValue(Path + '/VoidPercentage', VoidPercentage);
    2836     SetValue(Path + '/MapSizeX', Map.Size.X);
    2837     SetValue(Path + '/MapSizeY', Map.Size.Y);
    2838     SetValue(Path + '/MapShape', Integer(Map.Shape));
    2839     SetValue(Path + '/CityEnabled', CityEnabled);
    2840     SetValue(Path + '/CityPercentage', CityPercentage);
    2841     SetValue(Path + '/BridgeEnabled', BridgeEnabled);
    2842     SetValue(Path + '/GrowAmount', Integer(GrowAmount));
    2843     SetValue(Path + '/GrowCells', Integer(GrowCells));
    2844     SetValue(Path + '/WinObjective', Integer(WinObjective));
     2841    SetValue(DOMString(Path + '/GridType'), Integer(MapType));
     2842    SetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName));
     2843    SetValue(DOMString(Path + '/SymetricMap'), SymetricMap);
     2844    SetValue(DOMString(Path + '/FogOfWar'), FogOfWar);
     2845    SetValue(DOMString(Path + '/VoidEnabled'), VoidEnabled);
     2846    SetValue(DOMString(Path + '/VoidPercentage'), VoidPercentage);
     2847    SetValue(DOMString(Path + '/MapSizeX'), Map.Size.X);
     2848    SetValue(DOMString(Path + '/MapSizeY'), Map.Size.Y);
     2849    SetValue(DOMString(Path + '/MapShape'), Integer(Map.Shape));
     2850    SetValue(DOMString(Path + '/CityEnabled'), CityEnabled);
     2851    SetValue(DOMString(Path + '/CityPercentage'), CityPercentage);
     2852    SetValue(DOMString(Path + '/BridgeEnabled'), BridgeEnabled);
     2853    SetValue(DOMString(Path + '/GrowAmount'), Integer(GrowAmount));
     2854    SetValue(DOMString(Path + '/GrowCells'), Integer(GrowCells));
     2855    SetValue(DOMString(Path + '/WinObjective'), Integer(WinObjective));
    28452856  end;
    28462857end;
    … …  
    28512862begin
    28522863  with Config do begin
    2853     MapType := TMapType(GetValue(Path + '/GridType', Integer(mtHexagon)));
    2854     MapImageFileName := GetValue(Path + '/MapImage', MapImageFileName);
    2855     SymetricMap := GetValue(Path + '/SymetricMap', False);
    2856     FogOfWar := GetValue(Path + '/FogOfWar', False);
    2857     VoidEnabled := GetValue(Path + '/VoidEnabled', True);
    2858     VoidPercentage := GetValue(Path + '/VoidPercentage', 20);
    2859     Map.Size := Point(GetValue(Path + '/MapSizeX', 10),
    2860       GetValue(Path + '/MapSizeY', 10));
    2861     Value := GetValue(Path + '/MapShape', 0);
     2864    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
     2865    MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
     2866    SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);
     2867    FogOfWar := GetValue(DOMString(Path + '/FogOfWar'), False);
     2868    VoidEnabled := GetValue(DOMString(Path + '/VoidEnabled'), True);
     2869    VoidPercentage := GetValue(DOMString(Path + '/VoidPercentage'), 20);
     2870    Map.Size := Point(GetValue(DOMString(Path + '/MapSizeX'), 10),
     2871      GetValue(DOMString(Path + '/MapSizeY'), 10));
     2872    Value := GetValue(DOMString(Path + '/MapShape'), 0);
    28622873    if (Value >= Integer(Low(TMapShape))) and (Value <= Integer(High(TMapShape))) then
    28632874      Map.Shape := TMapShape(Value) else Map.Shape := Low(TMapShape);
    2864     CityEnabled := GetValue(Path + '/CityEnabled', False);
    2865     CityPercentage := GetValue(Path + '/CityPercentage', 10);
    2866     BridgeEnabled := GetValue(Path + '/BridgeEnabled', True);
    2867     Value := GetValue(Path + '/GrowAmount', Integer(gaBySquareRoot));
     2875    CityEnabled := GetValue(DOMString(Path + '/CityEnabled'), False);
     2876    CityPercentage := GetValue(DOMString(Path + '/CityPercentage'), 10);
     2877    BridgeEnabled := GetValue(DOMString(Path + '/BridgeEnabled'), True);
     2878    Value := GetValue(DOMString(Path + '/GrowAmount'), Integer(gaBySquareRoot));
    28682879    if (Value >= Integer(Low(TGrowAmount))) and (Value <= Integer(High(TGrowAmount))) then
    28692880      GrowAmount := TGrowAmount(Value) else GrowAmount := Low(TGrowAmount);
    2870     Value := GetValue(Path + '/GrowCells', Integer(gcPlayerAll));
     2881    Value := GetValue(DOMString(Path + '/GrowCells'), Integer(gcPlayerAll));
    28712882    if (Value >= Integer(Low(TGrowCells))) and (Value <= Integer(High(TGrowCells))) then
    28722883      GrowCells := TGrowCells(Value) else GrowCells := Low(TGrowCells);
    2873     Value := GetValue(Path + '/WinObjective', Integer(woDefeatAllOponents));
     2884    Value := GetValue(DOMString(Path + '/WinObjective'), Integer(woDefeatAllOponents));
    28742885    if (Value >= Integer(Low(TWinObjective))) and (Value <= Integer(High(TWinObjective))) then
    28752886      WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
    … …  
    28852896begin
    28862897  Self.FileName := FileName;
    2887   ReadXMLFile(Doc, UTF8Decode(FileName));
     2898  ReadXMLFile(Doc, FileName);
    28882899  with Doc do try
    28892900    if Doc.DocumentElement.NodeName <> 'XtacticsGame' then
    … …  
    29742985  end;
    29752986    ForceDirectoriesUTF8(ExtractFileDir(FileName));
    2976     WriteXMLFile(Doc, UTF8Decode(FileName));
     2987    WriteXMLFile(Doc, FileName);
    29772988  finally
    29782989    Doc.Free;
    … …  
    31363147var
    31373148  I: Integer;
    3138   Counter: Integer;
    31393149  C: Integer;
    31403150  LastAreaCount: Integer;
    … …  
    31723182    PlayerMap.Update;
    31733183    if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
    3174       // Try to obtain start cell for each player
    3175       StartCell := nil;
    3176       Counter := 0;
    3177       while not Assigned(StartCell) or Assigned(StartCell.Player) or
    3178      (StartCell.Terrain = ttVoid) do begin
    3179         StartCell := TCell(Map.Cells[Random(Map.Cells.Count)]);
    3180         Inc(Counter);
    3181         if Counter > 100 then
    3182           raise Exception.Create(SCannotSetPlayerStartCells);
    3183       end;
     3184      SelectPlayerStartCell(TPlayer(Players[I]));
    31843185      if SymetricMap and (I = 1) then
    31853186        StartCell := TCell(Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(TPlayer(Players[0]).StartCell)]);

  • trunk/UMap.pas

    r101 r145  
    66
    77uses
    8   Classes, SysUtils, UGame, XMLConf, XMLRead, XMLWrite, DOM;
     8  Classes, SysUtils, UGame, XMLRead, XMLWrite, DOM;
    99
    1010type
    … …  
    143143var
    144144  X, Y: Integer;
    145   I: Integer;
    146145  NewCell: TCell;
    147146  PX, PY: Double;
    … …  
    237236  Reverse: Boolean): TPointArray;
    238237begin
    239 
     238  SetLength(Result, 0);
    240239end;
    241240
    … …  
    243242var
    244243  X, Y: Integer;
    245   I, J, PI: Integer;
    246   V, VN: Integer;
    247244  NewCell: TCell;
    248   Pos: TPoint;
    249245begin
    250246  // Free previous

  • trunk/xtactics.lpi

    r134 r145  
    1818      <OutDir Value="Languages"/>
    1919    </i18n>
    20     <VersionInfo>
    21       <StringTable ProductVersion=""/>
    22     </VersionInfo>
    2320    <BuildModes Count="4">
    2421      <Item1 Name="Debug" Default="True"/>

  • trunk/xtactics.lpr

    r128 r145  
    1111  TemplateGenerics, UFormPlayer
    1212  { you can add units after this },
    13   SysUtils, UFormSettings, UFormMain, UFormMove, UFormNew, UFormAbout,
    14   UFormHelp, UMap, UFormCharts;
     13  SysUtils, UFormMain, UFormMove, UFormNew, UFormCharts;
    1514
    1615{$R *.res}
    … …  
    3635  Application.CreateForm(TFormMove, FormMove);
    3736  Application.CreateForm(TFormPlayer, FormPlayer);
    38   Application.CreateForm(TFormSettings, FormSettings);
    3937  Application.CreateForm(TFormCharts, FormCharts);
    4038  Application.Run;
Note: See TracChangeset for help on using the changeset viewer.