Merge pull request #453 from ASleepyCat/laser-fix

Fix a case where auto laser time wouldn't be decremented
Drewol · Apr 13, 2021 · afd52a9 · afd52a9
2 parents 5284dcc + 9bccd23
commit afd52a9
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/Main/src/Scoring.cpp b/Main/src/Scoring.cpp
@@ -921,7 +921,6 @@ void Scoring::m_UpdateGauges(ScoreHitRating rating, TickFlags flags)
 		return;
 	}
 
-
 	bool isLong = (flags & TickFlags::Hold) != TickFlags::None
 	|| ((flags & TickFlags::Laser) != TickFlags::None
 	&& (flags & TickFlags::Slam) == TickFlags::None);
@@ -1208,11 +1207,8 @@ void Scoring::m_UpdateLasers(float deltaTime)
 				}
 
 				positionDelta = laserTargetPositions[i] - laserPositions[i];
-				if (inputDir == laserDir || laserDir == 0)
-				{
-					if (fabsf(positionDelta) <= m_laserDistanceLeniency)
-						m_autoLaserTime[i] = m_autoLaserDuration;
-				}
+				if ((inputDir == laserDir || laserDir == 0) && fabsf(positionDelta) <= m_laserDistanceLeniency)
+                    m_autoLaserTime[i] = m_autoLaserDuration;
 				else
 					m_autoLaserTime[i] -= deltaTime;
 			}