X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_panel.pas;h=bcf0883385f89309450a420e89616af331eadbc7;hb=ba69b47c522858ed70d450d1fec26933472c080b;hp=abd27c93f72b23dbaad383e7f0b8b3dbde0aa44c;hpb=c1a1cdafd1d0e3f877a20994b57fdb389373d1d4;p=d2df-sdl.git

diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index abd27c9..bcf0883 100644
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
@@ -110,6 +110,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;
@@ -125,6 +126,7 @@ type
     procedure   SetTexture(ID: Integer; AnimLoop: Byte = 0);
     function    GetTextureID(): Cardinal;
     function    GetTextureCount(): Integer;
+    function    CanChangeTexture(): Boolean;
 
     procedure   SaveState (st: TStream);
     procedure   LoadState (st: TStream);
@@ -202,6 +204,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
@@ -210,8 +218,9 @@ var
 implementation
 
 uses
+  {$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, GL, geom, utils, xstreams;
+  g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams;
 
 const
   PANEL_SIGNATURE = $4C4E4150; // 'PANL'
@@ -258,15 +267,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;
 
 // Íåâèäèìàÿ:
@@ -586,7 +596,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
@@ -614,7 +624,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;
@@ -633,7 +643,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;
@@ -898,7 +908,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;
@@ -954,22 +964,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
@@ -1015,6 +1011,10 @@ begin
        Result := Result + 100;
 end;
 
+function TPanel.CanChangeTexture(): Boolean;
+begin
+  Result := (GetTextureCount() > 1) or hasTexTrigger;
+end;
 
 const
   PAN_SAVE_VERSION = 1;