X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_panel.pas;h=19a6af815b51077098b1fec363f77bfabdf4370e;hb=4c4a0406b07cdfd5051e388e8b00f02e008ed140;hp=d724f2af056e6e91ea8154bb4b14c6678aaf78d6;hpb=984a31dcc2636073083a3a3cf8d4d409019d211a;p=d2df-sdl.git diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas index d724f2a..19a6af8 100644 --- a/src/game/g_panel.pas +++ b/src/game/g_panel.pas @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *) -{$MODE DELPHI} +{$INCLUDE ../shared/a_modes.inc} unit g_panel; interface @@ -41,6 +41,11 @@ type True: (AnTex: TAnimation); end; + private + function getx1 (): Integer; inline; + function gety1 (): Integer; inline; + function getvisvalid (): Boolean; inline; + public FCurTexture: Integer; // Íîìåð òåêóùåé òåêñòóðû FCurFrame: Integer; @@ -54,7 +59,9 @@ type Moved: Boolean; LiftType: Byte; LastAnimLoop: Byte; - ArrIdx: Integer; // index in one of internal arrays; sorry + arrIdx: Integer; // index in one of internal arrays; sorry + tag: Integer; // used in coldets and such; sorry + proxyId: Integer; // proxy id in map grid (DO NOT USE!) constructor Create(PanelRec: TPanelRec_1; AddTextures: TAddTextureArray; @@ -73,6 +80,12 @@ type procedure SaveState(var Mem: TBinMemoryWriter); procedure LoadState(var Mem: TBinMemoryReader); + + property x0: Integer read X; + property y0: Integer read Y; + property x1: Integer read getx1; // inclusive! + property y1: Integer read gety1; // inclusive! + property visvalid: Boolean read getvisvalid; // panel is "visvalid" when it's width and height are positive end; PPanel = ^TPanel; @@ -247,6 +260,10 @@ begin Inherited; end; +function TPanel.getx1 (): Integer; inline; begin result := X+Width-1; end; +function TPanel.gety1 (): Integer; inline; begin result := Y+Height-1; end; +function TPanel.getvisvalid (): Boolean; inline; begin result := (Width > 0) and (Height > 0); end; + procedure TPanel.Draw(); var xx, yy: Integer;