X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_panel.pas;h=0a52568dd4706237bf1506fa881add0d2694c20f;hb=716e8233028cb94e958b09dccc83e72c4ab0038d;hp=07fe2d6103e5dd4f2fc57ec38e1b67330060203b;hpb=dd969f579db2bf70f6ddfcb5d377b2b95b994a6e;p=d2df-sdl.git diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas index 07fe2d6..0a52568 100644 --- a/src/game/g_panel.pas +++ b/src/game/g_panel.pas @@ -1,9 +1,8 @@ -(* Copyright (C) DooM 2D:Forever Developers +(* Copyright (C) Doom 2D: Forever Developers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +19,8 @@ unit g_panel; interface uses - MAPDEF, BinEditor, g_textures, xdynrec; + SysUtils, Classes, + MAPDEF, g_textures, xdynrec; type TAddTextureArray = Array of @@ -29,6 +29,7 @@ type Anim: Boolean; end; + PPanel = ^TPanel; TPanel = Class (TObject) private const @@ -108,6 +109,7 @@ type tag: Integer; // used in coldets and such; sorry; see g_map.GridTagXXX proxyId: Integer; // proxy id in map grid (DO NOT USE!) mapId: AnsiString; // taken directly from map file; dunno why it is here + hasTexTrigger: Boolean; // HACK: true when there's a trigger than can change my texture constructor Create(PanelRec: TDynRecord; AddTextures: TAddTextureArray; @@ -123,9 +125,10 @@ type procedure SetTexture(ID: Integer; AnimLoop: Byte = 0); function GetTextureID(): Cardinal; function GetTextureCount(): Integer; + function CanChangeTexture(): Boolean; - procedure SaveState(var Mem: TBinMemoryWriter); - procedure LoadState(var Mem: TBinMemoryReader); + procedure SaveState (st: TStream); + procedure LoadState (st: TStream); procedure positionChanged (); inline; @@ -157,10 +160,10 @@ type property width: Word read FWidth write FWidth; property height: Word read FHeight write FHeight; property panelType: Word read FPanelType write FPanelType; - property enabled: Boolean read FEnabled write FEnabled; // Ñîõðàíÿòü ïðè SaveState? - property door: Boolean read FDoor write FDoor; // Ñîõðàíÿòü ïðè SaveState? - property liftType: Byte read FLiftType write FLiftType; // Ñîõðàíÿòü ïðè SaveState? - property lastAnimLoop: Byte read FLastAnimLoop write FLastAnimLoop; // Ñîõðàíÿòü ïðè SaveState? + property enabled: Boolean read FEnabled write FEnabled; + property door: Boolean read FDoor write FDoor; + property liftType: Byte read FLiftType write FLiftType; + property lastAnimLoop: Byte read FLastAnimLoop write FLastAnimLoop; property movingSpeedX: Integer read getMovingSpeedX write setMovingSpeedX; property movingSpeedY: Integer read getMovingSpeedY write setMovingSpeedY; @@ -200,6 +203,12 @@ type TPanelArray = Array of TPanel; +const + LIFTTYPE_UP = 0; + LIFTTYPE_DOWN = 1; + LIFTTYPE_LEFT = 2; + LIFTTYPE_RIGHT = 3; + var g_dbgpan_mplat_active: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}true{$ENDIF}; g_dbgpan_mplat_step: Boolean = false; // one step, and stop @@ -208,8 +217,9 @@ var implementation uses - 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; + {$INCLUDE ../nogl/noGLuses.inc} + e_texture, 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, geom, utils, xstreams; const PANEL_SIGNATURE = $4C4E4150; // 'PANL' @@ -222,6 +232,7 @@ constructor TPanel.Create(PanelRec: TDynRecord; var Textures: TLevelTextureArray; aguid: Integer); var i: Integer; + tnum: Integer; begin X := PanelRec.X; Y := PanelRec.Y; @@ -255,15 +266,16 @@ begin PanelType := PanelRec.PanelType; Enabled := True; Door := False; - LiftType := 0; + LiftType := LIFTTYPE_UP; + hasTexTrigger := False; case PanelType of 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; + PANEL_LIFTUP: LiftType := LIFTTYPE_UP; //??? + PANEL_LIFTDOWN: LiftType := LIFTTYPE_DOWN; + PANEL_LIFTLEFT: LiftType := LIFTTYPE_LEFT; + PANEL_LIFTRIGHT: LiftType := LIFTTYPE_RIGHT; end; // Íåâèäèìàÿ: @@ -336,19 +348,22 @@ begin // Òåêñòóð íåñêîëüêî - íóæíî ñîõðàíÿòü òåêóùóþ: //if Length(FTextureIDs) > 1 then SaveIt := True; + if (PanelRec.TextureRec = nil) then tnum := -1 else tnum := PanelRec.tagInt; + if (tnum < 0) then tnum := Length(Textures); + // Åñëè íå ñïåöòåêñòóðà, òî çàäàåì ðàçìåðû: - if PanelRec.TextureNum > High(Textures) then + if ({PanelRec.TextureNum}tnum > High(Textures)) then begin - e_WriteLog(Format('WTF?! PanelRec.TextureNum is out of limits! (%d : %d)', [PanelRec.TextureNum, High(Textures)]), MSG_FATALERROR); + e_WriteLog(Format('WTF?! tnum is out of limits! (%d : %d)', [tnum, High(Textures)]), TMsgType.Warning); FTextureWidth := 2; FTextureHeight := 2; FAlpha := 0; FBlending := ByteBool(0); end - else if not g_Map_IsSpecialTexture(Textures[PanelRec.TextureNum].TextureName) then + else if not g_Map_IsSpecialTexture(Textures[{PanelRec.TextureNum}tnum].TextureName) then begin - FTextureWidth := Textures[PanelRec.TextureNum].Width; - FTextureHeight := Textures[PanelRec.TextureNum].Height; + FTextureWidth := Textures[{PanelRec.TextureNum}tnum].Width; + FTextureHeight := Textures[{PanelRec.TextureNum}tnum].Height; FAlpha := PanelRec.Alpha; FBlending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING); end; @@ -428,14 +443,14 @@ begin for yy := 0 to (Height div FTextureHeight)-1 do FTextureIDs[FCurTexture].AnTex.Draw( X + xx*FTextureWidth, - Y + yy*FTextureHeight, M_NONE); + Y + yy*FTextureHeight, TMirrorType.None); end 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, TBlending.Filter); + LongWord(TEXTURE_SPECIAL_ACID1): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 0, 230, 0, 0, TBlending.Filter); + LongWord(TEXTURE_SPECIAL_ACID2): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 230, 0, 0, 0, TBlending.Filter); LongWord(TEXTURE_NONE): if g_Texture_Get('NOTEXTURE', NoTextureID) then begin @@ -580,7 +595,7 @@ var begin 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)); + mapGrid.traceBox(tex, tey, px, py, pw, ph, pdx, pdy, (GridTagWall or GridTagDoor)); end else begin @@ -608,7 +623,7 @@ var 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); + mapGrid.traceBox(tex, tey, px, py, pw, ph, szdx, szdy, trtag); end; end; end; @@ -627,7 +642,7 @@ var 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); + mapGrid.traceBox(tex, tey, px, py, pw, ph, pdx, pdy, trtag); end; end; end; @@ -892,7 +907,7 @@ begin (FTextureIDs[FCurTexture].AnTex <> nil) and (Width > 0) and (Height > 0) and (FAlpha < 255) then begin - FCurFrame := ClampInt(Frame, 0, FTextureIDs[FCurTexture].AnTex.TotalFrames); + FCurFrame := ClampInt(Frame, 0, FTextureIDs[FCurTexture].AnTex.TotalFrames - 1); FCurFrameCount := Count; FTextureIDs[FCurTexture].AnTex.CurrentFrame := FCurFrame; FTextureIDs[FCurTexture].AnTex.CurrentCounter := FCurFrameCount; @@ -948,22 +963,8 @@ end; procedure TPanel.SetTexture(ID: Integer; AnimLoop: Byte = 0); begin -// Íåò òåêñòóð: - if Length(FTextureIDs) = 0 then - FCurTexture := -1 - else - // Òîëüêî îäíà òåêñòóðà: - if Length(FTextureIDs) = 1 then - begin - if (ID = 0) or (ID = -1) then - FCurTexture := ID; - end - else - // Áîëüøå îäíîé òåêñòóðû: - begin - if (ID >= -1) and (ID <= High(FTextureIDs)) then - FCurTexture := ID; - end; + if (ID >= -1) and (ID < Length(FTextureIDs)) then + FCurTexture := ID; // Ïåðåêëþ÷èëèñü íà âèäèìóþ àíèì. òåêñòóðó: if (FCurTexture >= 0) and FTextureIDs[FCurTexture].Anim then @@ -1009,127 +1010,120 @@ begin Result := Result + 100; end; +function TPanel.CanChangeTexture(): Boolean; +begin + Result := (GetTextureCount() > 1) or hasTexTrigger; +end; const PAN_SAVE_VERSION = 1; -procedure TPanel.SaveState (var Mem: TBinMemoryWriter); +procedure TPanel.SaveState (st: TStream); var - sig: DWORD; anim: Boolean; - ver: Byte; begin - if (Mem = nil) then exit; + if (st = nil) then exit; // Ñèãíàòóðà ïàíåëè - sig := PANEL_SIGNATURE; // 'PANL' - Mem.WriteDWORD(sig); - ver := PAN_SAVE_VERSION; - Mem.WriteByte(ver); + utils.writeSign(st, 'PANL'); + utils.writeInt(st, Byte(PAN_SAVE_VERSION)); // Îòêðûòà/çàêðûòà, åñëè äâåðü - Mem.WriteBoolean(FEnabled); + utils.writeBool(st, FEnabled); // Íàïðàâëåíèå ëèôòà, åñëè ëèôò - Mem.WriteByte(FLiftType); + utils.writeInt(st, Byte(FLiftType)); // Íîìåð òåêóùåé òåêñòóðû - Mem.WriteInt(FCurTexture); - // Êîîðäû - Mem.WriteInt(FX); - Mem.WriteInt(FY); - Mem.WriteWord(FWidth); - Mem.WriteWord(FHeight); - // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà + utils.writeInt(st, Integer(FCurTexture)); + // Êîîðäèíàòû è ðàçìåð + utils.writeInt(st, Integer(FX)); + utils.writeInt(st, Integer(FY)); + utils.writeInt(st, Word(FWidth)); + utils.writeInt(st, Word(FHeight)); + // Àíèìèðîâàíà ëè òåêóùàÿ òåêñòóðà if (FCurTexture >= 0) and (FTextureIDs[FCurTexture].Anim) then begin assert(FTextureIDs[FCurTexture].AnTex <> nil, 'TPanel.SaveState: No animation object'); - anim := True; + anim := true; end else begin - anim := False; + anim := false; end; - Mem.WriteBoolean(anim); + utils.writeBool(st, anim); // Åñëè äà - ñîõðàíÿåì àíèìàöèþ - if anim then FTextureIDs[FCurTexture].AnTex.SaveState(Mem); + if anim then FTextureIDs[FCurTexture].AnTex.SaveState(st); // 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.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); + utils.writeInt(st, Integer(mMovingSpeed.X)); + utils.writeInt(st, Integer(mMovingSpeed.Y)); + utils.writeInt(st, Integer(mMovingStart.X)); + utils.writeInt(st, Integer(mMovingStart.Y)); + utils.writeInt(st, Integer(mMovingEnd.X)); + utils.writeInt(st, Integer(mMovingEnd.Y)); + + utils.writeInt(st, Integer(mSizeSpeed.w)); + utils.writeInt(st, Integer(mSizeSpeed.h)); + utils.writeInt(st, Integer(mSizeEnd.w)); + utils.writeInt(st, Integer(mSizeEnd.h)); + + utils.writeBool(st, mMovingActive); + utils.writeBool(st, mMoveOnce); + + utils.writeInt(st, Integer(mEndPosTrig)); + utils.writeInt(st, Integer(mEndSizeTrig)); end; -procedure TPanel.LoadState (var Mem: TBinMemoryReader); -var - sig: DWORD; - anim: Boolean; - ver: Byte; +procedure TPanel.LoadState (st: TStream); begin - if (Mem = nil) then exit; + if (st = nil) then exit; // Ñèãíàòóðà ïàíåëè - Mem.ReadDWORD(sig); - 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'); + if not utils.checkSign(st, 'PANL') then raise XStreamError.create('wrong panel signature'); + if (utils.readByte(st) <> PAN_SAVE_VERSION) then raise XStreamError.create('wrong panel version'); // Îòêðûòà/çàêðûòà, åñëè äâåðü - Mem.ReadBoolean(FEnabled); + FEnabled := utils.readBool(st); // Íàïðàâëåíèå ëèôòà, åñëè ëèôò - Mem.ReadByte(FLiftType); + FLiftType := utils.readByte(st); // Íîìåð òåêóùåé òåêñòóðû - Mem.ReadInt(FCurTexture); - // Êîîðäû - 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]); + FCurTexture := utils.readLongInt(st); + // Êîîðäèíàòû è ðàçìåð + FX := utils.readLongInt(st); + FY := utils.readLongInt(st); + FWidth := utils.readWord(st); + FHeight := utils.readWord(st); // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà - Mem.ReadBoolean(anim); - // Åñëè äà - çàãðóæàåì àíèìàöèþ - if anim then + if utils.readBool(st) then begin + // Åñëè äà - çàãðóæàåì àíèìàöèþ Assert((FCurTexture >= 0) and (FTextureIDs[FCurTexture].Anim) and (FTextureIDs[FCurTexture].AnTex <> nil), 'TPanel.LoadState: No animation object'); - FTextureIDs[FCurTexture].AnTex.LoadState(Mem); + FTextureIDs[FCurTexture].AnTex.LoadState(st); 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); + mMovingSpeed.X := utils.readLongInt(st); + mMovingSpeed.Y := utils.readLongInt(st); + mMovingStart.X := utils.readLongInt(st); + mMovingStart.Y := utils.readLongInt(st); + mMovingEnd.X := utils.readLongInt(st); + mMovingEnd.Y := utils.readLongInt(st); - Mem.ReadInt(mSizeSpeed.w); - Mem.ReadInt(mSizeSpeed.h); - Mem.ReadInt(mSizeEnd.w); - Mem.ReadInt(mSizeEnd.h); + mSizeSpeed.w := utils.readLongInt(st); + mSizeSpeed.h := utils.readLongInt(st); + mSizeEnd.w := utils.readLongInt(st); + mSizeEnd.h := utils.readLongInt(st); - Mem.ReadBoolean(mMovingActive); - Mem.ReadBoolean(mMoveOnce); + mMovingActive := utils.readBool(st); + mMoveOnce := utils.readBool(st); - Mem.ReadInt(mEndPosTrig); - Mem.ReadInt(mEndSizeTrig); + mEndPosTrig := utils.readLongInt(st); + mEndSizeTrig := utils.readLongInt(st); positionChanged(); //mapGrid.proxyEnabled[proxyId] := FEnabled; // done in g_map.pas end; + end.