Merge branch 'miami' into miami

2020-06-16 23:02:21 +03:00
parent 812b26b668 a822692c26
commit d322a8033e
33 changed files with 2738 additions and 1531 deletions
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -957,8 +957,8 @@ CBoat::AddWakePoint(CVector point)
 			}
 			m_avec2dWakePoints[0] = point;
 			m_afWakePointLifeTime[0] = 150.0f;
-			if (m_nNumWakePoints < 32)
-				++m_nNumWakePoints;
+			if (m_nNumWakePoints < ARRAY_SIZE(m_afWakePointLifeTime))
+				m_nNumWakePoints++;
 		}
 	}
 	else {