diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index 563beffbbeac9cb783a2adee4d1ec9f417c0ceea..3969cba96bf4fbc02499c462835caa8a69e4394f 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
-(* 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
interface
uses
- MAPDEF, BinEditor, g_textures, xdynrec;
+ SysUtils, Classes,
+ MAPDEF, g_textures, xdynrec;
type
TAddTextureArray = Array of
function GetTextureID(): Cardinal;
function GetTextureCount(): Integer;
- procedure SaveState(var Mem: TBinMemoryWriter);
- procedure LoadState(var Mem: TBinMemoryReader);
+ procedure SaveState (st: TStream);
+ procedure LoadState (st: TStream);
procedure positionChanged (); inline;
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;
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;
+ 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, GL, geom, utils, xstreams;
const
PANEL_SIGNATURE = $4C4E4150; // 'PANL'
var Textures: TLevelTextureArray; aguid: Integer);
var
i: Integer;
+ tnum: Integer;
begin
X := PanelRec.X;
Y := PanelRec.Y;
// Òåêñòóð íåñêîëüêî - íóæíî ñîõðàíÿòü òåêóùóþ:
//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;
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, 128, 0, 0, TBlending.Filter);
+ LongWord(TEXTURE_SPECIAL_ACID2): e_DrawFillQuad(X, Y, X+Width-1, Y+Height-1, 128, 0, 0, 0, TBlending.Filter);
LongWord(TEXTURE_NONE):
if g_Texture_Get('NOTEXTURE', NoTextureID) then
begin
Result := Result + 100;
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;
-
-// Ñèãíàòóðà ïàíåëè:
- sig := PANEL_SIGNATURE; // 'PANL'
- Mem.WriteDWORD(sig);
- ver := PAN_SAVE_VERSION;
- Mem.WriteByte(ver);
-// Îòêðûòà/çàêðûòà, åñëè äâåðü:
- Mem.WriteBoolean(FEnabled);
-// Íàïðàâëåíèå ëèôòà, åñëè ëèôò:
- Mem.WriteByte(FLiftType);
-// Íîìåð òåêóùåé òåêñòóðû:
- Mem.WriteInt(FCurTexture);
-// Êîîðäû
- Mem.WriteInt(FX);
- Mem.WriteInt(FY);
- Mem.WriteWord(FWidth);
- Mem.WriteWord(FHeight);
-// Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà:
+ if (st = nil) then exit;
+
+ // Ñèãíàòóðà ïàíåëè
+ utils.writeSign(st, 'PANL');
+ utils.writeInt(st, Byte(PAN_SAVE_VERSION));
+ // Îòêðûòà/çàêðûòà, åñëè äâåðü
+ utils.writeBool(st, FEnabled);
+ // Íàïðàâëåíèå ëèôòà, åñëè ëèôò
+ utils.writeInt(st, Byte(FLiftType));
+ // Íîìåð òåêóùåé òåêñòóðû
+ 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;
- end
+ begin
+ assert(FTextureIDs[FCurTexture].AnTex <> nil, 'TPanel.SaveState: No animation object');
+ anim := true;
+ end
else
- anim := False;
- Mem.WriteBoolean(anim);
-// Åñëè äà - ñîõðàíÿåì àíèìàöèþ:
- if anim then
- FTextureIDs[FCurTexture].AnTex.SaveState(Mem);
+ begin
+ anim := false;
+ end;
+ utils.writeBool(st, anim);
+ // Åñëè äà - ñîõðàíÿåì àíèìàöèþ
+ 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;
- //ox, oy: Integer;
+
+procedure TPanel.LoadState (st: TStream);
begin
- if (Mem = 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');
-// Îòêðûòà/çàêðûòà, åñëè äâåðü:
- Mem.ReadBoolean(FEnabled);
-// Íàïðàâëåíèå ëèôòà, åñëè ëèôò:
- Mem.ReadByte(FLiftType);
-// Íîìåð òåêóùåé òåêñòóðû:
- Mem.ReadInt(FCurTexture);
-// Êîîðäû
- //ox := FX;
- //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);
-// Åñëè äà - çàãðóæàåì àíèìàöèþ:
- if anim then
+ if (st = nil) then exit;
+
+ // Ñèãíàòóðà ïàíåëè
+ 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');
+ // Îòêðûòà/çàêðûòà, åñëè äâåðü
+ FEnabled := utils.readBool(st);
+ // Íàïðàâëåíèå ëèôòà, åñëè ëèôò
+ FLiftType := utils.readByte(st);
+ // Íîìåð òåêóùåé òåêñòóðû
+ FCurTexture := utils.readLongInt(st);
+ // Êîîðäèíàòû è ðàçìåð
+ FX := utils.readLongInt(st);
+ FY := utils.readLongInt(st);
+ FWidth := utils.readWord(st);
+ FHeight := utils.readWord(st);
+ // Àíèìèðîâàííàÿ ëè òåêóùàÿ òåêñòóðà
+ 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);
- 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);
+ 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);
+
+ mSizeSpeed.w := utils.readLongInt(st);
+ mSizeSpeed.h := utils.readLongInt(st);
+ mSizeEnd.w := utils.readLongInt(st);
+ mSizeEnd.h := utils.readLongInt(st);
+
+ mMovingActive := utils.readBool(st);
+ mMoveOnce := utils.readBool(st);
+
+ mEndPosTrig := utils.readLongInt(st);
+ mEndSizeTrig := utils.readLongInt(st);
positionChanged();
//mapGrid.proxyEnabled[proxyId] := FEnabled; // done in g_map.pas
end;
+
end.