Commit c4f44e5e authored by Michael Steenbeek's avatar Michael Steenbeek
Browse files

Compile files in paint folder as C++

parent 14075b8d
No related merge requests found
Showing with 109 additions and 96 deletions
+109 -96
This diff is collapsed.
......@@ -26,7 +26,7 @@
#include <openrct2/drawing/lightfx.h>
#include <openrct2/Game.h>
#include <openrct2/paint/paint.h>
#include <openrct2/paint/Paint.h>
using namespace OpenRCT2;
using namespace OpenRCT2::Drawing;
......
......@@ -34,7 +34,7 @@
#include <openrct2/platform/platform.h>
#include <openrct2/ride/ride_data.h>
#include <openrct2/scenario/scenario.h>
#include <openrct2/world/banner.h>
#include <openrct2/world/Banner.h>
#include <openrct2/world/map.h>
#include <openrct2/world/scenery.h>
#include <openrct2/world/sprite.h>
......
......@@ -19,8 +19,8 @@
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/paint/tile_element/tile_element.h>
#include <openrct2/paint/paint.h>
#include <openrct2/paint/tile_element/TileElement.h>
#include <openrct2/paint/Paint.h>
#include <openrct2/ride/track_paint.h>
enum WINDOW_DEBUG_PAINT_WIDGET_IDX
......
......@@ -27,7 +27,7 @@
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/ride/Track.h>
#include <openrct2/world/entrance.h>
#include <openrct2/world/Entrance.h>
#include <openrct2/world/footpath.h>
#include <openrct2/world/scenery.h>
......
......@@ -29,7 +29,7 @@
#include <openrct2/interface/widget.h>
#include <openrct2/management/Award.h>
#include <openrct2/util/Util.h>
#include <openrct2/world/entrance.h>
#include <openrct2/world/Entrance.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2/interface/themes.h>
......
......@@ -36,7 +36,7 @@
#include <openrct2/sprites.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2/windows/Intent.h>
#include <openrct2/world/entrance.h>
#include <openrct2/world/Entrance.h>
#include <openrct2/world/footpath.h>
#pragma region Widgets
......
......@@ -52,9 +52,9 @@
#include "util/SawyerCoding.h"
#include "util/Util.h"
#include "windows/Intent.h"
#include "world/banner.h"
#include "world/Banner.h"
#include "world/Climate.h"
#include "world/entrance.h"
#include "world/Entrance.h"
#include "world/footpath.h"
#include "world/map.h"
#include "world/map_animation.h"
......
#pragma once
#include "ride/ride.h"
#include "world/banner.h"
#include "world/entrance.h"
#include "world/Banner.h"
#include "world/Entrance.h"
#include "world/footpath.h"
#include "world/scenery.h"
#include "world/water.h"
......
......@@ -22,7 +22,7 @@
#include "GameAction.h"
#include "../Cheats.h"
#include "../world/entrance.h"
#include "../world/Entrance.h"
#include "../world/park.h"
#include "../world/footpath.h"
......
......@@ -20,7 +20,7 @@
#include "../Game.h"
#include "../interface/viewport.h"
#include "../interface/window.h"
#include "../paint/tile_element/tile_element.h"
#include "../paint/tile_element/TileElement.h"
#include "../world/Climate.h"
#include "../config/Config.h"
#include "drawing.h"
......
......@@ -17,7 +17,7 @@
#include "../config/Config.h"
#include "../interface/colour.h"
#include "../localisation/localisation.h"
#include "../paint/paint.h"
#include "../paint/Paint.h"
#include "../sprites.h"
#include "drawing.h"
#include "ttf.h"
......
......@@ -21,14 +21,14 @@
#include "../Input.h"
#include "../localisation/localisation.h"
#include "../OpenRCT2.h"
#include "../paint/paint.h"
#include "../paint/supports.h"
#include "../paint/Paint.h"
#include "../paint/Supports.h"
#include "../peep/Staff.h"
#include "../ride/ride_data.h"
#include "../ride/TrackData.h"
#include "../world/banner.h"
#include "../world/Banner.h"
#include "../world/Climate.h"
#include "../world/entrance.h"
#include "../world/Entrance.h"
#include "../world/footpath.h"
#include "../world/map.h"
#include "../world/scenery.h"
......
......@@ -19,7 +19,7 @@
#include "../world/map.h"
#include "../world/sprite.h"
#include "../paint/paint.h"
#include "../paint/Paint.h"
#include "window.h"
enum {
......
......@@ -25,7 +25,7 @@
#include "../ride/Track.h"
#include "../scenario/scenario.h"
#include "../windows/Intent.h"
#include "../world/banner.h"
#include "../world/Banner.h"
#include "../world/footpath.h"
#include "../world/map.h"
#include "../world/scenery.h"
......
......@@ -20,7 +20,7 @@
#include "Object.h"
#include "../world/entrance.h"
#include "../world/Entrance.h"
class EntranceObject final : public Object
{
......
......@@ -14,14 +14,14 @@
*****************************************************************************/
#pragma endregion
#include "paint.h"
#include "Paint.h"
#include "../drawing/drawing.h"
#include "../localisation/localisation.h"
#include "../config/Config.h"
#include "../interface/viewport.h"
#include "../core/Math.hpp"
#include "tile_element/tile_element.h"
#include "sprite/sprite.h"
#include "tile_element/TileElement.h"
#include "sprite/Sprite.h"
#include <algorithm>
......
......@@ -14,8 +14,7 @@
*****************************************************************************/
#pragma endregion
#ifndef _PAINT_H
#define _PAINT_H
#pragma once
#include "../common.h"
#include "../world/map.h"
......@@ -231,5 +230,3 @@ void paint_draw_money_structs(rct_drawpixelinfo * dpi, paint_string_struct * ps)
#ifdef __cplusplus
}
#endif
#endif
......@@ -16,7 +16,7 @@
#include "../interface/viewport.h"
#include "../ride/track_paint.h"
#include "paint.h"
#include "Paint.h"
paint_struct * sub_98196C_rotated(
paint_session * session,
......
......@@ -15,9 +15,9 @@
#pragma endregion
#include "../interface/viewport.h"
#include "../paint/paint.h"
#include "supports.h"
#include "tile_element/tile_element.h"
#include "Paint.h"
#include "Supports.h"
#include "tile_element/TileElement.h"
/** rct2: 0x0097AF20, 0x0097AF21 */
static const LocationXY8 loc_97AF20[] = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment