mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Convert remaining C-style casts to C++-style ones

Browse Source
This commit is contained in:
Gymnasiast
2020-04-30 15:51:50 +02:00
parent d8ffec0ed7
commit c83ddefe47
8 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/TileInspector.cpp
View File

@@ -1754,8 +1754,8 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
ScreenCoordsXY screenCoords(w->windowPos.x, w->windowPos.y);
// Draw coordinates
gfx_draw_string(dpi, (char*)"X:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(5, 24));
gfx_draw_string(dpi, (char*)"Y:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(74, 24));
gfx_draw_string(dpi, "X:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(5, 24));
gfx_draw_string(dpi, "Y:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(74, 24));
if (windowTileInspectorTileSelected)
{
auto tileCoords = TileCoordsXY{ windowTileInspectorToolMap };
@@ -1764,8 +1764,8 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
else
{
gfx_draw_string(dpi, (char*)"-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(43 - 7, 24));
gfx_draw_string(dpi, (char*)"-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(113, 24));
gfx_draw_string(dpi, "-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(43 - 7, 24));
gfx_draw_string(dpi, "-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(113, 24));
}
if (windowTileInspectorSelectedIndex != -1)

2
src/openrct2/core/Memory.hpp
View File

@@ -75,7 +75,7 @@ namespace Memory
template<typename T> static void Free(T* ptr)
{
free((void*)ptr);
free(const_cast<void*>(reinterpret_cast<const void*>(ptr)));
}
template<typename T> static void FreeArray(T* ptr, size_t count)

4
src/openrct2/drawing/TTFSDLPort.cpp
View File

@@ -1,6 +1,10 @@
// Adapted from freetype.h in order to avoid C-style casts.
#define FT_LOAD_TARGET_ALT(x) (static_cast<FT_Int32>((x)&15) << 16)
#define FT_IMAGE_TAG(value, _x1, _x2, _x3, _x4) \
value \
= ((static_cast<unsigned long>(_x1) << 24) | (static_cast<unsigned long>(_x2) << 16) \
| (static_cast<unsigned long>(_x3) << 8) | static_cast<unsigned long>(_x4))
/**
* The following code is from SDL2_ttf (2 Jan 2017).

2
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -369,7 +369,7 @@ ScriptEngine::ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& en
void ScriptEngine::Initialise()
{
auto ctx = (duk_context*)_context;
auto ctx = static_cast<duk_context*>(_context);
ScCheats::Register(ctx);
ScConfiguration::Register(ctx);
ScConsole::Register(ctx);