diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index d3101aa0e1b6e0f1c7102b458f7b61db447d2280..55190ae2b7dd52d5847d2599501dd457f2b4796b 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
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;
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
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 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;
FCurFrame := 0;
FCurFrameCount := 0;
LastAnimLoop := 0;
- Moved := False;
mapId := PanelRec.id;
mGUID := aguid;
mMovingStart := PanelRec.moveStart;
mMovingEnd := PanelRec.moveEnd;
mMovingActive := PanelRec['move_active'].varvalue;
+ 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;
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
@@ -386,6 +385,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,7 +405,11 @@ 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 ();
var
xx, yy: Integer;
NoTextureID: DWORD;
@@ -480,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_dbg_scale <> 1.0) or g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)) then
begin
if not FTextureIDs[FCurTexture].Anim then
begin
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;
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 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;
- if actMoveTrig then g_Triggers_Press(mEndPosTrig, ACTIVATE_CUSTOM);
- if actSizeTrig then g_Triggers_Press(mEndSizeTrig, ACTIVATE_CUSTOM);
+ // 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;
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);
positionChanged();
//mapGrid.proxyEnabled[proxyId] := FEnabled; // done in g_map.pas