diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index 5e9edcba79..5894ccb1fc 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index a4c145277a..69450e28ef 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 3919e5e062..dfb06b3d88 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorMain.cpp b/src/openrct2-ui/windows/EditorMain.cpp index 9dd35a94dd..f7fb8a5ea6 100644 --- a/src/openrct2-ui/windows/EditorMain.cpp +++ b/src/openrct2-ui/windows/EditorMain.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index a664bbb7ca..1cb682dce0 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 01c160ca67..dbd6efe771 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index e6eb115851..d649614ccd 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index 4e78708387..f94fccfbd0 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 724ddbe9bd..126ec7044d 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 411ba0f607..2d5d53f609 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 6157af8cf8..e11ba79e4d 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index c15debcf08..7fa66db0d6 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 660bd062e2..d37e442527 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 9d9e85d20b..2cdd43986e 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 4757df41e3..511bd743d0 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 53c806a371..b1131f731c 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 1e1174d5c2..826d41bf17 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 80101eea4d..4a5a4d2224 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index f18b24c664..ee968a0ce5 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 9f855f47e0..26e637b70f 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index e1c42769de..d333f170bf 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index d1f1b53d16..8ed79a9e71 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index d2828270e6..4ee6d16749 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include enum WINDOW_VIEW_CLIPPING_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 0b5506e49c..af9bd062b9 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #define INITIAL_WIDTH 500 diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index de9c585fce..65b3f90a97 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -23,7 +23,7 @@ #include "ParkImporter.h" #include "audio/audio.h" #include "core/Math.hpp" -#include "interface/viewport.h" +#include "interface/Viewport.h" #include "localisation/Localisation.h" #include "management/NewsItem.h" #include "object/ObjectManager.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 3d0c35a594..8b46e5a0c5 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -25,7 +25,7 @@ #include "Game.h" #include "Input.h" #include "interface/Screenshot.h" -#include "interface/viewport.h" +#include "interface/Viewport.h" #include "interface/widget.h" #include "interface/window.h" #include "localisation/Localisation.h" diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index ba979854d2..760e1bac03 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -28,7 +28,7 @@ #include "AudioContext.h" #include "AudioMixer.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../Intro.h" #include "../localisation/Language.h" #include "../ride/Ride.h" diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 408fbde78e..985ad8956b 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -21,7 +21,7 @@ #include "../common.h" #include "../config/Config.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../interface/window.h" #include "../paint/tile_element/TileElement.h" #include "../util/Util.h" diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/String.cpp index 9e80f2de0d..09174d9634 100644 --- a/src/openrct2/drawing/String.cpp +++ b/src/openrct2/drawing/String.cpp @@ -17,7 +17,7 @@ #include #include "../config/Config.h" #include "../interface/Colour.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../platform/platform.h" #include "../sprites.h" diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index 6aad5dc2c2..e9b9b281e2 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -27,7 +27,7 @@ #include "X8DrawingEngine.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../interface/window.h" #include "../Intro.h" #include "Drawing.h" diff --git a/src/openrct2/interface/Console.cpp b/src/openrct2/interface/Console.cpp index 3288acdc67..53cef6e215 100644 --- a/src/openrct2/interface/Console.cpp +++ b/src/openrct2/interface/Console.cpp @@ -50,7 +50,7 @@ #include "../world/Park.h" #include "../world/scenery.h" #include "Console.h" -#include "viewport.h" +#include "Viewport.h" #ifndef NO_TTF #include "../drawing/TTF.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index c569c0a20a..fa41f79a1a 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -30,7 +30,7 @@ #include "../platform/platform.h" #include "../util/Util.h" #include "../world/Climate.h" -#include "viewport.h" +#include "Viewport.h" using namespace OpenRCT2; diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/Viewport.cpp similarity index 97% rename from src/openrct2/interface/viewport.c rename to src/openrct2/interface/Viewport.cpp index 949bc79215..0f54ab81dc 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/Viewport.cpp @@ -14,8 +14,10 @@ *****************************************************************************/ #pragma endregion +#include #include "../config/Config.h" #include "../Context.h" +#include "../core/Math.hpp" #include "../drawing/Drawing.h" #include "../Game.h" #include "../Input.h" @@ -34,9 +36,12 @@ #include "../world/scenery.h" #include "../world/sprite.h" #include "Colour.h" -#include "viewport.h" +#include "Viewport.h" #include "window.h" +extern "C" +{ + //#define DEBUG_SHOW_DIRTY_BOX uint8 gShowGridLinesRefCount; uint8 gShowLandRightsRefCount; @@ -112,9 +117,9 @@ void centre_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32 * out_x, sint32 sint32 start_x = x; LocationXYZ16 coord_3d = { - .x = x, - .y = y, - .z = z + /* .x = */ (sint16)x, + /* .y = */ (sint16)y, + /* .z = */ (sint16)z }; LocationXY16 coord_2d = coordinate_3d_to_2d(&coord_3d, get_current_rotation()); @@ -423,10 +428,10 @@ static void viewport_move(sint16 x, sint16 y, rct_window* w, rct_viewport* viewp if ((!x_diff) && (!y_diff))return; if (w->flags & WF_7){ - sint32 left = max(viewport->x, 0); - sint32 top = max(viewport->y, 0); - sint32 right = min(viewport->x + viewport->width, context_get_width()); - sint32 bottom = min(viewport->y + viewport->height, context_get_height()); + sint32 left = std::max(viewport->x, 0); + sint32 top = std::max(viewport->y, 0); + sint32 right = std::min(viewport->x + viewport->width, context_get_width()); + sint32 bottom = std::min(viewport->y + viewport->height, context_get_height()); if (left >= right) return; if (top >= bottom) return; @@ -784,10 +789,10 @@ void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, sint32 left sint32 l = left, t = top, r = right, b = bottom; #endif - left = max(left - viewport->x, 0); - right = min(right - viewport->x, viewport->width); - top = max(top - viewport->y, 0); - bottom = min(bottom - viewport->y, viewport->height); + left = std::max(left - viewport->x, 0); + right = std::min(right - viewport->x, viewport->width); + top = std::max(top - viewport->y, 0); + bottom = std::min(bottom - viewport->y, viewport->height); left <<= viewport->zoom; right <<= viewport->zoom; @@ -1289,13 +1294,13 @@ static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16 if (g1->flags & G1_FLAG_HAS_ZOOM_SPRITE) { // TODO: SAR in dpi done with `>> 1`, in coordinates with `/ 2` rct_drawpixelinfo zoomed_dpi = { - .bits = dpi->bits, - .x = dpi->x >> 1, - .y = dpi->y >> 1, - .height = dpi->height, - .width = dpi->width, - .pitch = dpi->pitch, - .zoom_level = dpi->zoom_level - 1 + /* .bits = */ dpi->bits, + /* .x = */ (sint16)(dpi->x >> 1), + /* .y = */ (sint16)(dpi->y >> 1), + /* .height = */ dpi->height, + /* .width = */ dpi->width, + /* .pitch = */ dpi->pitch, + /* .zoom_level = */ (uint16)(dpi->zoom_level - 1) }; return sub_679074(&zoomed_dpi, imageId - g1->zoomed_offset, x / 2, y / 2, palette); @@ -1393,7 +1398,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16 // The code below is untested. sint32 total_no_pixels = g1->width * g1->height; uint8 *source_pointer = g1->offset; - uint8 *new_source_pointer_start = malloc(total_no_pixels); + uint8 *new_source_pointer_start = (uint8 *)malloc(total_no_pixels); uint8 *new_source_pointer = (*&new_source_pointer_start);// 0x9E3D28; intptr_t ebx1; sint32 ecx; @@ -1576,10 +1581,10 @@ void viewport_invalidate(rct_viewport *viewport, sint32 left, sint32 top, sint32 sint32 viewportRight = viewport->view_x + viewport->view_width; sint32 viewportBottom = viewport->view_y + viewport->view_height; if (right > viewportLeft && bottom > viewportTop) { - left = max(left, viewportLeft); - top = max(top, viewportTop); - right = min(right, viewportRight); - bottom = min(bottom, viewportBottom); + left = std::max(left, viewportLeft); + top = std::max(top, viewportTop); + right = std::min(right, viewportRight); + bottom = std::min(bottom, viewportBottom); uint8 zoom = 1 << viewport->zoom; left -= viewportLeft; @@ -1639,13 +1644,13 @@ void screen_get_map_xy(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, rct } LocationXY16 start_vp_pos = screen_coord_to_viewport_coord(myViewport, screenX, screenY); - LocationXY16 map_pos = { my_x + 16, my_y + 16 }; + LocationXY16 map_pos = { (sint16)(my_x + 16), (sint16)(my_y + 16) }; for (sint32 i = 0; i < 5; i++) { sint32 z = tile_element_height(map_pos.x, map_pos.y); map_pos = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z); - map_pos.x = clamp(my_x, map_pos.x, my_x + 31); - map_pos.y = clamp(my_y, map_pos.y, my_y + 31); + map_pos.x = Math::Clamp(map_pos.x, my_x, my_x + 31); + map_pos.y = Math::Clamp(map_pos.y, my_y, my_y + 31); } *x = map_pos.x; @@ -1787,3 +1792,5 @@ void viewport_set_saved_view() gSavedViewRotation = get_current_rotation(); } } + +} diff --git a/src/openrct2/interface/viewport.h b/src/openrct2/interface/Viewport.h similarity index 100% rename from src/openrct2/interface/viewport.h rename to src/openrct2/interface/Viewport.h diff --git a/src/openrct2/interface/ViewportInteraction.cpp b/src/openrct2/interface/ViewportInteraction.cpp index e8a2019bea..8e0d7adbcb 100644 --- a/src/openrct2/interface/ViewportInteraction.cpp +++ b/src/openrct2/interface/ViewportInteraction.cpp @@ -32,7 +32,7 @@ #include "../world/scenery.h" #include "../world/LargeScenery.h" #include "../world/sprite.h" -#include "viewport.h" +#include "Viewport.h" #include "../Context.h" extern "C" diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index e2f6270fa6..8c024cbcc0 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -30,7 +30,7 @@ #include "../platform/platform.h" #include "../world/Map.h" #include "../world/sprite.h" -#include "viewport.h" +#include "Viewport.h" #include "widget.h" #include "window.h" diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 902f3dfc7a..e9af928f5f 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -18,7 +18,7 @@ #include "../config/Config.h" #include "../core/Math.hpp" #include "../drawing/Drawing.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "Paint.h" #include "sprite/Sprite.h" diff --git a/src/openrct2/paint/PaintHelpers.cpp b/src/openrct2/paint/PaintHelpers.cpp index 9496d4023a..bfd83132f0 100644 --- a/src/openrct2/paint/PaintHelpers.cpp +++ b/src/openrct2/paint/PaintHelpers.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../ride/track_paint.h" #include "Paint.h" diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp index 098b975d06..3249a50552 100644 --- a/src/openrct2/paint/Supports.cpp +++ b/src/openrct2/paint/Supports.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "Paint.h" #include "Supports.h" #include "tile_element/TileElement.h" diff --git a/src/openrct2/paint/sprite/Litter.cpp b/src/openrct2/paint/sprite/Litter.cpp index e94b743a0d..620b4aeac9 100644 --- a/src/openrct2/paint/sprite/Litter.cpp +++ b/src/openrct2/paint/sprite/Litter.cpp @@ -16,7 +16,7 @@ #include "Sprite.h" #include "../../world/sprite.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../Paint.h" enum { diff --git a/src/openrct2/paint/sprite/Misc.cpp b/src/openrct2/paint/sprite/Misc.cpp index 126e832d19..fc9180a303 100644 --- a/src/openrct2/paint/sprite/Misc.cpp +++ b/src/openrct2/paint/sprite/Misc.cpp @@ -16,7 +16,7 @@ #include "../../world/sprite.h" #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "Sprite.h" #include "../Paint.h" #include "../../localisation/StringIds.h" diff --git a/src/openrct2/paint/sprite/Peep.cpp b/src/openrct2/paint/sprite/Peep.cpp index 5736fea794..2ea5182b62 100644 --- a/src/openrct2/paint/sprite/Peep.cpp +++ b/src/openrct2/paint/sprite/Peep.cpp @@ -16,7 +16,7 @@ #include "../../config/Config.h" #include "../../drawing/LightFX.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "Sprite.h" #include "../../peep/Peep.h" #include "../../world/sprite.h" diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Sprite.cpp index 5806d53642..7a29b36362 100644 --- a/src/openrct2/paint/sprite/Sprite.cpp +++ b/src/openrct2/paint/sprite/Sprite.cpp @@ -19,7 +19,7 @@ #include "../../drawing/Drawing.h" #include "../../world/sprite.h" #include "../../ride/ride_data.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../ride/vehicle_paint.h" /** diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Banner.cpp index 6ebc1e9517..ea6eaf101b 100644 --- a/src/openrct2/paint/tile_element/Banner.cpp +++ b/src/openrct2/paint/tile_element/Banner.cpp @@ -17,7 +17,7 @@ #include "../Paint.h" #include "../../config/Config.h" #include "../../Game.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "TileElement.h" #include "../../world/Banner.h" diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Entrance.cpp index eb1238832e..ada162cccd 100644 --- a/src/openrct2/paint/tile_element/Entrance.cpp +++ b/src/openrct2/paint/tile_element/Entrance.cpp @@ -16,7 +16,7 @@ #include "../../config/Config.h" #include "../../Game.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../ride/ride_data.h" #include "../../world/Entrance.h" diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index c649aaa69b..ab9a1549f5 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -20,7 +20,7 @@ #include "../../Game.h" #include "../../localisation/Localisation.h" #include "../../interface/Colour.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../ride/Track.h" #include "../../world/Map.h" #include "../../world/scenery.h" diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/LargeScenery.cpp index 0a1523d1c8..b3b16e2b7d 100644 --- a/src/openrct2/paint/tile_element/LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/LargeScenery.cpp @@ -17,7 +17,7 @@ #include "../../config/Config.h" #include "../../core/Util.hpp" #include "../../Game.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../util/Util.h" #include "../../world/Map.h" diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Path.cpp index 8a43c6f008..f70a482124 100644 --- a/src/openrct2/paint/tile_element/Path.cpp +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -16,7 +16,7 @@ #include "../../config/Config.h" #include "../../Game.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../object/ObjectList.h" #include "../../peep/Staff.h" diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/SmallScenery.cpp index f7d6375dcb..8eca9f607a 100644 --- a/src/openrct2/paint/tile_element/SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/SmallScenery.cpp @@ -17,7 +17,7 @@ #include "TileElement.h" #include "../../config/Config.h" #include "../../Game.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../localisation/Date.h" #include "../Paint.h" #include "../Supports.h" diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp index 4c3aa2e523..a9fe3a66d6 100644 --- a/src/openrct2/paint/tile_element/Surface.cpp +++ b/src/openrct2/paint/tile_element/Surface.cpp @@ -19,7 +19,7 @@ #include "../../config/Config.h" #include "../../core/Math.hpp" #include "../../core/Util.hpp" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../peep/Staff.h" #include "../../sprites.h" #include "Surface.h" diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index b6a830faca..4799ddaa1c 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -18,7 +18,7 @@ #include "../../core/Math.hpp" #include "../../drawing/Drawing.h" #include "../../Game.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../ride/ride_data.h" #include "../../ride/TrackData.h" diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index fbe7692dac..c68027f453 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -20,7 +20,7 @@ #include "../config/Config.h" #include "../Game.h" #include "../Input.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 530fb10e42..802af001ba 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -28,7 +28,7 @@ #include "../config/Config.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../interface/window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 2eb87f5eca..136062d6fc 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -31,7 +31,7 @@ #include "../config/Config.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 6fee145fd9..9edc777f80 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -18,7 +18,7 @@ #include "../Cheats.h" #include "../config/Config.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../network/network.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index efebd04031..7377e06fbd 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -24,7 +24,7 @@ #include "../core/Memory.hpp" #include "../core/Util.hpp" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../management/NewsItem.h" #include "../platform/platform.h" diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index c1c5d66b71..cbde71c982 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index d4ee88daa1..3a7ef52222 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index b42e4e60af..1af4297f43 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index a17bd7fdc0..9d49638c16 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 84cb12cf49..fe57153992 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 486c95153e..6c12dd130d 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 39344d8eb0..3882e2ccc7 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 4bdc97a185..81a0b54df7 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 900a2178bd..5811f6eb5d 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 60ba71fab5..71c4b2dbe2 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 94b273dbcc..8efcbc453b 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 7c215b0396..e28d7cea50 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../core/Math.hpp" #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../interface/window.h" #include "../../localisation/Localisation.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index bbe3467c8e..3a5cce0977 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 52ce71e45e..ea779a9175 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index cbe44695a8..dbb60edc7a 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index a4e1fe20f0..d9617b4bc7 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 39f15d4380..a77e1909d8 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 50a84e4943..ed8f93e6a3 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index c5cf0e99ff..7c9f73ce3f 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 73e539b37c..44068245a9 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 1048833946..dd786f381b 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 8436b6af24..a6521dddc9 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 8954f52dd0..681b778afd 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index f6f8942ecd..73b28e64d3 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 3b8da1a4d9..10c8617fb8 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 371028fdc4..4acc807874 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index d6cd50c034..08f3c35a98 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 44eecbefda..106982415c 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -16,7 +16,7 @@ #include "../../common.h" #include "../../core/Util.hpp" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 32e3025c0d..e54b165845 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 141fc3b1f4..ea6620b50b 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index b2f9539b2d..c536cd7308 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index 9fc2e4380f..22410c1dce 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/CircusShow.cpp index 23d703b49f..1feacf4a18 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/CircusShow.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index 6c7b814c65..abfcc0fa55 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index 98ef651c34..d17a21262a 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index a9377767d5..878fc5b8d7 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp index 9288c7d91e..3a9eea224d 100644 --- a/src/openrct2/ride/gentle/FlyingSaucers.cpp +++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index fedf692451..2561ea7ee0 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 5b14b22c8b..a8fc64c048 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index b17d5bcdb6..169f33331e 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/Surface.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 2f180919df..f5cdb6fe5b 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 4d5d73e775..6954ca427f 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -16,7 +16,7 @@ #include "../../config/Config.h" #include "../../core/Util.hpp" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index d58baa4628..9634d8b5f2 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index d7e5c973e0..ce058ab5a2 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index f1c9e005dc..84b60d6bbd 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index 93134a9039..ece0c51345 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp index 726724c061..d61dd819b4 100644 --- a/src/openrct2/ride/gentle/SpiralSlide.cpp +++ b/src/openrct2/ride/gentle/SpiralSlide.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index fddffb8797..9edcbef048 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index 987ba58372..fd568ed63b 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 6ba1828bca..b57841fad8 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index a68796c9c1..ce33700144 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 7353e42212..62a2282e09 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 582c672d82..f5f9e2df8f 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -16,7 +16,7 @@ #include "../../common.h" #include "../../config/Config.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index 6f4e91fdd5..21cf1141bb 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index a7480641c3..6536c77774 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index 4acffee714..b701955493 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 436aaa8648..9f87c67241 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index 8f7a4a3b71..aa131a1475 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 34ea62a89d..da43eaa9dd 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../core/Util.hpp" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 9bfe127d1d..334c619e37 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index aa10eaff10..7a4781024e 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -20,7 +20,7 @@ #include "../Game.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index 88b6496ecd..54dd56a1ab 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -17,7 +17,7 @@ #include "../config/Config.h" #include "../drawing/Drawing.h" #include "../paint/Supports.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../paint/Paint.h" #include "../interface/window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index c893ad2b48..1adfbf643f 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index 9fdf4b6005..3603f6df3b 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index d513727b93..23f33c3f13 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 5d57cc5f28..38d9980b80 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 9ac4fd6010..7ce0fd019e 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/Drawing.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/vehicle_paint.c b/src/openrct2/ride/vehicle_paint.c index 972f07206f..4450f0738d 100644 --- a/src/openrct2/ride/vehicle_paint.c +++ b/src/openrct2/ride/vehicle_paint.c @@ -19,7 +19,7 @@ #include "../world/sprite.h" #include "../ride/ride_data.h" #include "Track.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../Game.h" #include "../drawing/LightFX.h" #include "vehicle_paint.h" diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index ad10ddaf04..135d0cf03d 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index a4690217cb..54e9c1a70b 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index 6a3baa7f7c..9679c0b49f 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index e4fdcfb2ac..063d67f7fa 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -16,7 +16,7 @@ #include "../../config/Config.h" #include "../../Game.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 4264161e9b..bc3f38bda9 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../config/Config.h" -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index c1400c5aec..e3669e89b2 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../interface/viewport.h" +#include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../ride_data.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 53fdfa3f74..8be586adcb 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -19,7 +19,7 @@ #include "../config/Config.h" #include "../FileClassifier.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../management/Award.h" diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index 4959059984..02479b0a24 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -30,7 +30,7 @@ #include "../drawing/Drawing.h" #include "../Game.h" #include "../Input.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../interface/window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index aef9a38d53..9ad90142b7 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -32,7 +32,7 @@ #include "TitleSequencePlayer.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../interface/window.h" #include "../management/NewsItem.h" #include "../windows/Intent.h" diff --git a/src/openrct2/windows/_legacy.c b/src/openrct2/windows/_legacy.c index 04fb4d69cf..96b5fbce5f 100644 --- a/src/openrct2/windows/_legacy.c +++ b/src/openrct2/windows/_legacy.c @@ -22,7 +22,7 @@ #include "../audio/audio.h" #include "../Input.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../Cheats.h" diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp index 5f072be396..34129f0bec 100644 --- a/src/openrct2/world/MoneyEffect.cpp +++ b/src/openrct2/world/MoneyEffect.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../localisation/Localisation.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../interface/window.h" #include "../OpenRCT2.h" #include "sprite.h" diff --git a/src/openrct2/world/footpath.h b/src/openrct2/world/footpath.h index cd286312fd..25d6b6f172 100644 --- a/src/openrct2/world/footpath.h +++ b/src/openrct2/world/footpath.h @@ -18,7 +18,7 @@ #define _WORLD_FOOTPATH_H_ #include "../common.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../object/Object.h" enum diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/map_animation.c index 39be9e33ce..01407db8ba 100644 --- a/src/openrct2/world/map_animation.c +++ b/src/openrct2/world/map_animation.c @@ -18,7 +18,7 @@ #include "../ride/Ride.h" #include "../ride/ride_data.h" #include "../ride/Track.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "map_animation.h" #include "Map.h" #include "scenery.h" diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c index f9508f4787..3fe76c29d3 100644 --- a/src/openrct2/world/sprite.c +++ b/src/openrct2/world/sprite.c @@ -17,7 +17,7 @@ #include "../audio/audio.h" #include "../Cheats.h" #include "../Game.h" -#include "../interface/viewport.h" +#include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../OpenRCT2.h" diff --git a/test/testpaint/PaintIntercept.cpp b/test/testpaint/PaintIntercept.cpp index 357b2ed919..edeea924f9 100644 --- a/test/testpaint/PaintIntercept.cpp +++ b/test/testpaint/PaintIntercept.cpp @@ -21,7 +21,7 @@ #include "TestPaint.hpp" #include -#include +#include #include #include diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp index ff3ae0726c..052403e40e 100644 --- a/test/testpaint/TestPaint.cpp +++ b/test/testpaint/TestPaint.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace TestPaint { diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index db020e77d3..c0ed541fd7 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 6d3b3ebe30..516c06a229 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -27,7 +27,7 @@ #include "Utils.hpp" #include "data.h" -#include +#include #include #include #include @@ -106,7 +106,7 @@ private: { "../../drawing/Drawing.h", "../../paint/supports.h", - "../../interface/viewport.h", + "../../interface/Viewport.h", "../../paint/tile_element/tile_element.h", "../../paint/paint.h", "../../sprites.h",