From be0aeefaa4ac6ce2ea8619cd6211c9f2932c2606 Mon Sep 17 00:00:00 2001
From: TrainWrack <120750885+TrainWrack@users.noreply.github.com>
Date: Thu, 6 Mar 2025 19:42:01 -0500
Subject: [PATCH] SimplifyLogic

---
 TombEngine/Objects/TR5/Trap/tr5_movinglaser.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/TombEngine/Objects/TR5/Trap/tr5_movinglaser.cpp b/TombEngine/Objects/TR5/Trap/tr5_movinglaser.cpp
index ff432ec26..bc283ca54 100644
--- a/TombEngine/Objects/TR5/Trap/tr5_movinglaser.cpp
+++ b/TombEngine/Objects/TR5/Trap/tr5_movinglaser.cpp
@@ -23,8 +23,7 @@ namespace TEN::Entities::Traps
     Speed,
     PauseCounter,
     Direction,
-    DistanceTravelled,
-    SpeedCalc
+    DistanceTravelled
     };
 
 	constexpr auto MOVING_LASER_DAMAGE = 100;
@@ -38,7 +37,6 @@ namespace TEN::Entities::Traps
 		auto& item = g_Level.Items[itemNumber];
         item.ItemFlags[Direction] = 1;
         item.ItemFlags[Speed] = 10;
-        item.ItemFlags[SpeedCalc] = MIN_SPEED;
         item.Pose.Translate(item.Pose.Orientation, -CLICK(1)); //Offset by one click to make it dangerous at the edges of the block.
 	}
 
@@ -71,23 +69,16 @@ namespace TEN::Entities::Traps
             {
                 item.ItemFlags[Direction] *= -1;
                 item.ItemFlags[DistanceTravelled] = 0;
-                item.ItemFlags[SpeedCalc] = MIN_SPEED;
             }
 
             AnimateItem(&item);
             return;
         }
 
-        item.Pose.Translate(item.Pose.Orientation, (item.ItemFlags[Direction] * item.ItemFlags[SpeedCalc]));
+        item.Pose.Translate(item.Pose.Orientation, (item.ItemFlags[Direction] * distancePerFrame));
         
         item.ItemFlags[DistanceTravelled] += distancePerFrame;
 
-        if (item.ItemFlags[DistanceTravelled] < (moveDistance * MAX_SPEED_THRESHOLD))
-            item.ItemFlags[SpeedCalc] = std::min(distancePerFrame, item.ItemFlags[SpeedCalc] + ACCELERATION);
-        else
-            item.ItemFlags[SpeedCalc] = std::max(MIN_SPEED, item.ItemFlags[SpeedCalc] - ACCELERATION);
-
-
         if (item.ItemFlags[DistanceTravelled] >= moveDistance)
         {
             item.ItemFlags[PauseCounter] = PAUSE_FRAMES;