summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-07-22 23:31:06 +0200
committereray orçunus <erayorcunus@gmail.com>2020-07-22 23:31:06 +0200
commit7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf (patch)
tree9126974a1c8bfa8ac8f9f3879fb63edfe7320238 /src/core
parentMerge pull request #659 from erorcun/master (diff)
downloadre3-7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf.tar
re3-7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf.tar.gz
re3-7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf.tar.bz2
re3-7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf.tar.lz
re3-7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf.tar.xz
re3-7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf.tar.zst
re3-7e32c603fc0f9a7ec0f3fc1ab224b3b20c769eaf.zip
Diffstat (limited to '')
-rw-r--r--src/core/General.h2
-rw-r--r--src/core/Radar.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/General.h b/src/core/General.h
index 7ffa99de..dde43c0f 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -108,7 +108,7 @@ public:
if (angle >= TWOPI)
angle -= TWOPI;
- return (int)floorf(angle / DEGTORAD(45.0f));
+ return (int)Floor(angle / DEGTORAD(45.0f));
}
// Unlike usual string comparison functions, these don't care about greater or lesser
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 9406f1bd..05002a3f 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -746,8 +746,8 @@ void CRadar::DrawRadarMap()
DrawRadarMask();
// top left ist (0, 0)
- int x = floorf((vec2DRadarOrigin.x - RADAR_MIN_X) / RADAR_TILE_SIZE);
- int y = ceilf((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - RADAR_MIN_Y) / RADAR_TILE_SIZE);
+ int x = Floor((vec2DRadarOrigin.x - RADAR_MIN_X) / RADAR_TILE_SIZE);
+ int y = Ceil((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - RADAR_MIN_Y) / RADAR_TILE_SIZE);
StreamRadarSections(x, y);
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
@@ -1251,7 +1251,7 @@ void CRadar::Shutdown()
void CRadar::StreamRadarSections(const CVector &posn)
{
- StreamRadarSections(floorf((2000.0f + posn.x) / 500.0f), ceilf(7.0f - (2000.0f + posn.y) / 500.0f));
+ StreamRadarSections(Floor((2000.0f + posn.x) / 500.0f), Ceil(7.0f - (2000.0f + posn.y) / 500.0f));
}
void CRadar::StreamRadarSections(int32 x, int32 y)