Changeset 9 for trunk


Ignore:
Timestamp:
Jan 7, 2017, 1:28:56 PM (8 years ago)
Author:
chronos
Message:
  • Modified: Converted to Lazarus project. Application can be run with errors.
Location:
trunk
Files:
18 added
17 deleted
34 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        66Win32
        77*.~dsk
         8C-evo.exe
         9Integrated.compiled
         10Integrated.lps
         11lib

  • trunk/Area.pas

    r2 r9  
    44
    55uses
    6   WinProcs, Classes, Graphics, Controls;
     6  Classes, Graphics, Controls;
    77
    88type

  • trunk/Back.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22unit Back;
    33
    … …  
    55
    66uses
    7   Windows, Messages, SysUtils, Classes, Graphics, Forms;
     7  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Forms;
    88
    99type
    … …  
    2525  Directories, ScreenTools, Start;
    2626
    27 {$R *.DFM}
     27{$R *.lfm}
    2828
    2929procedure TBackground.FormCreate(Sender: TObject);

  • trunk/ButtonA.pas

    r2 r9  
    55uses
    66  ButtonBase,
    7   WinProcs, Classes, Graphics;
     7  Classes, Graphics, LCLIntf, LCLType;
    88
    99type

  • trunk/ButtonB.pas

    r2 r9  
    55uses
    66  ButtonBase,
    7   WinProcs, Classes, Graphics;
     7  Classes, Graphics, LCLIntf, LCLType;
    88
    99type

  • trunk/ButtonBase.pas

    r2 r9  
    44
    55uses
    6   WinProcs, Classes, Graphics, Controls;
     6  Classes, Graphics, Controls;
    77
    88type

  • trunk/ButtonC.pas

    r2 r9  
    55uses
    66  ButtonBase,
    7   WinProcs, Classes, Graphics;
     7  Classes, Graphics, LCLIntf, LCLType;
    88
    99type

  • trunk/ButtonN.pas

    r2 r9  
    44
    55uses
    6   WinProcs, Classes, Graphics, Controls;
     6  Classes, Graphics, Controls, LCLIntf, LCLType;
    77
    88type

  • trunk/Database.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22// {$DEFINE TEXTLOG}
    33// {$DEFINE LOADPERF}
    … …  
    171171  UnBuilt: array [0 .. nPl - 1] of integer; { number of units built }
    172172
    173 procedure MaskD(var x; Count, Mask: Cardinal); Register;
    174 asm
     173procedure MaskD(var x; Count, Mask: Cardinal);
     174begin
     175{ TODO
    175176  sub eax,4
    176177@r: and [eax+edx*4],ecx
    177178  dec edx
    178179  jnz @r
     180  }
    179181end;
    180182

  • trunk/Direct.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22unit Direct;
    33
    … …  
    77  Messg,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms;
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms;
    1010
    1111const
    … …  
    4141
    4242uses
    43   ScreenTools, Protocol, GameServer, Start, LocalPlayer, NoTerm, Back, ShellAPI;
    44 
    45 {$R *.DFM}
     43  ScreenTools, Protocol, GameServer, Start, LocalPlayer, NoTerm, Back;
     44
     45{$R *.lfm}
    4646
    4747procedure Notify(ID: integer);
    … …  
    110110    ntLoadError:
    111111      begin
    112         if OpenClipboard(Handle) then
     112(* TODO        if OpenClipboard(Handle) then
    113113        begin // copy file path to clipboard
    114114          NotifyMessage := NotifyMessage + #0;
    … …  
    128128          ShowModal;
    129129          if ModalResult = mrOK then
    130             ShellExecute(Handle, 'open',
    131               'http://c-evo.org/_sg/contact/cevobug.html', '', '',
    132               SW_SHOWNORMAL);
     130            OpenURL('http://c-evo.org/_sg/contact/cevobug.html');{ *Převedeno z ShellExecute* }
    133131        end
     132    *)
    134133      end;
    135134    ntStartDone:

  • trunk/Directories.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22unit Directories;
    33
    … …  
    1212
    1313uses
    14   ShlObj, Windows, SysUtils;
     14  ShlObj, LCLIntf, LCLType, LMessages, SysUtils, FileUtil;
    1515
    1616function GetSpecialDirectory(const CSIDL: integer): string;

  • trunk/EOTButton.pas

    r2 r9  
    55uses
    66  ButtonBase,
    7   WinProcs, Classes, Graphics;
     7  Classes, Graphics, LCLIntf, LCLType;
    88
    99const

  • trunk/GameServer.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22// {$DEFINE TEXTLOG}
    33// {$DEFINE LOADPERF}
    … …  
    77
    88uses
    9   Protocol, Database;
     9  Protocol, Database, dynlibs, Windows;
    1010
    1111const
    … …  
    9999  Directories, CityProcessing, UnitProcessing, CmdList,
    100100
    101   Windows, Classes, SysUtils;
     101  LCLIntf, LCLType, LMessages, Classes, SysUtils;
    102102
    103103var
    … …  
    15361536          inc(nTech[pTurn]);
    15371537          if Mode >= moMovie then
    1538             CallPlayer(cShowGreatLibTech, pTurn, ad);
     1538            // TODO CallPlayer(cShowGreatLibTech, pTurn, ad);
    15391539          // do not call CallPlayer(pTurn) while map is invalid
    15401540        end;

  • trunk/Inp.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22unit Inp;
    33
    … …  
    77  ScreenTools, Messg,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    1010  ButtonA, StdCtrls, ButtonB, ButtonBase;
    1111
    … …  
    3131implementation
    3232
    33 {$R *.DFM}
     33{$R *.lfm}
    3434
    3535procedure TInputDlg.FormCreate(Sender: TObject);

  • trunk/LocalPlayer/BaseWin.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit BaseWin;
    33
    … …  
    77  ScreenTools, Messg,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms;
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms;
    1010
    1111type

  • trunk/LocalPlayer/CityScreen.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit CityScreen;
    33
    … …  
    77  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
    1010  ButtonA,
    1111  ButtonB, ButtonBase, ButtonC, Area;
    … …  
    9393  Math;
    9494
    95 {$R *.DFM}
     95{$R *.lfm}
    9696
    9797const
    … …  
    306306  with SmallCityMap.Canvas do
    307307  begin
    308     brush.Color := Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
     308    brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
    309309    for i := 0 to 29 do
    310310    begin
    … …  
    338338        if i < 36 then
    339339        begin
    340           brush.Color := Colors.Canvas.Pixels[clkAge0 + Age, cliImpProject];
     340          brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImpProject];
    341341          FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
    342342            3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
    … …  
    989989    if ProdHint then
    990990    begin
    991       Frame(offscreen.Canvas, xView + 9 - 1, yView + 5 - 1,
     991      ScreenTools.Frame(offscreen.Canvas, xView + 9 - 1, yView + 5 - 1,
    992992        xView + 9 + xSizeBig, yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
    993993      RFrame(offscreen.Canvas, xView + 9 - 2, yView + 5 - 2,
    … …  
    16241624        bitblt(Canvas.Handle, xView + 5 + 62, yView + 3, 2, 42,
    16251625          Back.Canvas.Handle, xView + 5 + 62, yView + 3, SRCCOPY);
    1626         Frame(Canvas, xView + 9 - 1, yView + 5 - 1, xView + 9 + xSizeBig,
     1626        ScreenTools.Frame(Canvas, xView + 9 - 1, yView + 5 - 1, xView + 9 + xSizeBig,
    16271627          yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
    16281628        RFrame(Canvas, xView + 9 - 2, yView + 5 - 2, xView + 9 + xSizeBig + 1,

  • trunk/LocalPlayer/Diagram.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit Diagram;
    33
    … …  
    77  BaseWin,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    1010  ButtonB, ButtonBase, Menus;
    1111
    … …  
    4343  Protocol, ScreenTools, ClientTools, Term, Tribes;
    4444
    45 {$R *.DFM}
     45{$R *.lfm}
    4646
    4747const
    … …  
    6666    FillRect(Rect(Left, Top, Left + Width, Top + 200));
    6767    Brush.Style := bsClear;
    68     Frame(canvas, Left - 1, Top - 1, Left + Width, Top + 200,
     68    ScreenTools.Frame(canvas, Left - 1, Top - 1, Left + Width, Top + 200,
    6969      MainTexture.clBevelShade, MainTexture.clBevelLight);
    7070    RFrame(canvas, Left - 2, Top - 2, Left + Width + 1, Top + 200 + 1,

  • trunk/LocalPlayer/Draft.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit Draft;
    33
    … …  
    77  Protocol, ClientTools, Term, ScreenTools, PVSB, BaseWin,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
    1010  ButtonA,
    1111  ButtonB, ButtonBase, Area;
    … …  
    4747uses Help, Tribes, Directories;
    4848
    49 {$R *.DFM}
     49{$R *.lfm}
    5050
    5151const
    … …  
    352352        DarkGradient(offscreen.Canvas, xFeature + 17,
    353353          yFeature + LinePitch * i, 16, 1);
    354         Frame(offscreen.Canvas, xFeature + 18, yFeature + 1 + LinePitch * i,
     354        ScreenTools.Frame(offscreen.Canvas, xFeature + 18, yFeature + 1 + LinePitch * i,
    355355          xFeature + 20 - 2 + 13, yFeature + 2 + 1 - 2 + 13 + LinePitch * i,
    356356          $C0C0C0, $C0C0C0);

  • trunk/LocalPlayer/Help.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit Help;
    33
    … …  
    77  Protocol, ScreenTools, BaseWin, StringTables,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    10   ExtCtrls, ButtonB, PVSB, ButtonBase;
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
     10  ExtCtrls, ButtonB, PVSB, ButtonBase, Types;
    1111
    1212const
    … …  
    9898
    9999uses
    100   Directories, ClientTools, Term, Tribes, ShellAPI, Inp, Messg;
    101 
    102 {$R *.DFM}
     100  Directories, ClientTools, Term, Tribes, Inp, Messg;
     101
     102{$R *.lfm}
    103103
    104104type
    105   THelpLineInfo = packed record
     105  THelpLineInfo = class
    106106    Format, Picpix: Byte;
    107107    Link: Word;
    … …  
    113113  HelpLineInfo: THelpLineInfo;
    114114begin
     115  HelpLineInfo := THelpLineInfo.Create;
    115116  if LinkIndex < 0 then
    116117    LinkIndex := liInvalid;
    … …  
    475476          pkSmallIcon, pkSmallIcon_AsPreq:
    476477            begin
    477               Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
     478              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
    478479                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
    479480              if HelpLineInfo.Picpix = imPalace then
    … …  
    533534          pkDomain:
    534535            begin
    535               Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
     536              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
    536537                8 + 36 + x0[i], 2 + 20 + i * 24, $000000, $000000);
    537538              Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
    … …  
    541542          pkAdvIcon, pkAdvIcon_AsPreq:
    542543            begin
    543               Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
     544              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
    544545                8 + xSizeSmall + x0[i], 2 + ySizeSmall + i * 24,
    545546                $000000, $000000);
    … …  
    582583                  Dump(OffScreen, HGrSystem, InnerWidth - 38 - 38 * cnt,
    583584                    i * 24 + 1, 36, 20, 75 + j * 37, 295);
    584                   Frame(OffScreen.Canvas, InnerWidth - 39 - 38 * cnt, i * 24,
     585                  ScreenTools.Frame(OffScreen.Canvas, InnerWidth - 39 - 38 * cnt, i * 24,
    585586                    InnerWidth - 2 - 38 * cnt, i * 24 + 21, $000000, $000000);
    586587                end;
    … …  
    707708              DarkGradient(OffScreen.Canvas, x0[i] + 8 - 1,
    708709                7 + i * 24 - 3, 16, 1);
    709               Frame(OffScreen.Canvas, x0[i] + 8, 7 + i * 24 - 2, x0[i] + 8 + 13,
     710              ScreenTools.Frame(OffScreen.Canvas, x0[i] + 8, 7 + i * 24 - 2, x0[i] + 8 + 13,
    710711                7 + i * 24 - 2 + 13, $C0C0C0, $C0C0C0);
    711712              Sprite(OffScreen, HGrSystem, x0[i] + 8 + 2, 7 + i * 24, 10, 10,
    … …  
    716717          pkExp:
    717718            begin
    718               Frame(OffScreen.Canvas, 20 - 1, 8 - 4 + i * 24, 20 + 12,
     719              ScreenTools.Frame(OffScreen.Canvas, 20 - 1, 8 - 4 + i * 24, 20 + 12,
    719720                8 + 11 + i * 24, $000000, $000000);
    720721              Dump(OffScreen, HGrSystem, 20, 8 - 3 + i * 24, 12, 14,
    … …  
    730731          pkGov:
    731732            begin
    732               Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
     733              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
    733734                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
    734735              BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24, xSizeSmall,
    … …  
    750751          x0[i] := x0[i] + 8
    751752        end;
    752         line(OffScreen.Canvas, i, false)
    753       end
     753        Self.line(OffScreen.Canvas, i, false)
     754      end;
    754755  end;
    755756  MarkUsedOffscreen(InnerWidth, InnerHeight + 13 + 48);
    … …  
    18951896        case Link and $FF of
    18961897          1:
    1897             ShellExecute(Handle, 'open',
    1898               pchar(HomeDir + 'AI Template\AI development manual.html'), '', '',
    1899               SW_SHOWNORMAL);
     1898             OpenDocument(pchar(HomeDir + 'AI Template\AI development manual.html'));{ *Převedeno z ShellExecute* }
    19001899          2:
    1901             ShellExecute(Handle, 'open', 'http://c-evo.org', '', '',
    1902               SW_SHOWNORMAL);
     1900            OpenURL('http://c-evo.org');{ *Převedeno z ShellExecute* }
    19031901          3:
    1904             ShellExecute(Handle, 'open', 'http://c-evo.org/_sg/contact', '', '',
    1905               SW_SHOWNORMAL);
     1902            OpenURL('http://c-evo.org/_sg/contact');{ *Převedeno z ShellExecute* }
    19061903        end
    19071904      else

  • trunk/LocalPlayer/IsoEngine.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit IsoEngine;
    33
    … …  
    77  Protocol, ClientTools, ScreenTools, Tribes,
    88{$IFNDEF SCR}Term, {$ENDIF}
    9   Windows, SysUtils, Classes, Graphics;
     9  LCLIntf, LCLType, LMessages, SysUtils, Classes, Graphics;
    1010
    1111type
    … …  
    504504            exit;
    505505
    506           Windows.BitBlt(FOutput.Canvas.Handle, x, y, Width, Height,
     506          LCLIntf.BitBlt(FOutput.Canvas.Handle, x, y, Width, Height,
    507507            Src.Canvas.Handle, xSrc, ySrc, Rop);
    508508        end;
    … …  
    546546            exit;
    547547
    548           Windows.BitBlt(OutDC, xDst, yDst, Width, Height, MaskDC, xSrc,
     548          LCLIntf.BitBlt(OutDC, xDst, yDst, Width, Height, MaskDC, xSrc,
    549549            ySrc, SRCAND);
    550550          if not PureBlack then
    551             Windows.BitBlt(OutDC, xDst, yDst, Width, Height, DataDC, xSrc, ySrc,
     551            LCLIntf.BitBlt(OutDC, xDst, yDst, Width, Height, DataDC, xSrc, ySrc,
    552552              SRCPAINT);
    553553        end;
    … …  
    10041004                if BordersOK and (1 shl p1) = 0 then
    10051005                begin
    1006                   Windows.BitBlt(Borders.Canvas.Handle, 0, p1 * (yyt * 2),
     1006                  LCLIntf.BitBlt(Borders.Canvas.Handle, 0, p1 * (yyt * 2),
    10071007                    xxt * 2, yyt * 2, GrExt[HGrTerrain].Data.Canvas.Handle,
    10081008                    1 + 8 * (xxt * 2 + 1),

  • trunk/LocalPlayer/LocalPlayer.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit LocalPlayer;
    33
    … …  
    2525    FormsCreated := true;
    2626    BaseWin.CreateOffscreen;
     27//    Application.MainForm := MainScreen;
    2728    Application.CreateForm(TMainScreen, MainScreen);
     29    MainScreen.HandleNeeded; // Force to call CreateParams method
    2830    Application.CreateForm(TCityDlg, CityDlg);
    2931    Application.CreateForm(TModalSelectDlg, ModalSelectDlg);

  • trunk/LocalPlayer/MessgEx.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit MessgEx;
    33
    … …  
    55
    66uses
    7   Messg, Protocol, ScreenTools,
    8 
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
     7  Messg, Protocol, ScreenTools, Windows,
     8
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
    1010  ButtonB, ButtonBase, StdCtrls;
    1111
    … …  
    7777  IsoEngine, Diagram;
    7878
    79 {$R *.DFM}
     79{$R *.lfm}
    8080
    8181const

  • trunk/LocalPlayer/NatStat.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit NatStat;
    33
    … …  
    77  Protocol, ClientTools, Term, ScreenTools, BaseWin,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    1010  ButtonBase, ButtonB, ButtonC, Menus, EOTButton;
    1111
    … …  
    5555implementation
    5656
    57 {$R *.DFM}
     57{$R *.lfm}
    5858
    5959uses

  • trunk/LocalPlayer/Nego.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit Nego;
    33
    … …  
    427427      FillRect(Rect(X, Y, X + 64, Y + 48));
    428428    Brush.Style := bsClear;
    429     Frame(Offscreen.Canvas, X - 1, Y - 1, X + 64, Y + 48, $000000, $000000);
     429    ScreenTools.Frame(Offscreen.Canvas, X - 1, Y - 1, X + 64, Y + 48, $000000, $000000);
    430430  end
    431431end;

  • trunk/LocalPlayer/PVSB.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit PVSB;
    33
    … …  
    55
    66uses
    7   Windows, Messages, SysUtils;
     7  Windows, LCLIntf, LCLType, LMessages, Messages, SysUtils;
    88
    99type

  • trunk/LocalPlayer/Select.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit Select;
    33
    … …  
    77  Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    10   ExtCtrls, ButtonB, ButtonBase, Menus;
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
     10  ExtCtrls, ButtonB, ButtonBase, Menus, Types;
    1111
    1212const
    … …  
    8989  CityScreen, Help, UnitStat, Tribes, Inp;
    9090
    91 {$R *.DFM}
     91{$R *.lfm}
    9292
    9393const
    … …  
    761761    for i := -1 to DispLines do
    762762      if (i + sb.si.npos >= 0) and (i + sb.si.npos < Lines[Layer]) then
    763         line(offscreen.Canvas, i, true, false)
     763        Self.line(offscreen.Canvas, i, true, false)
    764764  end;
    765765  MarkUsedOffscreen(InnerWidth, 8 + 48 + DispLines * LineDistance);

  • trunk/LocalPlayer/Term.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit Term;
    33
    … …  
    55
    66uses
    7   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
    8 
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus,
     7  Windows, Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
     8
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus,
    1010  ExtCtrls,
    1111  ButtonA, ButtonB, ButtonC, EOTButton, Area;
    … …  
    427427uses
    428428  Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
    429   UnitStat, Diplomacy, Inp, log, Diagram, NatStat, Wonders, Enhance, Nego,
     429  UnitStat, Diplomacy, Inp, Log, Diagram, NatStat, Wonders, Enhance, Nego,
    430430  Battle, Rates,
    431431  TechTree,
    432432
    433   Registry, ShellAPI;
    434 
    435 {$R *.DFM}
    436 {$R Res1.res}
     433  Registry;
     434
     435{$R *.lfm}
     436// TODO {$R Res1.res}
    437437
    438438const
    … …  
    42044204      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
    42054205      rec := Rect(0, 0, MapWidth, MapHeight);
    4206       ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2),
    4207         (ywd - yw) * yyt, rec, rec, 0, nil);
     4206      { TODO ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2),
     4207        (ywd - yw) * yyt, rec, rec, 0, nil);}
    42084208      for DoInvalidate := false to FastScrolling do
    42094209      begin
    … …  
    42114211        begin
    42124212          rec.Bottom := MapHeight - overlap;
    4213           ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
    4214             rec, 0, nil);
     4213          { TODO ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
     4214            rec, 0, nil);}
    42154215          ProcessOptions := prInvalidate;
    42164216        end
    … …  
    43724372        if supervising then
    43734373        begin
    4374           Frame(Panel.Canvas, ClientWidth - xPalace - 1, yPalace - 1,
     4374          ScreenTools.Frame(Panel.Canvas, ClientWidth - xPalace - 1, yPalace - 1,
    43754375            ClientWidth - xPalace + xSizeBig, yPalace + ySizeBig,
    43764376            $B0B0B0, $FFFFFF);
    … …  
    43924392
    43934393      if GameMode = cMovie then
    4394         Frame(Panel.Canvas, xMini + 1, yMini + 1, xMini + 2 + G.lx * 2,
     4394        ScreenTools.Frame(Panel.Canvas, xMini + 1, yMini + 1, xMini + 2 + G.lx * 2,
    43954395          yMini + 2 + G.ly, $000000, $000000)
    43964396      else
    43974397      begin
    4398         Frame(Panel.Canvas, xMini + 1, yMini + 1, xMini + 2 + G.lx * 2,
     4398        ScreenTools.Frame(Panel.Canvas, xMini + 1, yMini + 1, xMini + 2 + G.lx * 2,
    43994399          yMini + 2 + G.ly, $B0B0B0, $FFFFFF);
    44004400        RFrame(Panel.Canvas, xMini, yMini, xMini + 3 + G.lx * 2,
    … …  
    44984498            if BrushTypes[i] = BrushType then
    44994499            begin
    4500               Frame(Panel.Canvas, xTroop + 2 + x, yTroop + 7 - yyt div 2,
     4500              ScreenTools.Frame(Panel.Canvas, xTroop + 2 + x, yTroop + 7 - yyt div 2,
    45014501                xTroop + 2 * xxt + x, yTroop + 2 * yyt + 11, $000000, $000000);
    4502               Frame(Panel.Canvas, xTroop + 1 + x, yTroop + 6 - yyt div 2,
     4502              ScreenTools.Frame(Panel.Canvas, xTroop + 1 + x, yTroop + 6 - yyt div 2,
    45034503                xTroop + 2 * xxt - 1 + x, yTroop + 2 * yyt + 10,
    45044504                MainTexture.clMark, MainTexture.clMark);
    … …  
    46554655                        if uix = UnFocus then
    46564656                        begin
    4657                           Frame(Panel.Canvas, xTroop + 4 + x, yTroop + 3,
     4657                          ScreenTools.Frame(Panel.Canvas, xTroop + 4 + x, yTroop + 3,
    46584658                            xTroop + 64 + x, yTroop + 47, $000000, $000000);
    4659                           Frame(Panel.Canvas, xTroop + 3 + x, yTroop + 2,
     4659                          ScreenTools.Frame(Panel.Canvas, xTroop + 3 + x, yTroop + 2,
    46604660                            xTroop + 63 + x, yTroop + 46, MainTexture.clMark,
    46614661                            MainTexture.clMark);
    … …  
    48224822      LineTo(ClientWidth, TopBarHeight - 3);
    48234823      Pen.Color := MainTexture.clBevelLight;
    4824       Frame(TopBar.Canvas, 40, -1, xTreasurySection - 1, TopBarHeight - 7,
     4824      ScreenTools.Frame(TopBar.Canvas, 40, -1, xTreasurySection - 1, TopBarHeight - 7,
    48254825        MainTexture.clBevelShade, MainTexture.clBevelLight);
    4826       Frame(TopBar.Canvas, xResearchSection + 332, -1, ClientWidth,
     4826      ScreenTools.Frame(TopBar.Canvas, xResearchSection + 332, -1, ClientWidth,
    48274827        TopBarHeight - 7, MainTexture.clBevelShade, MainTexture.clBevelLight);
    48284828    end;
    … …  
    68456845          end
    68466846          else
    6847             with MessgExDlg do
     6847            // TODO with MessgExDlg do
    68486848            begin // revolution!
    6849               MessgText := Tribe[me].TPhrase('REVOLUTION');
    6850               Kind := mkYesNo;
    6851               IconKind := mikPureIcon;
    6852               IconIndex := 72; // anarchy palace
    6853               ShowModal;
     6849              MessgExDlg.MessgText := Tribe[me].TPhrase('REVOLUTION');
     6850              MessgExDlg.Kind := mkYesNo;
     6851              MessgExDlg.IconKind := mikPureIcon;
     6852              MessgExDlg.IconIndex := 72; // anarchy palace
     6853              MessgExDlg.ShowModal;
    68546854              if ModalResult = mrOK then
    68556855              begin
    … …  
    68686868      end
    68696869      else if Sender = mWebsite then
    6870         ShellExecute(Handle, 'open', 'http://c-evo.org', '', '', SW_SHOWNORMAL)
     6870        OpenURL('http://c-evo.org'){ *Převedeno z ShellExecute* }
    68716871      else if Sender = mRandomMap then
    68726872      begin

  • trunk/LocalPlayer/UnitStat.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit UnitStat;
    33
    … …  
    77  Protocol, ClientTools, Term, ScreenTools, BaseWin,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
    1010  ButtonB,
    1111  ButtonBase, ButtonC;
    … …  
    5454uses Inp, Select, Tribes, IsoEngine, Help, Directories;
    5555
    56 {$R *.DFM}
     56{$R *.lfm}
    5757
    5858const

  • trunk/LocalPlayer/Wonders.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE switches.pas}
    22unit Wonders;
    33
    … …  
    77  ScreenTools, BaseWin, Protocol,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    1010  ButtonBase, ButtonB;
    1111
    … …  
    3636  Term, ClientTools, Help, Tribes;
    3737
    38 {$R *.DFM}
     38{$R *.lfm}
    3939
    4040const

  • trunk/Log.pas

    r6 r9  
    1 {$INCLUDE switches}
    2 unit log;
     1{$INCLUDE Switches.pas}
     2unit Log;
    33
    44interface
    55
    66uses
    7   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
     7  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    88  StdCtrls, Menus;
    99
    … …  
    4747  ClientTools, Tribes;
    4848
    49 {$R *.DFM}
     49{$R *.lfm}
    5050
    5151const

  • trunk/Messg.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22unit Messg;
    33
    … …  
    77  ScreenTools,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonBase,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonBase,
    1010  ButtonA,
    1111  ButtonB, Area;
    … …  
    7171implementation
    7272
    73 {$R *.DFM}
     73{$R *.lfm}
    7474
    7575constructor TDrawDlg.Create(AOwner: TComponent);

  • trunk/ScreenTools.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22unit ScreenTools;
    33
    … …  
    55
    66uses
    7   StringTables,
    8 
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus;
     7  Windows, StringTables,
     8
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus;
    1010
    1111type
    … …  
    1313    Image: TBitmap;
    1414    clBevelLight, clBevelShade, clTextLight, clTextShade, clLitText, clMark,
    15       clPage, clCover: TColor end;
     15      clPage, clCover: TColor;
     16  end;
    1617
    1718    function ChangeResolution(x, y, bpp, freq: integer): boolean;
    … …  
    192193  Directories, Sound, ButtonBase, ButtonA, ButtonB,
    193194
    194   Registry, JPEG;
     195  Registry;
    195196
    196197var

  • trunk/Start.pas

    r6 r9  
    1 {$INCLUDE switches}
     1{$INCLUDE Switches.pas}
    22unit Start;
    33
    … …  
    77  GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area,
    88
    9   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
     9  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
    1010  Menus, Registry;
    1111
    … …  
    105105
    106106uses
    107   Directories, Protocol, Direct, ScreenTools, Inp, Back,
    108 
    109   ShellAPI;
    110 
    111 {$R *.DFM}
     107  Directories, Protocol, Direct, ScreenTools, Inp, Back;
     108
     109{$R *.lfm}
    112110
    113111const
    … …  
    927925
    928926        if (AutoDiff < 0) and (bixView[0] = bixNoTerm) then
    929           FileName := 'Round' + IntToStr(GetCurrentProcessID())
     927          FileName := 'Round' + IntToStr(GetProcessID())
    930928        else
    931929        begin
    … …  
    15941592      maConfig:
    15951593        begin
    1596           ShellExecute(Handle, 'open', pchar(HomeDir + 'Configurator.exe'),
    1597             pchar('-r"' + ParamStr(0) + '"'), '', SW_SHOWNORMAL);
     1594           OpenDocument(pchar(HomeDir + 'Configurator.exe'));{ *Převedeno z ShellExecute* }
    15981595          Close
    15991596        end;
    … …  
    16031600        DirectHelp(cStartCredits);
    16041601      maAIDev:
    1605         ShellExecute(Handle, 'open',
    1606           pchar(HomeDir + 'AI Template\AI development manual.html'), '', '',
    1607           SW_SHOWNORMAL);
     1602         OpenDocument(pchar(HomeDir + 'AI Template\AI development manual.html'));{ *Převedeno z ShellExecute* }
    16081603      maWeb:
    1609         ShellExecute(Handle, 'open', 'http://c-evo.org', '', '', SW_SHOWNORMAL)
     1604        OpenURL('http://c-evo.org'){ *Převedeno z ShellExecute* }
    16101605    end;
    16111606  end

  • trunk/Switches.pas

    r2 r9  
    1010{$TYPEINFO OFF}
    1111{$DEBUGINFO ON}
    12 {$LOCALSYMBOLS ON}
     12//{$LOCALSYMBOLS ON}
    1313
    14 {$E-,S-,Z1}
     14//{$E-,S-,Z1}
    1515
    1616{$IFDEF FPC} // freepascal
Note: See TracChangeset for help on using the changeset viewer.