diff options
author | withmorten <morten.with@gmail.com> | 2021-06-28 13:31:35 +0200 |
---|---|---|
committer | withmorten <morten.with@gmail.com> | 2021-06-28 13:31:35 +0200 |
commit | cb3b3855b844c14c0e943c1a7614fc29820cf666 (patch) | |
tree | 8e9a6ae74e9c98515b813f412476058274d3fde4 /src/vehicles/Door.cpp | |
parent | cc235be3aa1ad97ac7067af0d619ee714d9d05eb (diff) |
rename clamp macro to Clamp to fix compilation with g++11
Diffstat (limited to 'src/vehicles/Door.cpp')
-rw-r--r-- | src/vehicles/Door.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicles/Door.cpp b/src/vehicles/Door.cpp index c80965aa..1b3f9e8f 100644 --- a/src/vehicles/Door.cpp +++ b/src/vehicles/Door.cpp @@ -52,11 +52,11 @@ CDoor::Process(CVehicle *vehicle) fSpeedDiff = vecSpeedDiff.y - vecSpeedDiff.x; break; } - fSpeedDiff = clamp(fSpeedDiff, -0.2f, 0.2f); + fSpeedDiff = Clamp(fSpeedDiff, -0.2f, 0.2f); if(Abs(fSpeedDiff) > 0.002f) m_fAngVel += fSpeedDiff; m_fAngVel *= 0.945f; - m_fAngVel = clamp(m_fAngVel, -0.3f, 0.3f); + m_fAngVel = Clamp(m_fAngVel, -0.3f, 0.3f); m_fAngle += m_fAngVel; m_nDoorState = DOORST_SWINGING; |