diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index aa68298361c09555e490a5b73c0beb3fcc7a8d0d..f9b7371f213c2f8b4b380e02ec61bd7b03b6672f 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
MAPDEF, g_textures, xdynrec;
type
- TAddTextureArray = Array of
- record
- Texture: Cardinal;
- Anim: Boolean;
- end;
+ TAddTextureArray = array of record
+ Texture: Cardinal; // Textures[Texture]
+ end;
ATextureID = array of record
+ Texture: Cardinal; // Textures[Texture]
case Anim: Boolean of
- False: (Tex: Cardinal);
- True: (AnTex: TAnimation);
+ False: ();
+ True: (AnTex: TAnimationState);
end;
PPanel = ^TPanel;
const
private
mGUID: Integer; // will be assigned in "g_map.pas"
- FTextureWidth: Word;
- FTextureHeight: Word;
FAlpha: Byte;
FBlending: Boolean;
FTextureIDs: ATextureID;
(* private state *)
property Alpha: Byte read FAlpha;
- property TextureWidth: Word read FTextureWidth;
- property TextureHeight: Word read FTextureHeight;
property Blending: Boolean read FBlending;
property TextureIDs: ATextureID read FTextureIDs;
implementation
-uses
- g_basic, g_map, g_game, g_gfx, g_weapons, g_triggers,
- g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams;
+ uses
+ {$IFDEF ENABLE_GFX}
+ g_gfx,
+ {$ENDIF}
+ {$IFDEF ENABLE_GIBS}
+ g_gibs,
+ {$ENDIF}
+ g_basic, g_map, g_game, g_weapons, g_triggers,
+ g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams
+ ;
const
PANEL_SIGNATURE = $4C4E4150; // 'PANL'
{ T P a n e l : }
+ function FindTextureByName (const name: String): Integer;
+ var i: Integer;
+ begin
+ Result := -1;
+ if Textures <> nil then
+ begin
+ for i := 0 to High(Textures) do
+ begin
+ if Textures[i].TextureName = name then
+ begin
+ Result := i;
+ break;
+ end
+ end
+ end
+ end;
+
constructor TPanel.Create(PanelRec: TDynRecord;
AddTextures: TAddTextureArray;
CurTex: Integer;
begin
SetLength(FTextureIDs, 1);
FTextureIDs[0].Anim := False;
-
case PanelRec.PanelType of
- PANEL_WATER:
- FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_WATER);
- PANEL_ACID1:
- FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_ACID1);
- PANEL_ACID2:
- FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_ACID2);
+ PANEL_WATER: FTextureIDs[0].Texture := FindTextureByName(TEXTURE_NAME_WATER);
+ PANEL_ACID1: FTextureIDs[0].Texture := FindTextureByName(TEXTURE_NAME_ACID1);
+ PANEL_ACID2: FTextureIDs[0].Texture := FindTextureByName(TEXTURE_NAME_ACID2);
end;
-
FCurTexture := 0;
Exit;
end;
for i := 0 to Length(FTextureIDs)-1 do
begin
- FTextureIDs[i].Anim := AddTextures[i].Anim;
+ FTextureIDs[i].Texture := AddTextures[i].Texture;
+ FTextureIDs[i].Anim := Textures[AddTextures[i].Texture].FramesCount > 0;
if FTextureIDs[i].Anim then
- begin // Àíèìèðîâàííàÿ òåêñòóðà
- FTextureIDs[i].AnTex :=
- TAnimation.Create(Textures[AddTextures[i].Texture].FramesID,
- True, Textures[AddTextures[i].Texture].Speed);
- FTextureIDs[i].AnTex.Blending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
- FTextureIDs[i].AnTex.Alpha := PanelRec.Alpha;
- end
- else
- begin // Îáû÷íàÿ òåêñòóðà
- FTextureIDs[i].Tex := Textures[AddTextures[i].Texture].TextureID;
- end;
+ begin // Àíèìèðîâàííàÿ òåêñòóðà
+ FTextureIDs[i].AnTex := TAnimationState.Create(True, Textures[AddTextures[i].Texture].Speed, Textures[AddTextures[i].Texture].FramesCount);
+ end
end;
// Òåêñòóð íåñêîëüêî - íóæíî ñîõðàíÿòü òåêóùóþ:
if ({PanelRec.TextureNum}tnum > High(Textures)) then
begin
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}tnum].TextureName) then
begin
- FTextureWidth := Textures[{PanelRec.TextureNum}tnum].Width;
- FTextureHeight := Textures[{PanelRec.TextureNum}tnum].Height;
FAlpha := PanelRec.Alpha;
FBlending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
end;
e_LogWritefln('panel moved: arridx=%s; guid=%s; proxyid=%s; old:(%s,%s)-(%sx%s); new:(%s,%s)-(%sx%s)',
[arrIdx, mGUID, proxyId, px, py, pw, ph, x, y, width, height]);
}
- g_Mark(px, py, pw, ph, MARK_WALL, false);
+ {$IFDEF ENABLE_GFX}
+ g_Mark(px, py, pw, ph, MARK_WALL, false);
+ {$ENDIF}
if (Width < 1) or (Height < 1) then
begin
mapGrid.proxyEnabled[proxyId] := false;
begin
mapGrid.moveBody(proxyId, X, Y);
end;
- g_Mark(X, Y, Width, Height, MARK_WALL);
+ {$IFDEF ENABLE_GFX}
+ g_Mark(X, Y, Width, Height, MARK_WALL);
+ {$ENDIF}
end;
end;
end;
px, py, pw, ph, pdx, pdy: Integer;
squash: Boolean;
plr: TPlayer;
- gib: PGib;
+ {$IFDEF ENABLE_GIBS}
+ gib: PGib;
+ {$ENDIF}
cor: TCorpse;
mon: TMonster;
mpfrid: LongWord;
if not g_Game_IsClient and squash then plr.Damage(15000, 0, 0, 0, HIT_TRAP);
end;
- // process gibs
- for f := 0 to High(gGibs) do
- begin
- gib := @gGibs[f];
- if not gib.alive then continue;
- gib.getMapBox(px, py, pw, ph);
- if not g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then continue;
- if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash, @ontop) then
+ {$IFDEF ENABLE_GIBS}
+ // process gibs
+ for f := 0 to High(gGibs) do
begin
- // set new position
- gib.moveBy(pdx, pdy); // this will call `positionChanged()` for us
+ gib := @gGibs[f];
+ if not gib.alive then continue;
+ gib.getMapBox(px, py, pw, ph);
+ if not g_Collide(px, py, pw, ph, cx0, cy0, cw, ch) then continue;
+ if tryMPlatMove(px, py, pw, ph, pdx, pdy, squash, @ontop) then
+ begin
+ // set new position
+ gib.moveBy(pdx, pdy); // this will call `positionChanged()` for us
+ end;
end;
- end;
+ {$ENDIF}
// move and push corpses
for f := 0 to High(gCorpses) do
LastAnimLoop := AnimLoop;
end;
-function TPanel.GetTextureID(): DWORD;
-begin
- Result := LongWord(TEXTURE_NONE);
-
- if (FCurTexture >= 0) then
+ function TPanel.GetTextureID(): DWORD;
+ var Texture: Integer;
begin
- if FTextureIDs[FCurTexture].Anim then
- Result := FTextureIDs[FCurTexture].AnTex.FramesID
- else
- Result := FTextureIDs[FCurTexture].Tex;
+ Result := LongWord(TEXTURE_NONE);
+ if (FCurTexture >= 0) then
+ begin
+ Texture := FTextureIDs[FCurTexture].Texture;
+ case Textures[Texture].TextureName of
+ TEXTURE_NAME_WATER: Result := DWORD(TEXTURE_SPECIAL_WATER);
+ TEXTURE_NAME_ACID1: Result := DWORD(TEXTURE_SPECIAL_ACID1);
+ TEXTURE_NAME_ACID2: Result := DWORD(TEXTURE_SPECIAL_ACID2);
+ end
+ end
end;
-end;
function TPanel.GetTextureCount(): Integer;
begin
end;
utils.writeBool(st, anim);
// Åñëè äà - ñîõðàíÿåì àíèìàöèþ
- if anim then FTextureIDs[FCurTexture].AnTex.SaveState(st);
+ if anim then FTextureIDs[FCurTexture].AnTex.SaveState(st, FAlpha, FBlending);
// moving platform state
utils.writeInt(st, Integer(mMovingSpeed.X));
(FTextureIDs[FCurTexture].Anim) and
(FTextureIDs[FCurTexture].AnTex <> nil),
'TPanel.LoadState: No animation object');
- FTextureIDs[FCurTexture].AnTex.LoadState(st);
+ FTextureIDs[FCurTexture].AnTex.LoadState(st, FAlpha, FBlending);
end;
// moving platform state