Revert "Merge pull request #454 from ASleepyCat/laser-fix-2"

This reverts commit cd86945, reversing
changes made to afd52a9.

Main/src/Scoring.cpp

@@ -1496,7 +1496,6 @@ void Scoring::m_UpdateLasers(float deltaTime)
 {
 	MapTime mapTime = m_playback->GetLastTime() + m_laserOffset;
 	bool currentlySlamNextSegmentStraight[2] = { false };
-
 	// Check for new laser segments in laser queue
 	for (auto it = m_laserSegmentQueue.begin(); it != m_laserSegmentQueue.end();)
 	{
@@ -1570,6 +1569,7 @@ void Scoring::m_UpdateLasers(float deltaTime)
 			float positionDelta = laserTargetPositions[i] - laserPositions[i];
 			float laserDir = currentSegment->GetDirection();
 			float input = m_laserInput[i];
+			float inputDir = Math::Sign(input);
 
 			if (inputDir != 0)
 			{
@@ -1605,14 +1605,8 @@ void Scoring::m_UpdateLasers(float deltaTime)
 			timeSinceLaserUsed[i] += deltaTime;
 
 			// Always snap laser to start sections
-			auto incomingLaser = m_GetLaserObjectWithinTwoBeats(i);
-			if (incomingLaser)
-			{
-				laserPositions[i] = incomingLaser->points[0];
-				m_autoLaserTime[i] = inputDir == incomingLaser->GetDirection() || inputDir == 0
-									 ? m_autoLaserDuration
-									 : 0;
-			}
+			if (m_GetLaserObjectWithinTwoBeats(i))
+				m_autoLaserTime[i] = m_autoLaserDuration;
 		}
 
 		if (currentlySlamNextSegmentStraight[i])