X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_panel.pas;h=563beffbbeac9cb783a2adee4d1ec9f417c0ceea;hb=5e0a71e1d35a9037be80c8912060a913d0e98b18;hp=d3101aa0e1b6e0f1c7102b458f7b61db447d2280;hpb=638c2b7dfd45b5efbc806624133e8e39d5b04460;p=d2df-sdl.git diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas index d3101aa..563beff 100644 --- a/src/game/g_panel.pas +++ b/src/game/g_panel.pas @@ -51,12 +51,16 @@ type 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; @@ -77,6 +81,16 @@ type 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; @@ -84,10 +98,8 @@ type 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 @@ -103,7 +115,7 @@ type 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); @@ -127,6 +139,10 @@ type 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 @@ -141,10 +157,8 @@ type 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? @@ -157,6 +171,11 @@ type 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; @@ -172,6 +191,9 @@ type 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; @@ -210,7 +232,6 @@ begin FCurFrame := 0; FCurFrameCount := 0; LastAnimLoop := 0; - Moved := False; mapId := PanelRec.id; mGUID := aguid; @@ -218,7 +239,8 @@ begin 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; @@ -227,42 +249,21 @@ begin 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; // Íåâèäèìàÿ: @@ -325,7 +326,6 @@ begin 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 // Îáû÷íàÿ òåêñòóðà @@ -334,8 +334,7 @@ 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,15 +405,19 @@ 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 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 // Àíèìèðîâàííàÿ òåêñòóðà @@ -420,40 +433,32 @@ begin 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(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_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, X, Y, Width div NW, Height 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); + 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); 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, X, Y, Width div FTextureWidth, Height 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, X, Y, Width, Height, FAlpha, True, FBlending, g_dbg_scale, hasAmbient); + if hasAmbient then e_AmbientQuad(X, Y, Width, Height, ambColor.r, ambColor.g, ambColor.b, ambColor.a); + end; end; end; end; @@ -480,7 +485,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 @@ -672,6 +678,9 @@ 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; @@ -697,6 +706,21 @@ begin 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 @@ -788,8 +812,12 @@ 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; @@ -809,6 +837,8 @@ begin 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 @@ -816,7 +846,6 @@ 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 @@ -832,9 +861,19 @@ begin 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; @@ -970,17 +1009,22 @@ begin 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); // Íàïðàâëåíèå ëèôòà, åñëè ëèôò: @@ -990,6 +1034,8 @@ begin // Êîîðäû Mem.WriteInt(FX); Mem.WriteInt(FY); + Mem.WriteWord(FWidth); + Mem.WriteWord(FHeight); // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà: if (FCurTexture >= 0) and (FTextureIDs[FCurTexture].Anim) then begin @@ -1003,6 +1049,7 @@ begin // Åñëè äà - ñîõðàíÿåì àíèìàöèþ: if anim then FTextureIDs[FCurTexture].AnTex.SaveState(Mem); + // moving platform state Mem.WriteInt(mMovingSpeed.X); Mem.WriteInt(mMovingSpeed.Y); @@ -1010,24 +1057,32 @@ begin 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); // Íàïðàâëåíèå ëèôòà, åñëè ëèôò: @@ -1039,6 +1094,8 @@ begin //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); @@ -1051,6 +1108,7 @@ begin 'TPanel.LoadState: No animation object'); FTextureIDs[FCurTexture].AnTex.LoadState(Mem); end; + // moving platform state Mem.ReadInt(mMovingSpeed.X); Mem.ReadInt(mMovingSpeed.Y); @@ -1058,7 +1116,15 @@ begin 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