X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_panel.pas;h=3b2830e634d471e3eb0796b37b5d504cf50ea1e8;hb=a0b4df67e96c6b5e55e95269a87975df67692e6b;hp=39c1b101278e6a29830c6dab22ab1ed3ccb26748;hpb=7292fe409145dfcbb2776e34bb64d56e32985b9d;p=d2df-sdl.git diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas index 39c1b10..3b2830e 100644 --- a/src/game/g_panel.pas +++ b/src/game/g_panel.pas @@ -13,13 +13,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *) -{$INCLUDE g_amodes.inc} +{$INCLUDE ../shared/a_modes.inc} +{$M+} unit g_panel; interface uses - MAPSTRUCT, BinEditor, g_textures; + MAPDEF, BinEditor, g_textures, xdynrec; type TAddTextureArray = Array of @@ -41,22 +42,34 @@ type True: (AnTex: TAnimation); end; + mMovingSpeed: TDFPoint; + mMovingStart: TDFPoint; + mMovingEnd: TDFPoint; + mMovingActive: Boolean; + + private + function getx1 (): Integer; inline; + function gety1 (): Integer; inline; + function getvisvalid (): Boolean; inline; + public FCurTexture: Integer; // Íîìåð òåêóùåé òåêñòóðû FCurFrame: Integer; FCurFrameCount: Byte; - X, Y: Integer; - Width, Height: Word; - PanelType: Word; - SaveIt: Boolean; // Ñîõðàíÿòü ïðè SaveState? - Enabled: Boolean; - Door: Boolean; - Moved: Boolean; - LiftType: Byte; - LastAnimLoop: Byte; - ArrIdx: Integer; // index in one of internal arrays; sorry - - constructor Create(PanelRec: TPanelRec_1; + FX, FY: Integer; + FWidth, FHeight: Word; + FPanelType: Word; + FSaveIt: Boolean; // Ñîõðàíÿòü ïðè SaveState? + FEnabled: Boolean; + FDoor: Boolean; + FMoved: Boolean; + FLiftType: Byte; + FLastAnimLoop: Byte; + arrIdx: Integer; // index in one of internal arrays; sorry + tag: Integer; // used in coldets and such; sorry + proxyId: Integer; // proxy id in map grid (DO NOT USE!) + + constructor Create(PanelRec: TDynRecord; AddTextures: TAddTextureArray; CurTex: Integer; var Textures: TLevelTextureArray); @@ -73,23 +86,49 @@ type procedure SaveState(var Mem: TBinMemoryWriter); procedure LoadState(var Mem: TBinMemoryReader); + + public + property visvalid: Boolean read getvisvalid; // panel is "visvalid" when it's width and height are positive + + published + property x0: Integer read FX; + property y0: Integer read FY; + property x1: Integer read getx1; // inclusive! + property y1: Integer read gety1; // inclusive! + property x: Integer read FX write FX; + property y: Integer read FY write FY; + 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; + + public + property movingSpeed: TDFPoint read mMovingSpeed write mMovingSpeed; + property movingStart: TDFPoint read mMovingStart write mMovingStart; + property movingEnd: TDFPoint read mMovingEnd write mMovingEnd; end; - PPanel = ^TPanel; TPanelArray = Array of TPanel; implementation uses - SysUtils, g_basic, g_map, MAPDEF, g_game, e_graphics, - g_console, g_language, e_log, GL; + SysUtils, g_basic, g_map, g_game, e_graphics, + g_console, g_language, g_monsters, g_player, e_log, GL; const PANEL_SIGNATURE = $4C4E4150; // 'PANL' { T P a n e l : } -constructor TPanel.Create(PanelRec: TPanelRec_1; +constructor TPanel.Create(PanelRec: TDynRecord; AddTextures: TAddTextureArray; CurTex: Integer; var Textures: TLevelTextureArray); @@ -107,6 +146,11 @@ begin LastAnimLoop := 0; Moved := False; + mMovingSpeed := PanelRec.moveSpeed; + mMovingStart := PanelRec.moveStart; + mMovingEnd := PanelRec.moveEnd; + mMovingActive := PanelRec['move_active'].varvalue; + // Òèï ïàíåëè: PanelType := PanelRec.PanelType; Enabled := True; @@ -174,11 +218,11 @@ begin case PanelRec.PanelType of PANEL_WATER: - FTextureIDs[0].Tex := TEXTURE_SPECIAL_WATER; + FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_WATER); PANEL_ACID1: - FTextureIDs[0].Tex := TEXTURE_SPECIAL_ACID1; + FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_ACID1); PANEL_ACID2: - FTextureIDs[0].Tex := TEXTURE_SPECIAL_ACID2; + FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_ACID2); end; FCurTexture := 0; @@ -247,16 +291,19 @@ begin Inherited; 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; + procedure TPanel.Draw(); var xx, yy: Integer; NoTextureID: DWORD; NW, NH: Word; begin - if Enabled and (FCurTexture >= 0) and + 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 + (g_dbg_scale_05 or g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)) then begin if FTextureIDs[FCurTexture].Anim then begin // Àíèìèðîâàííàÿ òåêñòóðà @@ -272,16 +319,16 @@ begin else begin // Îáû÷íàÿ òåêñòóðà case FTextureIDs[FCurTexture].Tex of - TEXTURE_SPECIAL_WATER: + LongWord(TEXTURE_SPECIAL_WATER): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 0, 0, 255, 0, B_FILTER); - TEXTURE_SPECIAL_ACID1: + LongWord(TEXTURE_SPECIAL_ACID1): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 0, 128, 0, 0, B_FILTER); - TEXTURE_SPECIAL_ACID2: + LongWord(TEXTURE_SPECIAL_ACID2): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 128, 0, 0, 0, B_FILTER); - TEXTURE_NONE: + LongWord(TEXTURE_NONE): if g_Texture_Get('NOTEXTURE', NoTextureID) then begin e_GetTextureSize(NoTextureID, @NW, @NH); @@ -337,10 +384,10 @@ begin if not FTextureIDs[FCurTexture].Anim then begin case FTextureIDs[FCurTexture].Tex of - TEXTURE_SPECIAL_WATER: exit; - TEXTURE_SPECIAL_ACID1: exit; - TEXTURE_SPECIAL_ACID2: exit; - TEXTURE_NONE: exit; + LongWord(TEXTURE_SPECIAL_WATER): exit; + LongWord(TEXTURE_SPECIAL_ACID1): exit; + LongWord(TEXTURE_SPECIAL_ACID2): exit; + LongWord(TEXTURE_NONE): exit; end; end; if (X+Width < lightX-radius) then exit; @@ -358,7 +405,86 @@ begin end; end; + +var + monMoveList: array of TMonster = nil; + monMoveListUsed: Integer = 0; + procedure TPanel.Update(); +var + nx, ny: Integer; + f: Integer; + + function doPush (px, py, pw, ph: Integer; out dx, dy: Integer): Boolean; + begin + result := g_Collide(px, py, pw, ph, nx, ny, Width, Height); + if result 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; + end + else + begin + dx := 0; + dy := 0; + 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 + 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); + end; + end; + + procedure plrMove (plr: TPlayer); + var + px, py, pw, ph, dx, dy: Integer; + 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(); + end; + begin if Enabled and (FCurTexture >= 0) and (FTextureIDs[FCurTexture].Anim) and @@ -369,6 +495,26 @@ begin FCurFrame := FTextureIDs[FCurTexture].AnTex.CurrentFrame; FCurFrameCount := FTextureIDs[FCurTexture].AnTex.CurrentCounter; end; + + if mMovingActive and (not mMovingSpeed.isZero) then + begin + monMoveListUsed := 0; + nx := X+mMovingSpeed.X; + ny := Y+mMovingSpeed.Y; + g_Mons_ForEachAt(X, Y-1, Width, 1, monMove); + g_Mons_ForEachAt(nx, ny, Width, Height, monPush); + for f := 0 to High(gPlayers) do plrMove(gPlayers[f]); + 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; + //!!!g_Mark(X, Y, Width, Height, MARK_FREE); + X := nx; + Y := ny; + //!!!g_Mark(X, Y, Width, Height, MARK_WALL); + if (proxyId >= 0) then mapGrid.moveBody(proxyId, nx, ny); + for f := 0 to monMoveListUsed-1 do monMoveList[f].positionChanged(); + end; end; procedure TPanel.SetFrame(Frame: Integer; Count: Byte); @@ -481,7 +627,7 @@ end; function TPanel.GetTextureID(): DWORD; begin - Result := TEXTURE_NONE; + Result := LongWord(TEXTURE_NONE); if (FCurTexture >= 0) then begin @@ -514,14 +660,14 @@ begin sig := PANEL_SIGNATURE; // 'PANL' Mem.WriteDWORD(sig); // Îòêðûòà/çàêðûòà, åñëè äâåðü: - Mem.WriteBoolean(Enabled); + Mem.WriteBoolean(FEnabled); // Íàïðàâëåíèå ëèôòà, åñëè ëèôò: - Mem.WriteByte(LiftType); + Mem.WriteByte(FLiftType); // Íîìåð òåêóùåé òåêñòóðû: Mem.WriteInt(FCurTexture); // Êîîðäû - Mem.WriteInt(X); - Mem.WriteInt(Y); + Mem.WriteInt(FX); + Mem.WriteInt(FY); // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà: if (FCurTexture >= 0) and (FTextureIDs[FCurTexture].Anim) then begin @@ -535,6 +681,14 @@ begin // Åñëè äà - ñîõðàíÿåì àíèìàöèþ: if anim then FTextureIDs[FCurTexture].AnTex.SaveState(Mem); + // 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); end; procedure TPanel.LoadState(var Mem: TBinMemoryReader); @@ -552,14 +706,14 @@ begin raise EBinSizeError.Create('TPanel.LoadState: Wrong Panel Signature'); end; // Îòêðûòà/çàêðûòà, åñëè äâåðü: - Mem.ReadBoolean(Enabled); + Mem.ReadBoolean(FEnabled); // Íàïðàâëåíèå ëèôòà, åñëè ëèôò: - Mem.ReadByte(LiftType); + Mem.ReadByte(FLiftType); // Íîìåð òåêóùåé òåêñòóðû: Mem.ReadInt(FCurTexture); // Êîîðäû - Mem.ReadInt(X); - Mem.ReadInt(Y); + Mem.ReadInt(FX); + Mem.ReadInt(FY); // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà: Mem.ReadBoolean(anim); // Åñëè äà - çàãðóæàåì àíèìàöèþ: @@ -571,6 +725,14 @@ begin '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.X); + Mem.ReadInt(mMovingStart.Y); + Mem.ReadInt(mMovingEnd.X); + Mem.ReadInt(mMovingEnd.Y); + Mem.ReadBoolean(mMovingActive); end; end.