diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index d3101aa0e1b6e0f1c7102b458f7b61db447d2280..084f64db416a805fc917215dcf74c7c898994715 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
interface
uses
- MAPDEF, BinEditor, g_textures, xdynrec;
+ SysUtils, Classes,
+ MAPDEF, g_textures, xdynrec;
type
TAddTextureArray = Array of
Anim: Boolean;
end;
+ PPanel = ^TPanel;
TPanel = Class (TObject)
private
const
mMovingActive: Boolean;
mMoveOnce: Boolean;
+ mOldMovingActive: Boolean;
+
mSizeSpeed: TDFSize;
mSizeEnd: TDFSize;
mEndPosTrig: Integer;
mEndSizeTrig: Integer;
+ mNeedSend: Boolean; // for network
+
private
function getx1 (): Integer; inline;
function gety1 (): Integer; inline;
function getMovingEndY (): Integer; inline;
procedure setMovingEndY (v: Integer); inline;
+ function getSizeSpeedX (): Integer; inline;
+ procedure setSizeSpeedX (v: Integer); inline;
+ function getSizeSpeedY (): Integer; inline;
+ procedure setSizeSpeedY (v: Integer); inline;
+
+ function getSizeEndX (): Integer; inline;
+ procedure setSizeEndX (v: Integer); inline;
+ function getSizeEndY (): Integer; inline;
+ procedure setSizeEndY (v: Integer); inline;
+
public
FCurTexture: Integer; // Íîìåð òåêóùåé òåêñòóðû
FCurFrame: Integer;
FCurFrameCount: Byte;
FX, FY: Integer;
+ FOldX, FOldY: Integer;
FWidth, FHeight: Word;
+ FOldW, FOldH: Word;
FPanelType: Word;
- FSaveIt: Boolean; // Ñîõðàíÿòü ïðè SaveState?
FEnabled: Boolean;
FDoor: Boolean;
- FMoved: Boolean;
FLiftType: Byte;
FLastAnimLoop: Byte;
// sorry, there fields are public to allow setting 'em in g_map; this should be fixed later
tag: Integer; // used in coldets and such; sorry; see g_map.GridTagXXX
proxyId: Integer; // proxy id in map grid (DO NOT USE!)
mapId: AnsiString; // taken directly from map file; dunno why it is here
+ hasTexTrigger: Boolean; // HACK: true when there's a trigger than can change my texture
constructor Create(PanelRec: TDynRecord;
AddTextures: TAddTextureArray;
var Textures: TLevelTextureArray; aguid: Integer);
destructor Destroy(); override;
- procedure Draw();
+ procedure Draw (hasAmbient: Boolean; constref ambColor: TDFColor);
procedure DrawShadowVolume(lightX: Integer; lightY: Integer; radius: Integer);
procedure Update();
procedure SetFrame(Frame: Integer; Count: Byte);
procedure SetTexture(ID: Integer; AnimLoop: Byte = 0);
function GetTextureID(): Cardinal;
function GetTextureCount(): Integer;
+ function CanChangeTexture(): Boolean;
- procedure SaveState(var Mem: TBinMemoryWriter);
- procedure LoadState(var Mem: TBinMemoryReader);
+ procedure SaveState (st: TStream);
+ procedure LoadState (st: TStream);
procedure positionChanged (); inline;
function getIsGLift (): Boolean; inline; // gLifts
function getIsGBlockMon (): Boolean; inline; // gBlockMon
+ // get-and-clear
+ function gncNeedSend (): Boolean; inline;
+ procedure setDirty (); inline; // why `dirty`? 'cause i may introduce property `needSend` later
+
+ procedure lerp (t: Single; out tX, tY, tW, tH: Integer);
+
public
property visvalid: Boolean read getvisvalid; // panel is "visvalid" when it's width and height are positive
property width: Word read FWidth write FWidth;
property height: Word read FHeight write FHeight;
property panelType: Word read FPanelType write FPanelType;
- property saveIt: Boolean read FSaveIt write FSaveIt; // Ñîõðàíÿòü ïðè SaveState?
- property enabled: Boolean read FEnabled write FEnabled; // Ñîõðàíÿòü ïðè SaveState?
- property door: Boolean read FDoor write FDoor; // Ñîõðàíÿòü ïðè SaveState?
- property moved: Boolean read FMoved write FMoved; // Ñîõðàíÿòü ïðè SaveState?
- property liftType: Byte read FLiftType write FLiftType; // Ñîõðàíÿòü ïðè SaveState?
- property lastAnimLoop: Byte read FLastAnimLoop write FLastAnimLoop; // Ñîõðàíÿòü ïðè SaveState?
+ property enabled: Boolean read FEnabled write FEnabled;
+ property door: Boolean read FDoor write FDoor;
+ property liftType: Byte read FLiftType write FLiftType;
+ property lastAnimLoop: Byte read FLastAnimLoop write FLastAnimLoop;
property movingSpeedX: Integer read getMovingSpeedX write setMovingSpeedX;
property movingSpeedY: Integer read getMovingSpeedY write setMovingSpeedY;
property movingActive: Boolean read mMovingActive write mMovingActive;
property moveOnce: Boolean read mMoveOnce write mMoveOnce;
+ property sizeSpeedX: Integer read getSizeSpeedX write setSizeSpeedX;
+ property sizeSpeedY: Integer read getSizeSpeedY write setSizeSpeedY;
+ property sizeEndX: Integer read getSizeEndX write setSizeEndX;
+ property sizeEndY: Integer read getSizeEndY write setSizeEndY;
+
property isGBack: Boolean read getIsGBack;
property isGStep: Boolean read getIsGStep;
property isGWall: Boolean read getIsGWall;
property movingStart: TDFPoint read mMovingStart write mMovingStart;
property movingEnd: TDFPoint read mMovingEnd write mMovingEnd;
+ property sizeSpeed: TDFSize read mSizeSpeed write mSizeSpeed;
+ property sizeEnd: TDFSize read mSizeEnd write mSizeEnd;
+
property endPosTrigId: Integer read mEndPosTrig write mEndPosTrig;
property endSizeTrigId: Integer read mEndSizeTrig write mEndSizeTrig;
end;
TPanelArray = Array of TPanel;
+const
+ LIFTTYPE_UP = 0;
+ LIFTTYPE_DOWN = 1;
+ LIFTTYPE_LEFT = 2;
+ LIFTTYPE_RIGHT = 3;
+
var
g_dbgpan_mplat_active: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}true{$ENDIF};
g_dbgpan_mplat_step: Boolean = false; // one step, and stop
implementation
uses
- SysUtils, g_basic, g_map, g_game, g_gfx, e_graphics, g_weapons, g_triggers,
- g_console, g_language, g_monsters, g_player, g_grid, e_log, GL, utils;
+ {$INCLUDE ../nogl/noGLuses.inc}
+ e_texture, g_basic, g_map, g_game, g_gfx, e_graphics, g_weapons, g_triggers,
+ g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams;
const
PANEL_SIGNATURE = $4C4E4150; // 'PANL'
var Textures: TLevelTextureArray; aguid: Integer);
var
i: Integer;
+ tnum: Integer;
begin
X := PanelRec.X;
Y := PanelRec.Y;
+ FOldX := X;
+ FOldY := Y;
Width := PanelRec.Width;
Height := PanelRec.Height;
+ FOldW := Width;
+ FOldH := Height;
FAlpha := 0;
FBlending := False;
FCurFrame := 0;
FCurFrameCount := 0;
LastAnimLoop := 0;
- Moved := False;
mapId := PanelRec.id;
mGUID := aguid;
mMovingSpeed := PanelRec.moveSpeed;
mMovingStart := PanelRec.moveStart;
mMovingEnd := PanelRec.moveEnd;
- mMovingActive := PanelRec['move_active'].varvalue;
+ mMovingActive := PanelRec['move_active'].value;
+ mOldMovingActive := mMovingActive;
mMoveOnce := PanelRec.moveOnce;
mSizeSpeed := PanelRec.sizeSpeed;
mEndPosTrig := PanelRec.endPosTrig;
mEndSizeTrig := PanelRec.endSizeTrig;
+ mNeedSend := false;
+
// Òèï ïàíåëè:
PanelType := PanelRec.PanelType;
Enabled := True;
Door := False;
- LiftType := 0;
- SaveIt := False;
+ LiftType := LIFTTYPE_UP;
+ hasTexTrigger := False;
case PanelType of
- PANEL_OPENDOOR:
- begin
- Enabled := False;
- Door := True;
- SaveIt := True;
- end;
- PANEL_CLOSEDOOR:
- begin
- Door := True;
- SaveIt := True;
- end;
- PANEL_LIFTUP:
- SaveIt := True;
- PANEL_LIFTDOWN:
- begin
- LiftType := 1;
- SaveIt := True;
- end;
- PANEL_LIFTLEFT:
- begin
- LiftType := 2;
- SaveIt := True;
- end;
- PANEL_LIFTRIGHT:
- begin
- LiftType := 3;
- SaveIt := True;
- end;
+ PANEL_OPENDOOR: begin Enabled := False; Door := True; end;
+ PANEL_CLOSEDOOR: Door := True;
+ PANEL_LIFTUP: LiftType := LIFTTYPE_UP; //???
+ PANEL_LIFTDOWN: LiftType := LIFTTYPE_DOWN;
+ PANEL_LIFTLEFT: LiftType := LIFTTYPE_LEFT;
+ PANEL_LIFTRIGHT: LiftType := LIFTTYPE_RIGHT;
end;
// Íåâèäèìàÿ:
True, Textures[AddTextures[i].Texture].Speed);
FTextureIDs[i].AnTex.Blending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
FTextureIDs[i].AnTex.Alpha := PanelRec.Alpha;
- SaveIt := True;
end
else
begin // Îáû÷íàÿ òåêñòóðà
end;
// Òåêñòóð íåñêîëüêî - íóæíî ñîõðàíÿòü òåêóùóþ:
- if Length(FTextureIDs) > 1 then
- SaveIt := True;
+ //if Length(FTextureIDs) > 1 then SaveIt := True;
+
+ if (PanelRec.TextureRec = nil) then tnum := -1 else tnum := PanelRec.tagInt;
+ if (tnum < 0) then tnum := Length(Textures);
// Åñëè íå ñïåöòåêñòóðà, òî çàäàåì ðàçìåðû:
- if PanelRec.TextureNum > High(Textures) then
+ if ({PanelRec.TextureNum}tnum > High(Textures)) then
begin
- e_WriteLog(Format('WTF?! PanelRec.TextureNum is out of limits! (%d : %d)', [PanelRec.TextureNum, High(Textures)]), MSG_FATALERROR);
+ e_WriteLog(Format('WTF?! tnum is out of limits! (%d : %d)', [tnum, High(Textures)]), TMsgType.Warning);
FTextureWidth := 2;
FTextureHeight := 2;
FAlpha := 0;
FBlending := ByteBool(0);
end
- else if not g_Map_IsSpecialTexture(Textures[PanelRec.TextureNum].TextureName) then
+ else if not g_Map_IsSpecialTexture(Textures[{PanelRec.TextureNum}tnum].TextureName) then
begin
- FTextureWidth := Textures[PanelRec.TextureNum].Width;
- FTextureHeight := Textures[PanelRec.TextureNum].Height;
+ FTextureWidth := Textures[{PanelRec.TextureNum}tnum].Width;
+ FTextureHeight := Textures[{PanelRec.TextureNum}tnum].Height;
FAlpha := PanelRec.Alpha;
FBlending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
end;
Inherited;
end;
+procedure TPanel.lerp (t: Single; out tX, tY, tW, tH: Integer);
+begin
+ if mMovingActive then
+ begin
+ tX := nlerp(FOldX, FX, t);
+ tY := nlerp(FOldY, FY, t);
+ tW := nlerp(FOldW, FWidth, t);
+ tH := nlerp(FOldH, FHeight, t);
+ end
+ else
+ begin
+ tX := FX;
+ tY := FY;
+ tW := FWidth;
+ tH := FHeight;
+ end;
+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;
@@ -386,6 +426,16 @@ procedure TPanel.setMovingEndX (v: Integer); inline; begin mMovingEnd.X := v; en
function TPanel.getMovingEndY (): Integer; inline; begin result := mMovingEnd.Y; end;
procedure TPanel.setMovingEndY (v: Integer); inline; begin mMovingEnd.Y := v; end;
+function TPanel.getSizeSpeedX (): Integer; inline; begin result := mSizeSpeed.w; end;
+procedure TPanel.setSizeSpeedX (v: Integer); inline; begin mSizeSpeed.w := v; end;
+function TPanel.getSizeSpeedY (): Integer; inline; begin result := mSizeSpeed.h; end;
+procedure TPanel.setSizeSpeedY (v: Integer); inline; begin mSizeSpeed.h := v; end;
+
+function TPanel.getSizeEndX (): Integer; inline; begin result := mSizeEnd.w; end;
+procedure TPanel.setSizeEndX (v: Integer); inline; begin mSizeEnd.w := v; end;
+function TPanel.getSizeEndY (): Integer; inline; begin result := mSizeEnd.h; end;
+procedure TPanel.setSizeEndY (v: Integer); inline; begin mSizeEnd.h := v; end;
+
function TPanel.getIsGBack (): Boolean; inline; begin result := ((tag and GridTagBack) <> 0); end;
function TPanel.getIsGStep (): Boolean; inline; begin result := ((tag and GridTagStep) <> 0); end;
function TPanel.getIsGWall (): Boolean; inline; begin result := ((tag and (GridTagWall or GridTagDoor)) <> 0); end;
@@ -396,70 +446,71 @@ function TPanel.getIsGFore (): Boolean; inline; begin result := ((tag and GridTa
function TPanel.getIsGLift (): Boolean; inline; begin result := ((tag and GridTagLift) <> 0); end;
function TPanel.getIsGBlockMon (): Boolean; inline; begin result := ((tag and GridTagBlockMon) <> 0); end;
-procedure TPanel.Draw();
+function TPanel.gncNeedSend (): Boolean; inline; begin result := mNeedSend; mNeedSend := false; end;
+procedure TPanel.setDirty (); inline; begin mNeedSend := true; end;
+
+
+procedure TPanel.Draw (hasAmbient: Boolean; constref ambColor: TDFColor);
var
+ tx, ty, tw, th: Integer;
xx, yy: Integer;
NoTextureID: DWORD;
NW, NH: Word;
begin
if {Enabled and} (FCurTexture >= 0) and
- (Width > 0) and (Height > 0) and (FAlpha < 255) and
- ((g_dbg_scale <> 1.0) or g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)) then
+ (Width > 0) and (Height > 0) and (FAlpha < 255) {and
+ g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)} then
begin
+ lerp(gLerpFactor, tx, ty, tw, th);
if FTextureIDs[FCurTexture].Anim then
begin // Àíèìèðîâàííàÿ òåêñòóðà
if FTextureIDs[FCurTexture].AnTex = nil then
Exit;
- for xx := 0 to (Width div FTextureWidth)-1 do
- for yy := 0 to (Height div FTextureHeight)-1 do
+ for xx := 0 to (tw div FTextureWidth)-1 do
+ for yy := 0 to (th div FTextureHeight)-1 do
FTextureIDs[FCurTexture].AnTex.Draw(
- X + xx*FTextureWidth,
- Y + yy*FTextureHeight, M_NONE);
+ tx + xx*FTextureWidth,
+ ty + yy*FTextureHeight, TMirrorType.None);
end
else
begin // Îáû÷íàÿ òåêñòóðà
case FTextureIDs[FCurTexture].Tex of
- LongWord(TEXTURE_SPECIAL_WATER):
- e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1,
- 0, 0, 255, 0, B_FILTER);
- LongWord(TEXTURE_SPECIAL_ACID1):
- e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1,
- 0, 128, 0, 0, B_FILTER);
- LongWord(TEXTURE_SPECIAL_ACID2):
- e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1,
- 128, 0, 0, 0, B_FILTER);
+ LongWord(TEXTURE_SPECIAL_WATER): e_DrawFillQuad(tx, ty, tx+tw-1, ty+th-1, 0, 0, 255, 0, TBlending.Filter);
+ LongWord(TEXTURE_SPECIAL_ACID1): e_DrawFillQuad(tx, ty, tx+tw-1, ty+th-1, 0, 230, 0, 0, TBlending.Filter);
+ LongWord(TEXTURE_SPECIAL_ACID2): e_DrawFillQuad(tx, ty, tx+tw-1, ty+th-1, 230, 0, 0, 0, TBlending.Filter);
LongWord(TEXTURE_NONE):
if g_Texture_Get('NOTEXTURE', NoTextureID) then
begin
e_GetTextureSize(NoTextureID, @NW, @NH);
- e_DrawFill(NoTextureID, X, Y, Width div NW, Height div NH,
- 0, False, False);
- end else
+ e_DrawFill(NoTextureID, tx, ty, tw div NW, th div NH, 0, False, False);
+ end
+ else
begin
- xx := X + (Width div 2);
- yy := Y + (Height div 2);
- e_DrawFillQuad(X, Y, xx, yy,
- 255, 0, 255, 0);
- e_DrawFillQuad(xx, Y, X+Width-1, yy,
- 255, 255, 0, 0);
- e_DrawFillQuad(X, yy, xx, Y+Height-1,
- 255, 255, 0, 0);
- e_DrawFillQuad(xx, yy, X+Width-1, Y+Height-1,
- 255, 0, 255, 0);
+ xx := tx + (tw div 2);
+ yy := ty + (th div 2);
+ e_DrawFillQuad(tx, ty, xx, yy, 255, 0, 255, 0);
+ e_DrawFillQuad(xx, ty, tx+tw-1, yy, 255, 255, 0, 0);
+ e_DrawFillQuad(tx, yy, xx, ty+th-1, 255, 255, 0, 0);
+ e_DrawFillQuad(xx, yy, tx+tw-1, ty+th-1, 255, 0, 255, 0);
end;
-
else
+ begin
if not mMovingActive then
- e_DrawFill(FTextureIDs[FCurTexture].Tex, X, Y, Width div FTextureWidth, Height div FTextureHeight, FAlpha, True, FBlending)
+ e_DrawFill(FTextureIDs[FCurTexture].Tex, tx, ty, tw div FTextureWidth, th div FTextureHeight, FAlpha, True, FBlending, hasAmbient)
else
- e_DrawFillX(FTextureIDs[FCurTexture].Tex, X, Y, Width, Height, FAlpha, True, FBlending, g_dbg_scale);
+ e_DrawFillX(FTextureIDs[FCurTexture].Tex, tx, ty, tw, th, FAlpha, True, FBlending, g_dbg_scale, hasAmbient);
+ if hasAmbient then e_AmbientQuad(tx, ty, tw, th, ambColor.r, ambColor.g, ambColor.b, ambColor.a);
+ end;
end;
end;
end;
end;
procedure TPanel.DrawShadowVolume(lightX: Integer; lightY: Integer; radius: Integer);
+var
+ tx, ty, tw, th: Integer;
+
procedure extrude (x: Integer; y: Integer);
begin
glVertex2i(x+(x-lightX)*500, y+(y-lightY)*500);
@@ -480,8 +531,10 @@ procedure TPanel.DrawShadowVolume(lightX: Integer; lightY: Integer; radius: Inte
begin
if radius < 4 then exit;
- if Enabled and (FCurTexture >= 0) and (Width > 0) and (Height > 0) and (FAlpha < 255) and g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight) then
+ if Enabled and (FCurTexture >= 0) and (Width > 0) and (Height > 0) and (FAlpha < 255) {and
+ g_Collide(X, Y, tw, th, sX, sY, sWidth, sHeight)} then
begin
+ lerp(gLerpFactor, tx, ty, tw, th);
if not FTextureIDs[FCurTexture].Anim then
begin
case FTextureIDs[FCurTexture].Tex of
LongWord(TEXTURE_NONE): exit;
end;
end;
- if (X+Width < lightX-radius) then exit;
- if (Y+Height < lightY-radius) then exit;
- if (X > lightX+radius) then exit;
- if (Y > lightY+radius) then exit;
- //e_DrawFill(FTextureIDs[FCurTexture].Tex, X, Y, Width div FTextureWidth, Height div FTextureHeight, FAlpha, True, FBlending);
+ if (tx+tw < lightX-radius) then exit;
+ if (ty+th < lightY-radius) then exit;
+ if (tx > lightX+radius) then exit;
+ if (ty > lightY+radius) then exit;
+ //e_DrawFill(FTextureIDs[FCurTexture].Tex, X, Y, tw div FTextureWidth, th div FTextureHeight, FAlpha, True, FBlending);
glBegin(GL_QUADS);
- drawLine(x, y, x+width, y); // top
- drawLine(x+width, y, x+width, y+height); // right
- drawLine(x+width, y+height, x, y+height); // bottom
- drawLine(x, y+height, x, y); // left
+ drawLine(tx, ty, tx+tw, ty); // top
+ drawLine(tx+tw, ty, tx+tw, ty+th); // right
+ drawLine(tx+tw, ty+th, tx, ty+th); // bottom
+ drawLine(tx, ty+th, tx, ty); // left
glEnd();
end;
end;
begin
if (ontop <> nil) then ontop^ := true;
// yes, move with it; but skip steps (no need to process size change here, 'cause platform top cannot be changed with it)
- mapGrid.traceBox(tex, tey, px, py, pw, ph, pdx, pdy, nil, (GridTagWall or GridTagDoor));
+ mapGrid.traceBox(tex, tey, px, py, pw, ph, pdx, pdy, (GridTagWall or GridTagDoor));
end
else
begin
trtag := (GridTagWall or GridTagDoor);
// if we're moving down, consider steps too
if (szdy > 0) then trtag := trtag or GridTagStep;
- mapGrid.traceBox(tex, tey, px, py, pw, ph, szdx, szdy, nil, trtag);
+ mapGrid.traceBox(tex, tey, px, py, pw, ph, szdx, szdy, trtag);
end;
end;
end;
trtag := (GridTagWall or GridTagDoor);
// if we're moving down, consider steps too
if (pdy > 0) then trtag := trtag or GridTagStep;
- mapGrid.traceBox(tex, tey, px, py, pw, ph, pdx, pdy, nil, trtag);
+ mapGrid.traceBox(tex, tey, px, py, pw, ph, pdx, pdy, trtag);
end;
end;
end;
if not g_dbgpan_mplat_active then exit;
+ if (mOldMovingActive <> mMovingActive) then mNeedSend := true;
+ mOldMovingActive := mMovingActive;
+
if not mMovingActive then exit;
if mMovingSpeed.isZero and mSizeSpeed.isZero then exit;
nx := ox+mMovingSpeed.X;
ny := oy+mMovingSpeed.Y;
+ // force network updates only if some sudden change happened
+ // set the flag here, so we can sync affected monsters
+ if not mSizeSpeed.isZero and (nw = mSizeEnd.w) and (nh = mSizeEnd.h) then
+ begin
+ mNeedSend := true;
+ end
+ else if ((mMovingSpeed.X < 0) and (nx <= mMovingStart.X)) or ((mMovingSpeed.X > 0) and (nx >= mMovingEnd.X)) then
+ begin
+ mNeedSend := true;
+ end
+ else if ((mMovingSpeed.Y < 0) and (ny <= mMovingStart.Y)) or ((mMovingSpeed.Y > 0) and (ny >= mMovingEnd.Y)) then
+ begin
+ mNeedSend := true;
+ end;
+
// if pannel disappeared, we don't have to do anything
if (nw > 0) and (nh > 0) then
begin
begin
// set new position
mon.moveBy(pdx, pdy); // this will call `positionChanged()` for us
+ //???FIXME: do we really need to send monsters over the net?
+ // i don't think so, as dead reckoning should take care of 'em
+ // ok, send new monster position only if platform is going to change it's direction
+ if mNeedSend then mon.setDirty();
end;
- // squash player, if necessary
+ // squash monster, if necessary
if not g_Game_IsClient and squash then mon.Damage(15000, 0, 0, 0, HIT_TRAP);
end;
end;
end;
// move panel
+ FOldX := X;
+ FOldY := Y;
X := nx;
Y := ny;
+ FOldW := FWidth;
+ FOldH := FHeight;
FWidth := nw;
FHeight := nh;
positionChanged();
actMoveTrig := false;
actSizeTrig := false;
+ // `mNeedSend` was set above
+
// check "size stop"
if not mSizeSpeed.isZero and (nw = mSizeEnd.w) and (nh = mSizeEnd.h) then
begin
mSizeSpeed.h := 0;
actSizeTrig := true;
if (nw < 1) or (nh < 1) then mMovingActive := false; //HACK!
- //e_LogWritefln('FUUUUUUUUUUUUUU', []);
end;
// reverse moving direction, if necessary
actMoveTrig := true;
end;
+ if (mOldMovingActive <> mMovingActive) then mNeedSend := true;
+ mOldMovingActive := mMovingActive;
- if actMoveTrig then g_Triggers_Press(mEndPosTrig, ACTIVATE_CUSTOM);
- if actSizeTrig then g_Triggers_Press(mEndSizeTrig, ACTIVATE_CUSTOM);
+ if not g_Game_IsClient then
+ begin
+ if actMoveTrig then g_Triggers_Press(mEndPosTrig, ACTIVATE_CUSTOM);
+ if actSizeTrig then g_Triggers_Press(mEndSizeTrig, ACTIVATE_CUSTOM);
+ end;
+
+ // some triggers may activate this, don't delay sending
+ //TODO: when triggers will be able to control speed and size, check that here too
+ if (mOldMovingActive <> mMovingActive) then mNeedSend := true;
+ mOldMovingActive := mMovingActive;
end;
end;
(FTextureIDs[FCurTexture].AnTex <> nil) and
(Width > 0) and (Height > 0) and (FAlpha < 255) then
begin
- FCurFrame := ClampInt(Frame, 0, FTextureIDs[FCurTexture].AnTex.TotalFrames);
+ FCurFrame := ClampInt(Frame, 0, FTextureIDs[FCurTexture].AnTex.TotalFrames - 1);
FCurFrameCount := Count;
FTextureIDs[FCurTexture].AnTex.CurrentFrame := FCurFrame;
FTextureIDs[FCurTexture].AnTex.CurrentCounter := FCurFrameCount;
procedure TPanel.SetTexture(ID: Integer; AnimLoop: Byte = 0);
begin
-// Íåò òåêñòóð:
- if Length(FTextureIDs) = 0 then
- FCurTexture := -1
- else
- // Òîëüêî îäíà òåêñòóðà:
- if Length(FTextureIDs) = 1 then
- begin
- if (ID = 0) or (ID = -1) then
- FCurTexture := ID;
- end
- else
- // Áîëüøå îäíîé òåêñòóðû:
- begin
- if (ID >= -1) and (ID <= High(FTextureIDs)) then
- FCurTexture := ID;
- end;
+ if (ID >= -1) and (ID < Length(FTextureIDs)) then
+ FCurTexture := ID;
// Ïåðåêëþ÷èëèñü íà âèäèìóþ àíèì. òåêñòóðó:
if (FCurTexture >= 0) and FTextureIDs[FCurTexture].Anim then
Result := Result + 100;
end;
-procedure TPanel.SaveState(Var Mem: TBinMemoryWriter);
+function TPanel.CanChangeTexture(): Boolean;
+begin
+ Result := (GetTextureCount() > 1) or hasTexTrigger;
+end;
+
+const
+ PAN_SAVE_VERSION = 1;
+
+procedure TPanel.SaveState (st: TStream);
var
- sig: DWORD;
anim: Boolean;
begin
- if (Mem = nil) then exit;
- //if not SaveIt then exit;
-
-// Ñèãíàòóðà ïàíåëè:
- sig := PANEL_SIGNATURE; // 'PANL'
- Mem.WriteDWORD(sig);
-// Îòêðûòà/çàêðûòà, åñëè äâåðü:
- Mem.WriteBoolean(FEnabled);
-// Íàïðàâëåíèå ëèôòà, åñëè ëèôò:
- Mem.WriteByte(FLiftType);
-// Íîìåð òåêóùåé òåêñòóðû:
- Mem.WriteInt(FCurTexture);
-// Êîîðäû
- Mem.WriteInt(FX);
- Mem.WriteInt(FY);
-// Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà:
+ if (st = nil) then exit;
+
+ // Ñèãíàòóðà ïàíåëè
+ utils.writeSign(st, 'PANL');
+ utils.writeInt(st, Byte(PAN_SAVE_VERSION));
+ // Îòêðûòà/çàêðûòà, åñëè äâåðü
+ utils.writeBool(st, FEnabled);
+ // Íàïðàâëåíèå ëèôòà, åñëè ëèôò
+ utils.writeInt(st, Byte(FLiftType));
+ // Íîìåð òåêóùåé òåêñòóðû
+ utils.writeInt(st, Integer(FCurTexture));
+ // Êîîðäèíàòû è ðàçìåð
+ utils.writeInt(st, Integer(FX));
+ utils.writeInt(st, Integer(FY));
+ utils.writeInt(st, Word(FWidth));
+ utils.writeInt(st, Word(FHeight));
+ // Àíèìèðîâàíà ëè òåêóùàÿ òåêñòóðà
if (FCurTexture >= 0) and (FTextureIDs[FCurTexture].Anim) then
- begin
- Assert(FTextureIDs[FCurTexture].AnTex <> nil,
- 'TPanel.SaveState: No animation object');
- anim := True;
- end
+ begin
+ assert(FTextureIDs[FCurTexture].AnTex <> nil, 'TPanel.SaveState: No animation object');
+ anim := true;
+ end
else
- anim := False;
- Mem.WriteBoolean(anim);
-// Åñëè äà - ñîõðàíÿåì àíèìàöèþ:
- if anim then
- FTextureIDs[FCurTexture].AnTex.SaveState(Mem);
+ begin
+ anim := false;
+ end;
+ utils.writeBool(st, anim);
+ // Åñëè äà - ñîõðàíÿåì àíèìàöèþ
+ if anim then FTextureIDs[FCurTexture].AnTex.SaveState(st);
+
// moving platform state
- Mem.WriteInt(mMovingSpeed.X);
- Mem.WriteInt(mMovingSpeed.Y);
- Mem.WriteInt(mMovingStart.X);
- Mem.WriteInt(mMovingStart.Y);
- Mem.WriteInt(mMovingEnd.X);
- Mem.WriteInt(mMovingEnd.Y);
- Mem.WriteBoolean(mMovingActive);
+ utils.writeInt(st, Integer(mMovingSpeed.X));
+ utils.writeInt(st, Integer(mMovingSpeed.Y));
+ utils.writeInt(st, Integer(mMovingStart.X));
+ utils.writeInt(st, Integer(mMovingStart.Y));
+ utils.writeInt(st, Integer(mMovingEnd.X));
+ utils.writeInt(st, Integer(mMovingEnd.Y));
+
+ utils.writeInt(st, Integer(mSizeSpeed.w));
+ utils.writeInt(st, Integer(mSizeSpeed.h));
+ utils.writeInt(st, Integer(mSizeEnd.w));
+ utils.writeInt(st, Integer(mSizeEnd.h));
+
+ utils.writeBool(st, mMovingActive);
+ utils.writeBool(st, mMoveOnce);
+
+ utils.writeInt(st, Integer(mEndPosTrig));
+ utils.writeInt(st, Integer(mEndSizeTrig));
end;
-procedure TPanel.LoadState(var Mem: TBinMemoryReader);
-var
- sig: DWORD;
- anim: Boolean;
- //ox, oy: Integer;
-begin
- if (Mem = nil) then exit;
- //if not SaveIt then exit;
-// Ñèãíàòóðà ïàíåëè:
- Mem.ReadDWORD(sig);
- if sig <> PANEL_SIGNATURE then // 'PANL'
- begin
- raise EBinSizeError.Create('TPanel.LoadState: Wrong Panel Signature');
- end;
-// Îòêðûòà/çàêðûòà, åñëè äâåðü:
- Mem.ReadBoolean(FEnabled);
-// Íàïðàâëåíèå ëèôòà, åñëè ëèôò:
- Mem.ReadByte(FLiftType);
-// Íîìåð òåêóùåé òåêñòóðû:
- Mem.ReadInt(FCurTexture);
-// Êîîðäû
- //ox := FX;
- //oy := FY;
- Mem.ReadInt(FX);
- Mem.ReadInt(FY);
- //e_LogWritefln('panel %s(%s): old=(%s,%s); new=(%s,%s); delta=(%s,%s)', [arrIdx, proxyId, ox, oy, FX, FY, FX-ox, FY-oy]);
-// Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà:
- Mem.ReadBoolean(anim);
-// Åñëè äà - çàãðóæàåì àíèìàöèþ:
- if anim then
+procedure TPanel.LoadState (st: TStream);
+begin
+ if (st = nil) then exit;
+
+ // Ñèãíàòóðà ïàíåëè
+ if not utils.checkSign(st, 'PANL') then raise XStreamError.create('wrong panel signature');
+ if (utils.readByte(st) <> PAN_SAVE_VERSION) then raise XStreamError.create('wrong panel version');
+ // Îòêðûòà/çàêðûòà, åñëè äâåðü
+ FEnabled := utils.readBool(st);
+ // Íàïðàâëåíèå ëèôòà, åñëè ëèôò
+ FLiftType := utils.readByte(st);
+ // Íîìåð òåêóùåé òåêñòóðû
+ FCurTexture := utils.readLongInt(st);
+ // Êîîðäèíàòû è ðàçìåð
+ FX := utils.readLongInt(st);
+ FY := utils.readLongInt(st);
+ FOldX := FX;
+ FOldY := FY;
+ FWidth := utils.readWord(st);
+ FHeight := utils.readWord(st);
+ FOldW := FWidth;
+ FOldH := FHeight;
+ // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà
+ if utils.readBool(st) then
begin
+ // Åñëè äà - çàãðóæàåì àíèìàöèþ
Assert((FCurTexture >= 0) and
(FTextureIDs[FCurTexture].Anim) and
(FTextureIDs[FCurTexture].AnTex <> nil),
'TPanel.LoadState: No animation object');
- FTextureIDs[FCurTexture].AnTex.LoadState(Mem);
+ FTextureIDs[FCurTexture].AnTex.LoadState(st);
end;
+
// moving platform state
- Mem.ReadInt(mMovingSpeed.X);
- Mem.ReadInt(mMovingSpeed.Y);
- Mem.ReadInt(mMovingStart.X);
- Mem.ReadInt(mMovingStart.Y);
- Mem.ReadInt(mMovingEnd.X);
- Mem.ReadInt(mMovingEnd.Y);
- Mem.ReadBoolean(mMovingActive);
+ mMovingSpeed.X := utils.readLongInt(st);
+ mMovingSpeed.Y := utils.readLongInt(st);
+ mMovingStart.X := utils.readLongInt(st);
+ mMovingStart.Y := utils.readLongInt(st);
+ mMovingEnd.X := utils.readLongInt(st);
+ mMovingEnd.Y := utils.readLongInt(st);
+
+ mSizeSpeed.w := utils.readLongInt(st);
+ mSizeSpeed.h := utils.readLongInt(st);
+ mSizeEnd.w := utils.readLongInt(st);
+ mSizeEnd.h := utils.readLongInt(st);
+
+ mMovingActive := utils.readBool(st);
+ mMoveOnce := utils.readBool(st);
+
+ mEndPosTrig := utils.readLongInt(st);
+ mEndSizeTrig := utils.readLongInt(st);
positionChanged();
//mapGrid.proxyEnabled[proxyId] := FEnabled; // done in g_map.pas
end;
+
end.