Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Pierre Kim
OpenRCT2-mod
Commits
c4f44e5e
Commit
c4f44e5e
authored
7 years ago
by
Michael Steenbeek
Browse files
Options
Download
Email Patches
Plain Diff
Compile files in paint folder as C++
parent
14075b8d
develop
No related merge requests found
Changes
135
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
OpenRCT2.xcodeproj/project.pbxproj
+80
-64
OpenRCT2.xcodeproj/project.pbxproj
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
+1
-1
...nrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
src/openrct2-ui/input/MouseInput.cpp
+1
-1
src/openrct2-ui/input/MouseInput.cpp
src/openrct2-ui/windows/DebugPaint.cpp
+2
-2
src/openrct2-ui/windows/DebugPaint.cpp
src/openrct2-ui/windows/Map.cpp
+1
-1
src/openrct2-ui/windows/Map.cpp
src/openrct2-ui/windows/Park.cpp
+1
-1
src/openrct2-ui/windows/Park.cpp
src/openrct2-ui/windows/RideConstruction.cpp
+1
-1
src/openrct2-ui/windows/RideConstruction.cpp
src/openrct2/Game.cpp
+2
-2
src/openrct2/Game.cpp
src/openrct2/ObjectList.h
+2
-2
src/openrct2/ObjectList.h
src/openrct2/actions/PlaceParkEntranceAction.hpp
+1
-1
src/openrct2/actions/PlaceParkEntranceAction.hpp
src/openrct2/drawing/lightfx.c
+1
-1
src/openrct2/drawing/lightfx.c
src/openrct2/drawing/scrolling_text.c
+1
-1
src/openrct2/drawing/scrolling_text.c
src/openrct2/interface/viewport.c
+4
-4
src/openrct2/interface/viewport.c
src/openrct2/interface/viewport.h
+1
-1
src/openrct2/interface/viewport.h
src/openrct2/interface/viewport_interaction.c
+1
-1
src/openrct2/interface/viewport_interaction.c
src/openrct2/object/EntranceObject.h
+1
-1
src/openrct2/object/EntranceObject.h
src/openrct2/paint/Paint.cpp
+3
-3
src/openrct2/paint/Paint.cpp
src/openrct2/paint/Paint.h
+1
-4
src/openrct2/paint/Paint.h
src/openrct2/paint/PaintHelpers.cpp
+1
-1
src/openrct2/paint/PaintHelpers.cpp
src/openrct2/paint/Supports.cpp
+3
-3
src/openrct2/paint/Supports.cpp
with
109 additions
and
96 deletions
+109
-96
OpenRCT2.xcodeproj/project.pbxproj
+
80
-
64
View file @
c4f44e5e
This diff is collapsed.
Click to expand it.
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
+
1
-
1
View file @
c4f44e5e
...
...
@@ -26,7 +26,7 @@
#include <openrct2/drawing/lightfx.h>
#include <openrct2/Game.h>
#include <openrct2/paint/
p
aint.h>
#include <openrct2/paint/
P
aint.h>
using
namespace
OpenRCT2
;
using
namespace
OpenRCT2
::
Drawing
;
...
...
This diff is collapsed.
Click to expand it.
src/openrct2-ui/input/MouseInput.cpp
+
1
-
1
View file @
c4f44e5e
...
...
@@ -34,7 +34,7 @@
#include <openrct2/platform/platform.h>
#include <openrct2/ride/ride_data.h>
#include <openrct2/scenario/scenario.h>
#include <openrct2/world/
b
anner.h>
#include <openrct2/world/
B
anner.h>
#include <openrct2/world/map.h>
#include <openrct2/world/scenery.h>
#include <openrct2/world/sprite.h>
...
...
This diff is collapsed.
Click to expand it.
src/openrct2-ui/windows/DebugPaint.cpp
+
2
-
2
View file @
c4f44e5e
...
...
@@ -19,8 +19,8 @@
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/paint/tile_element/
t
ile
_e
lement.h>
#include <openrct2/paint/
p
aint.h>
#include <openrct2/paint/tile_element/
T
ile
E
lement.h>
#include <openrct2/paint/
P
aint.h>
#include <openrct2/ride/track_paint.h>
enum
WINDOW_DEBUG_PAINT_WIDGET_IDX
...
...
This diff is collapsed.
Click to expand it.
src/openrct2-ui/windows/Map.cpp
+
1
-
1
View file @
c4f44e5e
...
...
@@ -27,7 +27,7 @@
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/ride/Track.h>
#include <openrct2/world/
e
ntrance.h>
#include <openrct2/world/
E
ntrance.h>
#include <openrct2/world/footpath.h>
#include <openrct2/world/scenery.h>
...
...
This diff is collapsed.
Click to expand it.
src/openrct2-ui/windows/Park.cpp
+
1
-
1
View file @
c4f44e5e
...
...
@@ -29,7 +29,7 @@
#include <openrct2/interface/widget.h>
#include <openrct2/management/Award.h>
#include <openrct2/util/Util.h>
#include <openrct2/world/
e
ntrance.h>
#include <openrct2/world/
E
ntrance.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2/interface/themes.h>
...
...
This diff is collapsed.
Click to expand it.
src/openrct2-ui/windows/RideConstruction.cpp
+
1
-
1
View file @
c4f44e5e
...
...
@@ -36,7 +36,7 @@
#include <openrct2/sprites.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2/windows/Intent.h>
#include <openrct2/world/
e
ntrance.h>
#include <openrct2/world/
E
ntrance.h>
#include <openrct2/world/footpath.h>
#pragma region Widgets
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/Game.cpp
+
2
-
2
View file @
c4f44e5e
...
...
@@ -52,9 +52,9 @@
#include "util/SawyerCoding.h"
#include "util/Util.h"
#include "windows/Intent.h"
#include "world/
b
anner.h"
#include "world/
B
anner.h"
#include "world/Climate.h"
#include "world/
e
ntrance.h"
#include "world/
E
ntrance.h"
#include "world/footpath.h"
#include "world/map.h"
#include "world/map_animation.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/ObjectList.h
+
2
-
2
View file @
c4f44e5e
#pragma once
#include "ride/ride.h"
#include "world/
b
anner.h"
#include "world/
e
ntrance.h"
#include "world/
B
anner.h"
#include "world/
E
ntrance.h"
#include "world/footpath.h"
#include "world/scenery.h"
#include "world/water.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/actions/PlaceParkEntranceAction.hpp
+
1
-
1
View file @
c4f44e5e
...
...
@@ -22,7 +22,7 @@
#include "GameAction.h"
#include "../Cheats.h"
#include "../world/
e
ntrance.h"
#include "../world/
E
ntrance.h"
#include "../world/park.h"
#include "../world/footpath.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/drawing/lightfx.c
+
1
-
1
View file @
c4f44e5e
...
...
@@ -20,7 +20,7 @@
#include "../Game.h"
#include "../interface/viewport.h"
#include "../interface/window.h"
#include "../paint/tile_element/
t
ile
_e
lement.h"
#include "../paint/tile_element/
T
ile
E
lement.h"
#include "../world/Climate.h"
#include "../config/Config.h"
#include "drawing.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/drawing/scrolling_text.c
+
1
-
1
View file @
c4f44e5e
...
...
@@ -17,7 +17,7 @@
#include "../config/Config.h"
#include "../interface/colour.h"
#include "../localisation/localisation.h"
#include "../paint/
p
aint.h"
#include "../paint/
P
aint.h"
#include "../sprites.h"
#include "drawing.h"
#include "ttf.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/interface/viewport.c
+
4
-
4
View file @
c4f44e5e
...
...
@@ -21,14 +21,14 @@
#include "../Input.h"
#include "../localisation/localisation.h"
#include "../OpenRCT2.h"
#include "../paint/
p
aint.h"
#include "../paint/
s
upports.h"
#include "../paint/
P
aint.h"
#include "../paint/
S
upports.h"
#include "../peep/Staff.h"
#include "../ride/ride_data.h"
#include "../ride/TrackData.h"
#include "../world/
b
anner.h"
#include "../world/
B
anner.h"
#include "../world/Climate.h"
#include "../world/
e
ntrance.h"
#include "../world/
E
ntrance.h"
#include "../world/footpath.h"
#include "../world/map.h"
#include "../world/scenery.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/interface/viewport.h
+
1
-
1
View file @
c4f44e5e
...
...
@@ -19,7 +19,7 @@
#include "../world/map.h"
#include "../world/sprite.h"
#include "../paint/
p
aint.h"
#include "../paint/
P
aint.h"
#include "window.h"
enum
{
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/interface/viewport_interaction.c
+
1
-
1
View file @
c4f44e5e
...
...
@@ -25,7 +25,7 @@
#include "../ride/Track.h"
#include "../scenario/scenario.h"
#include "../windows/Intent.h"
#include "../world/
b
anner.h"
#include "../world/
B
anner.h"
#include "../world/footpath.h"
#include "../world/map.h"
#include "../world/scenery.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/object/EntranceObject.h
+
1
-
1
View file @
c4f44e5e
...
...
@@ -20,7 +20,7 @@
#include "Object.h"
#include "../world/
e
ntrance.h"
#include "../world/
E
ntrance.h"
class
EntranceObject
final
:
public
Object
{
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/paint/Paint.cpp
+
3
-
3
View file @
c4f44e5e
...
...
@@ -14,14 +14,14 @@
*****************************************************************************/
#pragma endregion
#include "
p
aint.h"
#include "
P
aint.h"
#include "../drawing/drawing.h"
#include "../localisation/localisation.h"
#include "../config/Config.h"
#include "../interface/viewport.h"
#include "../core/Math.hpp"
#include "tile_element/
t
ile
_e
lement.h"
#include "sprite/
s
prite.h"
#include "tile_element/
T
ile
E
lement.h"
#include "sprite/
S
prite.h"
#include <algorithm>
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/paint/
p
aint.h
→
src/openrct2/paint/
P
aint.h
+
1
-
4
View file @
c4f44e5e
...
...
@@ -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
This diff is collapsed.
Click to expand it.
src/openrct2/paint/
p
aint
_h
elpers.c
→
src/openrct2/paint/
P
aint
H
elpers.c
pp
+
1
-
1
View file @
c4f44e5e
...
...
@@ -16,7 +16,7 @@
#include "../interface/viewport.h"
#include "../ride/track_paint.h"
#include "
p
aint.h"
#include "
P
aint.h"
paint_struct
*
sub_98196C_rotated
(
paint_session
*
session
,
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/paint/
s
upports.c
→
src/openrct2/paint/
S
upports.c
pp
+
3
-
3
View file @
c4f44e5e
...
...
@@ -15,9 +15,9 @@
#pragma endregion
#include "../interface/viewport.h"
#include "
../paint/p
aint.h"
#include "
s
upports.h"
#include "tile_element/
t
ile
_e
lement.h"
#include "
P
aint.h"
#include "
S
upports.h"
#include "tile_element/
T
ile
E
lement.h"
/** rct2: 0x0097AF20, 0x0097AF21 */
static
const
LocationXY8
loc_97AF20
[]
=
{
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
…
7
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help