X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_panel.pas;h=226515a5dc6a6381ba1d080f0e1f3bf3ac58e775;hb=4d5a94c228a43cdd0333979f3aa218c56c248188;hp=f5a6bddcc70c0b38640f1e1153679eb815ca3519;hpb=2d5c517f0d38a9f31e8e780416269ea787852930;p=d2df-sdl.git diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas index f5a6bdd..226515a 100644 --- a/src/game/g_panel.pas +++ b/src/game/g_panel.pas @@ -223,6 +223,7 @@ constructor TPanel.Create(PanelRec: TDynRecord; var Textures: TLevelTextureArray; aguid: Integer); var i: Integer; + tnum: Integer; begin X := PanelRec.X; Y := PanelRec.Y; @@ -337,19 +338,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)]), TMsgType.Fatal); + 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;