diff options
| author | withmorten <morten.with@gmail.com> | 2021-06-28 13:57:05 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-06-28 13:57:05 +0200 |
| commit | d17d437de319ca4c388dc724cffea91702d3a699 (patch) | |
| tree | 806104fa5fe0e994cd7f55f1b7b48dc64a998c44 /src/core/World.cpp | |
| parent | f8297df9c5a7d65d5658d1a8d85d391fbb15b95a (diff) | |
rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)
Diffstat (limited to 'src/core/World.cpp')
| -rw-r--r-- | src/core/World.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 82f03541..841aab40 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -399,8 +399,8 @@ CWorld::ProcessVerticalLine(const CVector &point1, float z2, CColPoint &point, C CVector point2(point1.x, point1.y, z2); int secX = GetSectorIndexX(point1.x); int secY = GetSectorIndexY(point1.y); - secX = clamp(secX, 0, NUMSECTORS_X-1); - secY = clamp(secY, 0, NUMSECTORS_Y-1); + secX = Clamp(secX, 0, NUMSECTORS_X-1); + secY = Clamp(secY, 0, NUMSECTORS_Y-1); return ProcessVerticalLineSector(*GetSector(secX, secY), CColLine(point1, point2), point, entity, checkBuildings, checkVehicles, checkPeds, checkObjects, checkDummies, ignoreSeeThrough, poly); |