Move cmath out of common.h

src/openrct2-ui/input/MouseInput.cpp

@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cmath>
+
 #include <openrct2-ui/interface/Dropdown.h>
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/Context.h>
@@ -242,8 +244,8 @@ static void input_scroll_drag_continue(sint32 x, sint32 y, rct_window * w)
     widget_scroll_update_thumbs(w, widgetIndex);
     window_invalidate_by_number(w->classification, w->number);
 
-    sint32 fixedCursorPositionX = (sint32)ceilf(gInputDragLastX * gConfigGeneral.window_scale);
-    sint32 fixedCursorPositionY = (sint32)ceilf(gInputDragLastY * gConfigGeneral.window_scale);
+    sint32 fixedCursorPositionX = (sint32)std::ceil(gInputDragLastX * gConfigGeneral.window_scale);
+    sint32 fixedCursorPositionY = (sint32)std::ceil(gInputDragLastY * gConfigGeneral.window_scale);
 
     context_set_cursor_position(fixedCursorPositionX, fixedCursorPositionY);
 }

src/openrct2-ui/windows/GuestList.cpp

@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cmath>
+
 #include <openrct2/config/Config.h>
 #include <openrct2-ui/windows/Window.h>
 
@@ -508,7 +510,7 @@ static void window_guest_list_scrollgetsize(rct_window *w, sint32 scrollIndex, s
         }
         w->var_492 = numGuests;
         y = numGuests * SCROLLABLE_ROW_HEIGHT;
-        _window_guest_list_num_pages = (sint32) ceilf((float)numGuests / 3173);
+        _window_guest_list_num_pages = (sint32) std::ceil((float)numGuests / 3173);
         if (_window_guest_list_num_pages == 0)
             _window_guest_list_selected_page = 0;
         else if (_window_guest_list_selected_page >= _window_guest_list_num_pages)

src/openrct2-ui/windows/Ride.cpp

@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cmath>
 #include <limits>
 
 #include <openrct2-ui/windows/Window.h>
@@ -1483,13 +1484,13 @@ static void window_ride_update_overall_view(uint8 ride_index) {
     sint32 dy = maxy - miny;
     sint32 dz = maxz - minz;
 
-    sint32 size = (sint32) sqrt(dx*dx + dy*dy + dz*dz);
+    sint32 size = (sint32) std::sqrt(dx*dx + dy*dy + dz*dz);
 
     if (size >= 80)
     {
         // Each farther zoom level shows twice as many tiles (log)
         // Appropriate zoom is lowered by one to fill the entire view with the ride
-        view->zoom = Math::Clamp(0, (sint32) ceil(log(size / 80)) - 1, 3);
+        view->zoom = Math::Clamp(0, (sint32) std::ceil(std::log(size / 80)) - 1, 3);
     }
     else
     {

src/openrct2-ui/windows/ViewClipping.cpp

@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cmath>
+
 #include <openrct2/config/Config.h>
 #include <openrct2-ui/windows/Window.h>
 
@@ -106,7 +108,7 @@ static void window_view_clipping_set_clipheight(rct_window *w, const uint8 cliph
     gClipHeight = clipheight;
     rct_widget* widget = &window_view_clipping_widgets[WIDX_CLIP_HEIGHT_SLIDER];
     const float clip_height_ratio = (float)gClipHeight / 255;
-    w->scrolls[0].h_left = (sint16)ceil(clip_height_ratio * (w->scrolls[0].h_right - ((widget->right - widget->left) - 1)));
+    w->scrolls[0].h_left = (sint16)std::ceil(clip_height_ratio * (w->scrolls[0].h_right - ((widget->right - widget->left) - 1)));
 }
 
 rct_window * window_view_clipping_open()

src/openrct2/CmdlineSprite.cpp

@@ -16,6 +16,7 @@
 
 #pragma warning(disable : 4706) // assignment within conditional expression
 
+#include <cmath>
 #include <cstring>
 #include <jansson.h>
 #include "CmdlineSprite.h"
@@ -614,7 +615,7 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc)
         }
 
         sint32 maxIndex = (sint32)spriteFileHeader.num_entries;
