diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index 3c95a56ffe7f3b07724ad060b99a995f7fad3c26..5e2988572ad5e129746b5caf8b546a9bb36e4e99 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
mMovingStart: TDFPoint;
mMovingEnd: TDFPoint;
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 getvisvalid (): Boolean; inline;
+ function getMovingSpeedX (): Integer; inline;
+ procedure setMovingSpeedX (v: Integer); inline;
+ function getMovingSpeedY (): Integer; inline;
+ procedure setMovingSpeedY (v: Integer); inline;
+
+ function getMovingStartX (): Integer; inline;
+ procedure setMovingStartX (v: Integer); inline;
+ function getMovingStartY (): Integer; inline;
+ procedure setMovingStartY (v: Integer); inline;
+
+ function getMovingEndX (): Integer; inline;
+ procedure setMovingEndX (v: 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;
FX, FY: Integer;
FWidth, FHeight: 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
procedure SaveState(var Mem: TBinMemoryWriter);
procedure LoadState(var Mem: TBinMemoryReader);
- procedure positionChanged ();
+ procedure positionChanged (); inline;
- function isGBack (): Boolean; inline; // gRenderBackgrounds
- function isGStep (): Boolean; inline; // gSteps
- function isGWall (): Boolean; inline; // gWalls
- function isGAcid1 (): Boolean; inline; // gAcid1
- function isGAcid2 (): Boolean; inline; // gAcid2
- function isGWater (): Boolean; inline; // gWater
- function isGFore (): Boolean; inline; // gRenderForegrounds
- function isGLift (): Boolean; inline; // gLifts
- function isGBlockMon (): Boolean; inline; // gBlockMon
+ function getIsGBack (): Boolean; inline; // gRenderBackgrounds
+ function getIsGStep (): Boolean; inline; // gSteps
+ function getIsGWall (): Boolean; inline; // gWalls
+ function getIsGAcid1 (): Boolean; inline; // gAcid1
+ function getIsGAcid2 (): Boolean; inline; // gAcid2
+ function getIsGWater (): Boolean; inline; // gWater
+ function getIsGFore (): Boolean; inline; // gRenderForegrounds
+ 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
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 movingSpeedX: Integer read getMovingSpeedX write setMovingSpeedX;
+ property movingSpeedY: Integer read getMovingSpeedY write setMovingSpeedY;
+ property movingStartX: Integer read getMovingStartX write setMovingStartX;
+ property movingStartY: Integer read getMovingStartY write setMovingStartY;
+ property movingEndX: Integer read getMovingEndX write setMovingEndX;
+ property movingEndY: Integer read getMovingEndY write setMovingEndY;
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 isGAcid1: Boolean read getIsGAcid1;
+ property isGAcid2: Boolean read getIsGAcid2;
+ property isGWater: Boolean read getIsGWater;
+ property isGFore: Boolean read getIsGFore;
+ property isGLift: Boolean read getIsGLift;
+ property isGBlockMon: Boolean read getIsGBlockMon;
public
property movingSpeed: TDFPoint read mMovingSpeed write mMovingSpeed;
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;
+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_console, g_language, g_monsters, g_player, e_log, GL;
+ 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;
const
PANEL_SIGNATURE = $4C4E4150; // 'PANL'
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;
+ mSizeEnd := PanelRec.sizeEnd;
+
+ mEndPosTrig := PanelRec.endPosTrig;
+ mEndSizeTrig := PanelRec.endSizeTrig;
+
+ mNeedSend := false;
// Òèï ïàíåëè:
PanelType := PanelRec.PanelType;
Enabled := True;
Door := False;
LiftType := 0;
- SaveIt := 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 := 0; //???
+ PANEL_LIFTDOWN: LiftType := 1;
+ PANEL_LIFTLEFT: LiftType := 2;
+ PANEL_LIFTRIGHT: LiftType := 3;
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.TextureNum > High(Textures) then
function TPanel.gety1 (): Integer; inline; begin result := Y+Height-1; end;
function TPanel.getvisvalid (): Boolean; inline; begin result := (Width > 0) and (Height > 0); end;
-function TPanel.isGBack (): Boolean; inline; begin result := ((tag and GridTagBack) <> 0); end;
-function TPanel.isGStep (): Boolean; inline; begin result := ((tag and GridTagStep) <> 0); end;
-function TPanel.isGWall (): Boolean; inline; begin result := ((tag and (GridTagWall or GridTagDoor)) <> 0); end;
-function TPanel.isGAcid1 (): Boolean; inline; begin result := ((tag and GridTagAcid1) <> 0); end;
-function TPanel.isGAcid2 (): Boolean; inline; begin result := ((tag and GridTagAcid2) <> 0); end;
-function TPanel.isGWater (): Boolean; inline; begin result := ((tag and GridTagWater) <> 0); end;
-function TPanel.isGFore (): Boolean; inline; begin result := ((tag and GridTagFore) <> 0); end;
-function TPanel.isGLift (): Boolean; inline; begin result := ((tag and GridTagLift) <> 0); end;
-function TPanel.isGBlockMon (): Boolean; inline; begin result := ((tag and GridTagBlockMon) <> 0); end;
-
-procedure TPanel.Draw();
+function TPanel.getMovingSpeedX (): Integer; inline; begin result := mMovingSpeed.X; end;
+procedure TPanel.setMovingSpeedX (v: Integer); inline; begin mMovingSpeed.X := v; end;
+function TPanel.getMovingSpeedY (): Integer; inline; begin result := mMovingSpeed.Y; end;
+procedure TPanel.setMovingSpeedY (v: Integer); inline; begin mMovingSpeed.Y := v; end;
+
+function TPanel.getMovingStartX (): Integer; inline; begin result := mMovingStart.X; end;
+procedure TPanel.setMovingStartX (v: Integer); inline; begin mMovingStart.X := v; end;
+function TPanel.getMovingStartY (): Integer; inline; begin result := mMovingStart.Y; end;
+procedure TPanel.setMovingStartY (v: Integer); inline; begin mMovingStart.Y := v; end;
+
+function TPanel.getMovingEndX (): Integer; inline; begin result := mMovingEnd.X; end;
+procedure TPanel.setMovingEndX (v: Integer); inline; begin mMovingEnd.X := v; end;
+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;
+function TPanel.getIsGAcid1 (): Boolean; inline; begin result := ((tag and GridTagAcid1) <> 0); end;
+function TPanel.getIsGAcid2 (): Boolean; inline; begin result := ((tag and GridTagAcid2) <> 0); end;
+function TPanel.getIsGWater (): Boolean; inline; begin result := ((tag and GridTagWater) <> 0); end;
+function TPanel.getIsGFore (): Boolean; inline; begin result := ((tag and GridTagFore) <> 0); end;
+function TPanel.getIsGLift (): Boolean; inline; begin result := ((tag and GridTagLift) <> 0); end;
+function TPanel.getIsGBlockMon (): Boolean; inline; begin result := ((tag and GridTagBlockMon) <> 0); end;
+
+function TPanel.gncNeedSend (): Boolean; inline; begin result := mNeedSend; mNeedSend := false; end;
+procedure TPanel.setDirty (); inline; begin mNeedSend := true; end;
+
+
+procedure TPanel.Draw ();
var
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
if FTextureIDs[FCurTexture].Anim then
begin // Àíèìèðîâàííàÿ òåêñòóðà
end;
else
- e_DrawFill(FTextureIDs[FCurTexture].Tex, X, Y,
- Width div FTextureWidth,
- Height div FTextureHeight,
- FAlpha, True, FBlending);
+ if not mMovingActive then
+ e_DrawFill(FTextureIDs[FCurTexture].Tex, X, Y, Width div FTextureWidth, Height div FTextureHeight, FAlpha, True, FBlending)
+ else
+ e_DrawFillX(FTextureIDs[FCurTexture].Tex, X, Y, Width, Height, FAlpha, True, FBlending, g_dbg_scale);
end;
end;
end;
@@ -412,7 +493,8 @@ 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, Width, Height, sX, sY, sWidth, sHeight)} then
begin
if not FTextureIDs[FCurTexture].Anim then
begin
end;
-procedure TPanel.positionChanged ();
+procedure TPanel.positionChanged (); inline;
+var
+ px, py, pw, ph: Integer;
begin
- if (proxyId >= 0) then mapGrid.moveBody(proxyId, X, Y);
+ if (proxyId >= 0) then
+ begin
+ mapGrid.getBodyDims(proxyId, px, py, pw, ph);
+ if (px <> x) or (py <> y) or (pw <> Width) or (ph <> Height) then
+ begin
+ {
+ e_LogWritefln('panel moved: arridx=%s; guid=%s; proxyid=%s; old:(%s,%s)-(%sx%s); new:(%s,%s)-(%sx%s)',
+ [arrIdx, mGUID, proxyId, px, py, pw, ph, x, y, width, height]);
+ }
+ g_Mark(px, py, pw, ph, MARK_WALL, false);
+ if (Width < 1) or (Height < 1) then
+ begin
+ mapGrid.proxyEnabled[proxyId] := false;
+ end
+ else
+ begin
+ mapGrid.proxyEnabled[proxyId] := Enabled;
+ if (pw <> Width) or (ph <> Height) then
+ begin
+ //writeln('panel resize!');
+ mapGrid.moveResizeBody(proxyId, X, Y, Width, Height)
+ end
+ else
+ begin
+ mapGrid.moveBody(proxyId, X, Y);
+ end;
+ g_Mark(X, Y, Width, Height, MARK_WALL);
+ end;
+ end;
+ end;
end;
var
- monMoveList: array of TMonster = nil;
- monMoveListUsed: Integer = 0;
+ monCheckList: array of TMonster = nil;
+ monCheckListUsed: Integer = 0;
procedure TPanel.Update();
var
- nx, ny: Integer;
- f: Integer;
+ ox, oy: Integer;
+ nx, ny, nw, nh: Integer;
+ ex, ey, nex, ney: Integer;
+ mpw, mph: Integer;
- function doPush (px, py, pw, ph: Integer; out dx, dy: Integer): Boolean;
+ // return `true` if we should move by dx,dy
+ function tryMPlatMove (px, py, pw, ph: Integer; out dx, dy: Integer; out squash: Boolean; ontop: PBoolean=nil): Boolean;
+ var
+ u0: Single;
+ tex, tey: Integer;
+ pdx, pdy: Integer;
+ trtag: Integer;
+ szdx, szdy: Integer;
begin
- result := g_Collide(px, py, pw, ph, nx, ny, Width, Height);
- if result then
+ squash := false;
+ tex := px;
+ tey := py;
+ pdx := mMovingSpeed.X;
+ pdy := mMovingSpeed.Y;
+ // standing on the platform?
+ if (py+ph = oy) then
begin
- // need to push
- if (mMovingSpeed.X < 0) then dx := nx-(px+pw)
- else if (mMovingSpeed.X > 0) then dx := (nx+Width)-px
- else dx := 0;
- if (mMovingSpeed.Y < 0) then dy := ny-(py+ph)
- else if (mMovingSpeed.Y > 0) then dy := (ny+Height)-py
- else dy := 0;
+ 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));
end
else
begin
- dx := 0;
- dy := 0;
+ if (ontop <> nil) then ontop^ := false;
+ // not standing on the platform: trace platform to see if it hits the entity
+ // first, process size change (as we cannot sweeptest both move and size change)
+ // but we don't have to check for pushing if the panel is shrinking
+ szdx := nw-mpw;
+ szdy := nh-mph;
+ if (szdx > 0) or (szdy > 0) then
+ begin
+ // ignore shrinking dimension
+ if (szdx < 0) then szdx := 0;
+ if (szdy < 0) then szdy := 0;
+ // move platform by szd* back, and check for szd* movement
+ if sweepAABB(ox-szdx, oy-szdy, nw, nh, szdx, szdy, px, py, pw, ph, @u0) then
+ begin
+ // yes, platform hits the entity, push the entity in the resizing direction
+ u0 := 1.0-u0; // how much path left?
+ szdx := trunc(szdx*u0);
+ szdy := trunc(szdy*u0);
+ if (szdx <> 0) or (szdy <> 0) then
+ begin
+ // has some path to go, trace the entity
+ 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);
+ end;
+ end;
+ end;
+ // second, process platform movement, using te* as entity starting point
+ if sweepAABB(ox, oy, nw, nh, pdx, pdy, tex, tey, pw, ph, @u0) then
+ begin
+ //e_LogWritefln('T: platsweep; u0=%s; u1=%s; hedge=%s; sweepAABB(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)', [u0, u1, hedge, ox, oy, mpw, mph, pdx, pdy, px-1, py-1, pw+2, ph+2]);
+ // yes, platform hits the entity, push the entity in the direction of the platform
+ u0 := 1.0-u0; // how much path left?
+ pdx := trunc(pdx*u0);
+ pdy := trunc(pdy*u0);
+ //e_LogWritefln(' platsweep; uleft=%s; pd=(%s,%s)', [u0, pdx, pdy]);
+ if (pdx <> 0) or (pdy <> 0) then
+ begin
+ // has some path to go, trace the entity
+ 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);
+ end;
+ end;
end;
- end;
-
- function monMove (mon: TMonster): Boolean;
- begin
- result := false; // don't stop
- mon.GameX := mon.GameX+mMovingSpeed.X;
- mon.GameY := mon.GameY+mMovingSpeed.Y;
- if (monMoveListUsed >= Length(monMoveList)) then SetLength(monMoveList, monMoveListUsed+64);
- monMoveList[monMoveListUsed] := mon;
- Inc(monMoveListUsed);
- end;
-
- function monPush (mon: TMonster): Boolean;
- var
- px, py, pw, ph, dx, dy: Integer;
- begin
- result := false; // don't stop
- mon.getMapBox(px, py, pw, ph);
- if doPush(px, py, pw, ph, dx, dy) then
+ // done with entity movement, new coords are in te*
+ dx := tex-px;
+ dy := tey-py;
+ result := (dx <> 0) or (dy <> 0);
+ if ((tag and (GridTagWall or GridTagDoor)) <> 0) then
begin
- mon.GameX := mon.GameX+dx;
- mon.GameY := mon.GameY+dy;
- if (monMoveListUsed >= Length(monMoveList)) then SetLength(monMoveList, monMoveListUsed+64);
- monMoveList[monMoveListUsed] := mon;
- Inc(monMoveListUsed);
+ // check for squashing; as entity cannot be pushed into a wall, check only collision with the platform itself
+ squash := g_Collide(tex, tey, pw, ph, nx, ny, nw, nh); // squash, if still in platform
end;
end;
- procedure plrMove (plr: TPlayer);
- var
- px, py, pw, ph, dx, dy: Integer;
+ function monCollect (mon: TMonster): Boolean;
begin
- if (plr = nil) then exit;
- plr.getMapBox(px, py, pw, ph);
- if (py+ph <> Y) then
- begin
- // push player
- if doPush(px, py, pw, ph, dx, dy) then
- begin
- plr.GameX := plr.GameX+dx;
- plr.GameY := plr.GameY+dy;
- plr.positionChanged();
- end;
- exit;
- end;
- if (px+pw <= X) then exit;
- if (px >= X+Width) then exit;
- plr.GameX := plr.GameX+mMovingSpeed.X;
- plr.GameY := plr.GameY+mMovingSpeed.Y;
- plr.positionChanged();
+ result := false; // don't stop
+ if (monCheckListUsed >= Length(monCheckList)) then SetLength(monCheckList, monCheckListUsed+128);
+ monCheckList[monCheckListUsed] := mon;
+ Inc(monCheckListUsed);
end;
+var
+ cx0, cy0, cx1, cy1, cw, ch: Integer;
+ f: Integer;
+ px, py, pw, ph, pdx, pdy: Integer;
+ squash: Boolean;
+ plr: TPlayer;
+ gib: PGib;
+ cor: TCorpse;
+ mon: TMonster;
+ mpfrid: LongWord;
+ ontop: Boolean;
+ actMoveTrig: Boolean;
+ actSizeTrig: Boolean;
begin
- if Enabled and (FCurTexture >= 0) and
+ if (not Enabled) or (Width < 1) or (Height < 1) then exit;
+
+ if (FCurTexture >= 0) and
(FTextureIDs[FCurTexture].Anim) and
(FTextureIDs[FCurTexture].AnTex <> nil) and
- (Width > 0) and (Height > 0) and (FAlpha < 255) then
+ (FAlpha < 255) then
begin
FTextureIDs[FCurTexture].AnTex.Update();
FCurFrame := FTextureIDs[FCurTexture].AnTex.CurrentFrame;
FCurFrameCount := FTextureIDs[FCurTexture].AnTex.CurrentCounter;
end;
- if mMovingActive and (not mMovingSpeed.isZero) then
+ 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;
+
+ //TODO: write wall size change processing
+
+ // moving platform?
begin
- monMoveListUsed := 0;
- nx := X+mMovingSpeed.X;
- ny := Y+mMovingSpeed.Y;
- // move monsters on lifts
- g_Mons_ForEachAt(X, Y-1, Width, 1, monMove);
- // push monsters
- g_Mons_ForEachAt(nx, ny, Width, Height, monPush);
- // move and push players
- for f := 0 to High(gPlayers) do plrMove(gPlayers[f]);
- // reverse moving direction, if necessary
- if (mMovingSpeed.X < 0) and (nx <= mMovingStart.X) then mMovingSpeed.X := -mMovingSpeed.X
- else if (mMovingSpeed.X > 0) and (nx >= mMovingEnd.X) then mMovingSpeed.X := -mMovingSpeed.X;
- if (mMovingSpeed.Y < 0) and (ny <= mMovingStart.Y) then mMovingSpeed.Y := -mMovingSpeed.Y
- else if (mMovingSpeed.Y > 0) and (ny >= mMovingEnd.Y) then mMovingSpeed.Y := -mMovingSpeed.Y;
- // awake particles
- g_Mark(X, Y, Width, Height, MARK_WALL, false);
+ (*
+ * collect all monsters and players (aka entities) along the possible platform path
+ * if entity is standing on a platform:
+ * try to move it along the platform path, checking wall collisions
+ * if entity is NOT standing on a platform, but hit with sweeped platform aabb:
+ * try to push entity
+ * if we can't push entity all the way, squash it
+ *)
+ ox := X;
+ oy := Y;
+ mpw := Width;
+ mph := Height;
+
+ nw := mpw+mSizeSpeed.w;
+ nh := mph+mSizeSpeed.h;
+ 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
+ // old rect
+ ex := ox+mpw-1;
+ ey := ox+mph-1;
+ // new rect
+ nex := nx+nw-1;
+ ney := ny+nh-1;
+ // full rect
+ cx0 := nmin(ox, nx);
+ cy0 := nmin(oy, ny);
+ cx1 := nmax(ex, nex);
+ cy1 := nmax(ey, ney);
+ // extrude
+ cx0 -= 1;
+ cy0 -= 1;
+ cx1 += 1;
+ cy1 += 1;
+ cw := cx1-cx0+1;
+ ch := cy1-cy0+1;
+
+ // process "obstacle" panels
+ if ((tag and GridTagObstacle) <> 0) then
+ begin
+ // temporarily turn off this panel, so it won't interfere with collision checks
+ mapGrid.proxyEnabled[proxyId] := false;
+
+ // process players
+ for f := 0 to High(gPlayers) do
+ begin
+ plr := gPlayers[f];
+ if (plr = nil) or (not plr.alive) then continue;
+ plr.getMapBox(px, py, pw, ph);
+ if not g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then continue;
+ if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash) then
+ begin
+ // set new position
+ plr.moveBy(pdx, pdy); // this will call `positionChanged()` for us
+ end;
+ // squash player, if necessary
+ if not g_Game_IsClient and squash then plr.Damage(15000, 0, 0, 0, HIT_TRAP);
+ end;
+
+ // process gibs
+ for f := 0 to High(gGibs) do
+ begin
+ gib := @gGibs[f];
+ if not gib.alive then continue;
+ gib.getMapBox(px, py, pw, ph);
+ if not g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then continue;
+ if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash, @ontop) then
+ begin
+ // set new position
+ gib.moveBy(pdx, pdy); // this will call `positionChanged()` for us
+ end;
+ end;
+
+ // move and push corpses
+ for f := 0 to High(gCorpses) do
+ begin
+ cor := gCorpses[f];
+ if (cor = nil) then continue;
+ cor.getMapBox(px, py, pw, ph);
+ if not g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then continue;
+ if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash, @ontop) then
+ begin
+ // set new position
+ cor.moveBy(pdx, pdy); // this will call `positionChanged()` for us
+ end;
+ end;
+
+ // collect monsters
+ monCheckListUsed := 0;
+ g_Mons_ForEachAt(cx0, cy0, cw, ch, monCollect);
+
+ // process collected monsters
+ if (monCheckListUsed > 0) then
+ begin
+ mpfrid := g_Mons_getNewMPlatFrameId();
+ for f := 0 to monCheckListUsed do
+ begin
+ mon := monCheckList[f];
+ if (mon = nil) or (not mon.alive) or (mon.mplatCheckFrameId = mpfrid) then continue;
+ mon.mplatCheckFrameId := mpfrid;
+ mon.getMapBox(px, py, pw, ph);
+ //if not g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then continue;
+ if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash) then
+ 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 monster, if necessary
+ if not g_Game_IsClient and squash then mon.Damage(15000, 0, 0, 0, HIT_TRAP);
+ end;
+ end;
+
+ // restore panel state
+ mapGrid.proxyEnabled[proxyId] := true;
+ end;
+ end;
+
+ // move panel
X := nx;
Y := ny;
- g_Mark(nx, ny, Width, Height, MARK_WALL);
- // fix grid
+ FWidth := nw;
+ FHeight := nh;
positionChanged();
- // notify moved monsters about their movement
- for f := 0 to monMoveListUsed-1 do monMoveList[f].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.w := 0;
+ mSizeSpeed.h := 0;
+ actSizeTrig := true;
+ if (nw < 1) or (nh < 1) then mMovingActive := false; //HACK!
+ end;
+
+ // reverse moving direction, if necessary
+ if ((mMovingSpeed.X < 0) and (nx <= mMovingStart.X)) or ((mMovingSpeed.X > 0) and (nx >= mMovingEnd.X)) then
+ begin
+ if mMoveOnce then mMovingActive := false else mMovingSpeed.X := -mMovingSpeed.X;
+ actMoveTrig := true;
+ end;
+
+ if ((mMovingSpeed.Y < 0) and (ny <= mMovingStart.Y)) or ((mMovingSpeed.Y > 0) and (ny >= mMovingEnd.Y)) then
+ begin
+ if mMoveOnce then mMovingActive := false else mMovingSpeed.Y := -mMovingSpeed.Y;
+ actMoveTrig := true;
+ end;
+
+ if (mOldMovingActive <> mMovingActive) then mNeedSend := true;
+ mOldMovingActive := mMovingActive;
+
+ 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;
+
procedure TPanel.SetFrame(Frame: Integer; Count: Byte);
function ClampInt(X, A, B: Integer): Integer;
Result := Result + 100;
end;
+const
+ PAN_SAVE_VERSION = 1;
+
procedure TPanel.SaveState(Var Mem: TBinMemoryWriter);
var
sig: DWORD;
anim: Boolean;
+ ver: Byte;
begin
if (Mem = nil) then exit;
- //if not SaveIt then exit;
// Ñèãíàòóðà ïàíåëè:
sig := PANEL_SIGNATURE; // 'PANL'
Mem.WriteDWORD(sig);
+ ver := PAN_SAVE_VERSION;
+ Mem.WriteByte(ver);
// Îòêðûòà/çàêðûòà, åñëè äâåðü:
Mem.WriteBoolean(FEnabled);
// Íàïðàâëåíèå ëèôòà, åñëè ëèôò:
// Êîîðäû
Mem.WriteInt(FX);
Mem.WriteInt(FY);
+ Mem.WriteWord(FWidth);
+ Mem.WriteWord(FHeight);
// Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà:
if (FCurTexture >= 0) and (FTextureIDs[FCurTexture].Anim) then
begin
// Åñëè äà - ñîõðàíÿåì àíèìàöèþ:
if anim then
FTextureIDs[FCurTexture].AnTex.SaveState(Mem);
+
// moving platform state
Mem.WriteInt(mMovingSpeed.X);
Mem.WriteInt(mMovingSpeed.Y);
Mem.WriteInt(mMovingStart.Y);
Mem.WriteInt(mMovingEnd.X);
Mem.WriteInt(mMovingEnd.Y);
+
+ Mem.WriteInt(mSizeSpeed.w);
+ Mem.WriteInt(mSizeSpeed.h);
+ Mem.WriteInt(mSizeEnd.w);
+ Mem.WriteInt(mSizeEnd.h);
Mem.WriteBoolean(mMovingActive);
+ Mem.WriteBoolean(mMoveOnce);
+
+ Mem.WriteInt(mEndPosTrig);
+ Mem.WriteInt(mEndSizeTrig);
end;
procedure TPanel.LoadState(var Mem: TBinMemoryReader);
var
sig: DWORD;
anim: Boolean;
+ ver: Byte;
//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;
+ if (sig <> PANEL_SIGNATURE) then raise EBinSizeError.Create('TPanel.LoadState: wrong panel signature'); // 'PANL'
+ Mem.ReadByte(ver);
+ if (ver <> PAN_SAVE_VERSION) then raise EBinSizeError.Create('TPanel.LoadState: invalid panel version');
// Îòêðûòà/çàêðûòà, åñëè äâåðü:
Mem.ReadBoolean(FEnabled);
// Íàïðàâëåíèå ëèôòà, åñëè ëèôò:
//oy := FY;
Mem.ReadInt(FX);
Mem.ReadInt(FY);
+ Mem.ReadWord(FWidth);
+ Mem.ReadWord(FHeight);
//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);
'TPanel.LoadState: No animation object');
FTextureIDs[FCurTexture].AnTex.LoadState(Mem);
end;
+
// moving platform state
Mem.ReadInt(mMovingSpeed.X);
Mem.ReadInt(mMovingSpeed.Y);
Mem.ReadInt(mMovingStart.Y);
Mem.ReadInt(mMovingEnd.X);
Mem.ReadInt(mMovingEnd.Y);
+ Mem.ReadInt(mSizeSpeed.w);
+ Mem.ReadInt(mSizeSpeed.h);
+ Mem.ReadInt(mSizeEnd.w);
+ Mem.ReadInt(mSizeEnd.h);
Mem.ReadBoolean(mMovingActive);
+ Mem.ReadBoolean(mMoveOnce);
+
+ Mem.ReadInt(mEndPosTrig);
+ Mem.ReadInt(mEndSizeTrig);
- if (proxyId >= 0) then mapGrid.moveBody(proxyId, X, Y);
+ positionChanged();
+ //mapGrid.proxyEnabled[proxyId] := FEnabled; // done in g_map.pas
end;
end.