diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index d104593da3eeb95a875366263c08c5c78b2554f7..bcd1c4c1d4040d2dc820e8c2747a663dd237b82b 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
TPanelArray = Array of TPanel;
+var
+ g_dbgpan_mplat_active: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$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,
+ SysUtils, g_basic, g_map, g_game, g_gfx, e_graphics, g_weapons,
g_console, g_language, g_monsters, g_player, e_log, GL;
const
begin
if (proxyId >= 0) then
begin
- monsGrid.getBodyDims(proxyId, px, py, pw, ph);
+ 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 (pw <> Width) or (ph <> Height) then mapGrid.moveResizeBody(proxyId, X, Y, Width, Height)
else mapGrid.moveBody(proxyId, X, Y);
procedure TPanel.Update();
var
nx, ny: Integer;
- f: Integer;
function doPush (px, py, pw, ph: Integer; out dx, dy: Integer): Boolean;
begin
var
px, py, pw, ph, dx, dy: Integer;
begin
- if (plr = nil) then exit;
+ // dead players leaves separate body entities, so don't move 'em
+ if (plr = nil) or not plr.alive then exit;
plr.getMapBox(px, py, pw, ph);
if (py+ph <> Y) then
begin
plr.GameX := plr.GameX+dx;
plr.GameY := plr.GameY+dy;
plr.positionChanged();
+ // check if we're squashed
+ if plr.alive then
+ begin
+ plr.getMapBox(px, py, pw, ph);
+ if g_Map_CollidePanel(px, py, pw, ph, (PANEL_WALL or PANEL_OPENDOOR or PANEL_CLOSEDOOR)) then
+ begin
+ plr.Damage(15000, 0, 0, 0, HIT_TRAP);
+ end;
+ end;
end;
exit;
end;
plr.positionChanged();
end;
+ procedure gibMove (gib: PGib);
+ var
+ px, py, pw, ph, dx, dy: Integer;
+ begin
+ if (gib = nil) or not gib.alive then exit;
+ gib.getMapBox(px, py, pw, ph);
+ {
+ writeln('gib: p=(', px, ',', py, '); obj=(', gib.Obj.X, ',', gib.Obj.Y, ')');
+ px := gib.Obj.X;
+ py := gib.Obj.Y;
+ }
+ if (py+ph <> Y) then
+ begin
+ // push gib
+ if doPush(px, py, pw, ph, dx, dy) then
+ begin
+ gib.Obj.X += dx;
+ gib.Obj.Y += dy;
+ gib.positionChanged();
+ end;
+ exit;
+ end;
+ if (px+pw <= X) then exit;
+ if (px >= X+Width) then exit;
+ gib.Obj.X += mMovingSpeed.X;
+ gib.Obj.Y += mMovingSpeed.Y;
+ gib.positionChanged();
+ end;
+
+ procedure corpseMove (cor: TCorpse);
+ var
+ px, py, pw, ph, dx, dy: Integer;
+ begin
+ if (cor = nil) then exit;
+ cor.getMapBox(px, py, pw, ph);
+ if (py+ph <> Y) then
+ begin
+ // push gib
+ if doPush(px, py, pw, ph, dx, dy) then
+ begin
+ cor.moveBy(dx, dy); // will call `positionChanged()` for us
+ end;
+ exit;
+ end;
+ if (px+pw <= X) then exit;
+ if (px >= X+Width) then exit;
+ cor.moveBy(mMovingSpeed.X, mMovingSpeed.Y); // will call `positionChanged()` for us
+ end;
+
+var
+ f: Integer;
+ mon: TMonster;
+ px, py, pw, ph: Integer;
begin
if Enabled and (FCurTexture >= 0) and
(FTextureIDs[FCurTexture].Anim) and
FCurFrameCount := FTextureIDs[FCurTexture].AnTex.CurrentCounter;
end;
- if mMovingActive and (not mMovingSpeed.isZero) then
+ if mMovingActive and (not mMovingSpeed.isZero) and g_dbgpan_mplat_active then
begin
monMoveListUsed := 0;
nx := X+mMovingSpeed.X;
ny := Y+mMovingSpeed.Y;
// move monsters on lifts
g_Mons_ForEachAt(X, Y-1, Width, 1, monMove);
+ X := nx;
+ Y := ny;
+ // fix grid
+ positionChanged();
// push monsters
g_Mons_ForEachAt(nx, ny, Width, Height, monPush);
// move and push players
for f := 0 to High(gPlayers) do plrMove(gPlayers[f]);
+ // move and push gibs
+ for f := 0 to High(gGibs) do gibMove(@gGibs[f]);
+ // move and push corpses
+ for f := 0 to High(gCorpses) do corpseMove(gCorpses[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);
- X := nx;
- Y := ny;
- //g_Mark(nx, ny, Width, Height, MARK_WALL);
- // fix grid
- positionChanged();
// notify moved monsters about their movement
- for f := 0 to monMoveListUsed-1 do monMoveList[f].positionChanged();
+ for f := 0 to monMoveListUsed-1 do
+ begin
+ monMoveList[f].positionChanged();
+ end;
+ for f := 0 to monMoveListUsed-1 do
+ begin
+ mon := monMoveList[f];
+ // check if it is squashed
+ if mon.alive then
+ begin
+ mon.getMapBox(px, py, pw, ph);
+ if g_Map_CollidePanel(px, py, pw, ph, (PANEL_WALL or PANEL_OPENDOOR or PANEL_CLOSEDOOR)) then
+ begin
+ mon.Damage(15000, 0, 0, 0, HIT_TRAP);
+ end;
+ end;
+ end;
end;
end;