trigger data now cached on map loading (so it should be as fast as the previous trigg...

[d2df-sdl.git] / src / game / g_panel.pas

diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index 6f45fc2cf45a9cd567b86c4c734cfdfe043faf9e..5e2988572ad5e129746b5caf8b546a9bb36e4e99 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
@@ -239,7 +239,7 @@ begin
   mMovingSpeed := PanelRec.moveSpeed;
   mMovingStart := PanelRec.moveStart;
   mMovingEnd := PanelRec.moveEnd;
-  mMovingActive := PanelRec['move_active'].varvalue;
+  mMovingActive := PanelRec['move_active'].value;
   mOldMovingActive := mMovingActive;
   mMoveOnce := PanelRec.moveOnce;
 
@@ -416,8 +416,8 @@ var
   NW, NH: Word;
 begin
   if {Enabled and} (FCurTexture >= 0) and
-     (Width > 0) and (Height > 0) and (FAlpha < 255) and
-     ((g_dbg_scale <> 1.0) or g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)) then
+     (Width > 0) and (Height > 0) and (FAlpha < 255) {and
+     g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)} then
   begin
     if FTextureIDs[FCurTexture].Anim then
       begin // Àíèìèðîâàííàÿ òåêñòóðà
@@ -493,8 +493,8 @@ procedure TPanel.DrawShadowVolume(lightX: Integer; lightY: Integer; radius: Inte
 
 begin
   if radius < 4 then exit;
-  if Enabled and (FCurTexture >= 0) and (Width > 0) and (Height > 0) and (FAlpha < 255) and
-     ((g_dbg_scale <> 1.0) or g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)) then
+  if Enabled and (FCurTexture >= 0) and (Width > 0) and (Height > 0) and (FAlpha < 255) {and
+     g_Collide(X, Y, Width, Height, sX, sY, sWidth, sHeight)} then
   begin
     if not FTextureIDs[FCurTexture].Anim then
     begin
@@ -872,7 +872,7 @@ begin
     if (mOldMovingActive <> mMovingActive) then mNeedSend := true;
     mOldMovingActive := mMovingActive;
 
-    if g_Game_IsServer and g_Game_IsNet then
+    if not g_Game_IsClient then
     begin
       if actMoveTrig then g_Triggers_Press(mEndPosTrig, ACTIVATE_CUSTOM);
       if actSizeTrig then g_Triggers_Press(mEndSizeTrig, ACTIVATE_CUSTOM);