-        sint32 numbers = (sint32)floor(log(maxIndex));
+        sint32 numbers = (sint32)floor(std::log(maxIndex));
         size_t pathLen = strlen(outputPath);
 
         if (pathLen >= (size_t)(MAX_PATH - numbers - 5)) {

src/openrct2/Context.cpp

@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include <algorithm>
+#include <cmath>
 #include <exception>
 #include <memory>
 #include <string>
@@ -915,7 +916,7 @@ void context_setcurrentcursor(sint32 cursor)
 
 void context_update_cursor_scale()
 {
-    GetContext()->GetUiContext()->SetCursorScale(static_cast<uint8>(round(gConfigGeneral.window_scale)));
+    GetContext()->GetUiContext()->SetCursorScale(static_cast<uint8>(std::round(gConfigGeneral.window_scale)));
 }
 
 void context_hide_cursor()
@@ -938,8 +939,8 @@ void context_get_cursor_position_scaled(sint32 * x, sint32 * y)
     context_get_cursor_position(x, y);
 
     // Compensate for window scaling.
-    *x = (sint32)ceilf(*x / gConfigGeneral.window_scale);
-    *y = (sint32)ceilf(*y / gConfigGeneral.window_scale);
+    *x = (sint32)std::ceil(*x / gConfigGeneral.window_scale);
+    *y = (sint32)std::ceil(*y / gConfigGeneral.window_scale);
 }
 
 void context_set_cursor_position(sint32 x, sint32 y)

src/openrct2/common.h

@@ -27,7 +27,6 @@
 #endif
 
 #include <cassert>
-#include <cmath>
 #include <cstdint>
 
 using sint8 = int8_t;

src/openrct2/interface/Colour.cpp

@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include <algorithm>
+#include <cmath>
 #include "../drawing/Drawing.h"
 #include "../sprites.h"
 #include "Colour.h"
@@ -72,7 +73,7 @@ static uint8 findClosestPaletteIndex(uint8 red, uint8 green, uint8 blue)
     for (int i = PALETTE_INDEX_0; i < PALETTE_INDEX_230; i++)
     {
         const sint32 distance =
-            pow(gPalette[i].red - red, 2) + pow(gPalette[i].green - green, 2) + pow(gPalette[i].blue - blue, 2);
+            std::pow(gPalette[i].red - red, 2) + std::pow(gPalette[i].green - green, 2) + std::pow(gPalette[i].blue - blue, 2);
 
         if (distance < closestDistance)
         {

src/openrct2/interface/Console.cpp

@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include <algorithm>
+#include <cmath>
 #include <cstdarg>
 #include <deque>
 #include <string>
@@ -1031,7 +1032,7 @@ static sint32 cc_set(const utf8 **argv, sint32 argc)
             }
         }
         else if (strcmp(argv[0], "window_scale") == 0 && invalidArguments(&invalidArgs, double_valid[0])) {
-            float newScale = (float)(0.001*trunc(1000*double_val[0]));
+            float newScale = (float)(0.001*std::trunc(1000*double_val[0]));
             gConfigGeneral.window_scale = Math::Clamp(0.5f, newScale, 5.0f);
             config_save_default();
             gfx_invalidate_screen();

src/openrct2/util/Util.cpp

@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include <cctype>
+#include <cmath>
 #include <ctime>
 #include "../common.h"
 #include "../core/Guard.hpp"
@@ -655,7 +656,7 @@ uint8 soft_light(uint8 a, uint8 b)
     }
     else
     {
-        fr = (2 * fa * (1 - fb)) + (sqrtf(fa) * ((2 * fb) - 1));
+        fr = (2 * fa * (1 - fb)) + (std::sqrt(fa) * ((2 * fb) - 1));
     }
     return (uint8)(Math::Clamp(0.0f, fr, 1.0f) * 255.0f);
 }