Michael Steenbeek
d89c3d9e67
Replace calls to get path edges
...
This replaces most calls/direct access to the footpath edges (i.e. the orthogonal directions, not the corners). This includes places where the whole byte was retrieved, but only compared against orthogonal directions.
2018-10-31 15:08:06 +01:00
Michael Steenbeek
28d302d653
Remove more direct access to TileElement->type
2018-10-03 12:31:02 +02:00
Gymnasiast
5d22166fc3
Fix TestPaint
2018-09-25 21:57:21 +02:00
Gymnasiast
eecf465e3b
Fix formatting
2018-09-25 21:57:21 +02:00
Michael Steenbeek
5047d326a6
Copy new struct methods to TestPaint compat
2018-09-25 21:57:21 +02:00
Michael Steenbeek
3f17782692
Move direct access to maze entry to struct methods
2018-09-25 21:57:21 +02:00
Michael Steenbeek
75b5c45a97
Remove residual direct access to most track fields
2018-09-25 21:57:21 +02:00
Michael Steenbeek
104d4f2f58
Move photo functions to struct methods
2018-09-25 21:57:21 +02:00
Michael Steenbeek
897a2982a0
Move brake/booster speed functions to struct methods
2018-09-25 21:57:21 +02:00
Michael Steenbeek
e6d5638815
Move inverted() functions to struct methods
2018-09-25 21:57:21 +02:00
Michael Steenbeek
0cea008c18
Move cable lift functions to struct methods
2018-09-25 21:57:21 +02:00
Michael Steenbeek
69f02400f9
Move GetColourScheme to struct methods
2018-09-25 21:57:21 +02:00
Michael Steenbeek
650971bc68
Move HasChain to struct methods
2018-09-25 21:57:21 +02:00
Gymnasiast
67d7d5c022
Move getting station index to struct methods
2018-09-25 21:57:21 +02:00
Gymnasiast
ae4c464ce7
Move getting track sequence to struct methods
2018-09-25 21:57:21 +02:00
Gymnasiast
8908f3f47e
Move getting track type to struct methods
2018-09-25 21:57:21 +02:00
Gymnasiast
e20ba5d4a3
Add missing stuff to TestPaint
2018-09-16 21:34:51 +02:00
Gymnasiast
e6dd093218
Remove unused function from Testpaint compat
2018-09-16 21:34:51 +02:00
Michael Steenbeek
1d3baef9b7
Remove some C-style tile element functions
2018-09-16 21:34:04 +02:00
Michał Janiszewski
92b556352b
Allow compilation of testpaint on non-x86 targets ( #7989 )
...
This will enable compilation of testpaint on targets different than x86.
It won't function the way it does on x86, but it should provide a way of
tackling various compilation errors that can only be seen in the very
specific environment required by testpaint proper.
2018-09-15 23:37:45 +02:00
Gymnasiast
d0f4b45bd2
Fix Testpaint
2018-09-13 20:14:44 +02:00
clang-format
7eafeaa971
Apply clang-format changes to tests
2018-07-23 16:00:23 +02:00
Hielke Morsink
6fd9843dc3
Add trailing commas and clang-format comments to tests
2018-07-23 16:00:14 +02:00
clang-format
42fa1b0f63
clang-format tests
2018-07-23 15:58:01 +02:00
Michael Steenbeek
1b08fb4e69
Replace our own integer types with standard ones
2018-06-20 17:30:40 +02:00
Hielke Morsink
0cf256ac9e
Ready copyright notice for clang-format
...
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.
I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
Hielke Morsink
de3cab59bb
Fix warnings reported by travis
2018-06-05 16:07:54 +02:00
Ted John
92f6ac7333
Rename header files to match renamed source files
2018-06-01 09:38:30 +02:00
Michał Janiszewski
ce3b210e6b
Fix testpaint build
2018-06-01 09:37:49 +02:00
Michael Steenbeek
8d8820016c
Fix Testpaint
2018-05-24 13:13:51 +02:00
Aaron van Geffen
6f9226aee3
Fix testpaint.
2018-05-22 17:37:07 +02:00
ζeh Matt
ee56021067
Minor code cleanup. ( #7538 )
2018-05-18 22:50:57 +02:00
Hielke Morsink
7f4663ffb8
Fix test-paint build
2018-05-15 12:55:29 +02:00
Michael Steenbeek
ffa73981ac
Copy CoordsDirectionDelta to Testpaint
2018-05-05 11:42:49 +01:00
Michael Steenbeek
eb0a73cf96
Fix TileDirectionDelta definition in TestPaint
2018-05-05 11:42:48 +01:00
Michael Steenbeek
5f9d40be7a
Replace tile_element_get_type() with struct method
2018-05-02 19:27:04 +02:00
Michael Steenbeek
ef433df26a
Clean up tile element usage, introduce struct methods
2018-05-02 11:58:12 +02:00
Gymnasiast
fd4df87a8d
Fix TestPaint
2018-05-01 20:38:57 +02:00
Michał Janiszewski
9caa30f846
Fix TestPaint target
...
Adds missing files to target
2018-04-28 02:38:07 +02:00
Hielke Morsink
30063984e6
Delete unused function arguments or mark them so ( #7426 )
...
This aims to make future refactoring easier. The arguments are removed where possible, but kept and marked with C++17's [[maybe_unused]] where they could not be removed (e.g. when they are used as a callback, rather than called directly).
I've skipped the rides/<category>/* and peep/* source files, because the rides source files are mostly generated and have a ton of unused variables, and the peep source files are being refactored.
I've also skipped most of window/* source files, because most of the functions are used as callbacks and will be bulk-renamed at some point.
2018-04-20 13:56:37 +02:00
Michał Janiszewski
67f74119cf
Fix missing headers
2018-03-20 00:27:58 +01:00
Michał Janiszewski
f1ab13f56e
Fix sorting and missed floor() usage
2018-03-18 23:29:13 +01:00
Michał Janiszewski
28391eaf5d
Move cstring out of common.h
2018-03-18 23:29:13 +01:00
Michał Janiszewski
f3bdc431e1
Add lost headers
2018-03-18 23:29:13 +01:00
Michael Steenbeek
1fa2fa8f80
Refactor ride->entrances and ride->exits
2018-03-07 19:10:50 +01:00
Aaron van Geffen
c1784b21cc
Pass currentRotation to gPaintSession in TestPaint.
2018-02-17 13:11:07 +01:00
Michał Janiszewski
28a91acbfe
TestPaint fixes
2018-02-17 13:11:07 +01:00
Michael Steenbeek
bde913ee16
Rename SmallCoords and BigCoords
2018-02-15 22:26:50 +01:00
Michael Steenbeek
ca5a1e1f34
Testpaint and MSVC fixes
2018-02-15 22:26:50 +01:00
Hielke Morsink
55979a3fff
Remove and replace C typedefs
...
`typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way.
This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
Michał Janiszewski
c672e6098c
Fix testpaint
2018-02-12 16:03:20 +01:00
Michał Janiszewski
3f76bd214f
Const all the painted tile elements
...
Extracted from https://github.com/OpenRCT2/OpenRCT2/pull/7036
2018-02-12 16:03:20 +01:00
Gymnasiast
36bc1f816c
Clean up C bits from Testpaint
2018-02-01 13:42:46 +01:00
Gymnasiast
5cc21fd21b
Replace NULL with nullptr in C++ files
2018-01-29 21:33:21 +00:00
Michał Janiszewski
c8048df5a6
Rename header files for testpaint
2018-01-11 16:29:52 +01:00
Michael Steenbeek
9a3e85f4f9
Fix Xcode
2018-01-11 16:29:52 +01:00
Michał Janiszewski
f817bf8483
Rename hook.c to Hook.cpp
2018-01-11 16:29:52 +01:00
Michał Janiszewski
a2aa8a0fb0
Rename compat.c to Compat.cpp
2018-01-11 16:29:52 +01:00
Michał Janiszewski
13ab77fe30
Rename addresses.c to Addresses.cpp
2018-01-11 16:29:52 +01:00
Michał Janiszewski
6951bf11f2
Rename data.c to Data.cpp
2018-01-11 16:29:52 +01:00
Michael Steenbeek
cd5a1ba888
Compile files in world folder as C++
2018-01-11 13:25:09 +01:00
Michał Janiszewski
5e72d7423a
Update testpaint
2018-01-11 09:30:09 +01:00
Michał Janiszewski
eba2119a81
Update testpaint
2018-01-11 09:30:09 +01:00
Michał Janiszewski
70505f4fa0
Refactor track_paint to C++
2018-01-11 09:30:09 +01:00
Michał Janiszewski
82dfde4419
Refactor ride_data to C++
2018-01-11 09:30:09 +01:00
Michael Steenbeek
6a88d6e04d
Move and rename RCT{1,2,12}.h
2018-01-09 13:36:41 +01:00
Ted John
f18595a1c1
Refactor viewport.c to C++
2018-01-07 12:39:58 +01:00
Ted John
630a5065db
Refactor colour.c to C++
2018-01-07 12:39:58 +01:00
Ted John
3dcbebcf68
Refactor drawing.c to C++
2018-01-05 22:57:57 +01:00
Michał Janiszewski
c7417e11a4
Use bool
type for boolean logic
2018-01-04 15:40:52 +01:00
Michael Steenbeek
91589f57c6
Compile map.c as C++
2018-01-03 20:40:51 +01:00
Hielke Morsink
eb4a8924d1
Refactor and clean up footpath-related code
...
This commit corrects some misused defines, and gave them clearer names.
For example, the slope mask was only useful for surface elements, so now
"SURFACE" is in its name. I also replaced any hard coded values that I
could find and knew their purpose off.
2018-01-03 10:57:37 +01:00
Michael Steenbeek
347ff702d0
Refactor objects
2018-01-03 10:16:51 +01:00
Gymnasiast
23d70a4ac9
Compile ride.c as C++
2017-12-31 20:43:17 +01:00
Michael Steenbeek
c4f44e5e7a
Compile files in paint folder as C++
2017-12-17 17:24:36 +01:00
Michael Steenbeek
6dc49d643a
Compile files in base dir as C++
2017-12-13 08:03:48 +01:00
Michael Steenbeek
0ffa2b541a
Use more consistent terminology and remove some Americanisms
2017-12-05 10:23:36 +01:00
Ted John
e879df31e8
Fix testpaint code issues
2017-12-04 19:49:12 +00:00
Ted John
c30739daff
Use rct2_ride
2017-12-04 19:04:07 +00:00
Ted John
ec6099f9f4
Name / define RCT2 addresses
2017-12-04 19:04:07 +00:00
Ted John
ebf43c2529
Fix testpaint
2017-12-04 19:04:07 +00:00
Michael Steenbeek
bf69b2e682
Make terminology use more consistent
2017-11-20 11:20:04 +01:00
Michael Steenbeek
268851aa87
Fix testpaint
2017-11-17 12:54:47 +01:00
Michael Steenbeek
99830ed069
Add track_cable_lift functions to compat.c
2017-11-17 12:54:47 +01:00
Michael Steenbeek
a5dee3a0ae
Add track_element_[sg]et_type to compat.c
2017-11-17 12:54:47 +01:00
Michael Steenbeek
60d5d5ca1e
Cleanup
2017-11-17 12:54:47 +01:00
Michael Steenbeek
f448d16707
Add methods for getting and setting track element type
2017-11-17 12:54:47 +01:00
Michael Steenbeek
5a7ace134f
Apply changes to Testpaint
2017-11-17 12:54:47 +01:00
Christian F. Coors
06afeeda9a
Apply some refactoring
2017-11-02 12:22:28 +01:00
Michael Steenbeek
af845beb61
Replace mapElement with tileElement
2017-10-31 19:59:06 +01:00
Michael Steenbeek
ce8d9cc71b
Rename map_element to tile_element
2017-10-31 19:59:06 +01:00
Michał Janiszewski
a70a1bc523
Compile track_data_old as C++
2017-10-25 23:53:47 +02:00
Michał Janiszewski
90a14205c8
Compile track_data.c as C++
2017-10-25 23:53:47 +02:00
Michael Steenbeek
bb01699b7d
Compile track.c as C++
2017-10-17 13:51:47 +02:00
Tomas Dittmann
e393ff1f22
Stop using (void*)-1 for invalid pointers
2017-10-15 15:53:16 +02:00
Michael Steenbeek
7f9c25a7a9
Use constant for LOCATION_NULL, split off location stuff to Location.h
2017-10-13 22:23:07 +02:00
Michael Steenbeek
3a9dc3f491
Ensure that get_ride_entry returns NULL on invalid ride entries
2017-10-12 21:07:35 +02:00
Michał Janiszewski
0c92619350
Fix testpaint CMakeLists.txt
2017-10-09 15:24:22 +02:00
Michael Steenbeek
055ecccf36
Clean up more track flags
2017-10-04 17:14:53 +02:00
Michał Janiszewski
5ab9f938a7
Update files missed in the great extern "C" cleanup of 2017
2017-09-28 23:29:16 +02:00
Ted John
3a9cafd2f0
Remove gTrackColours macro ( #6266 )
2017-09-12 19:48:18 +01:00
Gymnasiast
3891b9874d
Fix testpaint
2017-09-12 11:29:43 +02:00
Gymnasiast
a28509e24c
Split Ride and rct2_ride
2017-09-12 11:16:57 +02:00
Ted John
ef84f6283d
Fix testpaint
2017-09-03 02:59:14 +01:00
Ted John
43c6f7fda0
Pass paint session to ps functions
2017-09-03 02:27:07 +01:00
Ted John
f2b8cf181e
Pass paint session to remaining support functions
2017-09-03 01:56:56 +01:00
Ted John
1cc82d1cb5
Pass paint session to tunnel functions
2017-09-03 01:51:59 +01:00
Ted John
2980be0667
Pass paint session to more ps functions
2017-09-02 23:22:19 +01:00
Ted John
6b3f3ddb70
Pass paint session to scenery_paint
2017-09-02 22:44:39 +01:00
Ted John
8456639b47
Pass paint session to entrance_paint
2017-09-02 22:43:45 +01:00
Ted John
1f6f83163a
Pass paint session to fence_paint
2017-09-02 22:41:36 +01:00
Ted John
00cde34b39
Pass paint session to scenery_multiple_paint
2017-09-02 22:40:19 +01:00
Ted John
5c8700d054
Pass paint session to banner_paint
2017-09-02 22:38:26 +01:00
Ted John
4c78827c45
Pass paint session to path_paint
2017-09-02 22:31:39 +01:00
Ted John
47521335fa
Pass paint session to surface_paint
2017-09-02 22:25:45 +01:00
Ted John
4ea9ac2d07
Fix testpaint
2017-09-02 19:00:54 +01:00
Ted John
6b48f4344e
Fix #6100 : Paths don't connect to exit
...
Regression from db438a27b7
, % does not work on negative numbers.
2017-08-06 00:18:32 +01:00
Michael Steenbeek
2f3a30f22b
Fix cast to bool in map element functions
2017-08-01 13:42:50 +02:00
Gymnasiast
db438a27b7
Use map_element_get_direction in more places, create map_element_get_direction_with_offset()
2017-07-27 21:23:26 +02:00
Michael Steenbeek
46de90df86
Create map_get_water_height()
2017-07-27 17:15:56 +02:00
Michael Steenbeek
41b5e8bbca
Remove direct usage of map element track sequence field
2017-07-27 16:19:01 +02:00
Gymnasiast
d936b23072
Get and set map element station index via helper functions
2017-07-27 14:13:16 +02:00
Michael Steenbeek
367efa2020
Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places
2017-07-20 20:56:29 +02:00
Gymnasiast
4059d9e8a7
Clean up boosters, ride_type_null, max rides per entry, formatting
2017-06-14 16:06:43 +02:00
Ted John
906b71796c
Remove testpaint for VS
2017-06-13 12:23:26 +01:00
Ted John
29f0372da8
Reduce SDL2 in headers
2017-06-12 19:56:32 +01:00
Michał Janiszewski
61d38511bc
Expand tabs to spaces
...
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.
Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.
Additionally, trailing whitespace has been removed.
2017-06-06 23:46:14 +02:00
Michał Janiszewski
79d76759bb
Fix #5516 : Update copyrights for 2017
...
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
2017-06-01 21:55:10 +02:00
Ted John
82288f92e6
Add cmake for testpaint
2017-05-29 22:38:44 +02:00
Gymnasiast
d4bb9c38c9
Delete unused file
2017-05-17 22:57:23 +02:00
Gymnasiast
09f0425c2f
Unify River Rafts and Splash Boats drawing code
2017-05-17 20:49:07 +02:00
Michael Steenbeek
a53b01d5b9
Remove magic numbers and Americanisms
2017-05-08 23:54:38 +02:00
Gymnasiast
cc92300e3a
Load CSG1 booster sprites for the Looping and Corkscrew RC
2017-04-11 22:38:09 +02:00
Michał Janiszewski
4f852d1ea5
Fix testpaint target for new config
2017-02-21 07:29:06 +01:00
Ted John
8ba5db0697
Fix build for some configurations
2017-02-20 20:05:59 +00:00
zaxcav
25e57ca50d
Updated code as requested by reviewer.
...
Removed display of raw cut height value.
Changed display of cut height in METRIC/SI from 1DP to 2DP to display odd raw heights with accurate value.
Changed display of cut height in IMPERIAL to 1DP to display odd raw heights with accurate value.
2017-01-22 21:02:19 +01:00
zaxcav
e952c607cc
Add definition of gClipHeight to compat.c
2017-01-22 20:41:34 +01:00
Marijn van der Werf
2ffbbe0678
Test vertical tunnels properly
2017-01-17 23:57:53 +01:00
Michał Janiszewski
85c6ed778b
Add overrides in TestTrack.cpp
2017-01-13 11:44:14 +01:00
Michael Steenbeek
1c2458b6dd
Combine drawing of the Spiral and Mini RC ( #5025 )
2017-01-09 22:09:33 +01:00
Michael Steenbeek
2b35986746
Add and use constant for number of ride types
2017-01-05 09:19:22 +01:00
Marijn van der Werf
24a0405345
Update testpaint
2017-01-04 18:28:40 +00:00
Ted John
a2e3f10ca1
Update VS project files
2017-01-04 18:28:37 +00:00
Michał Janiszewski
d15112dcb3
Fix broken includes in TestPaint.cpp
2016-12-28 19:07:46 +01:00
Broxzier
6c29bdbf21
CppCheck fixes
2016-12-24 13:10:03 +01:00
Marijn van der Werf
2fca2adbc1
Fix prepended wooden supports
2016-12-19 18:45:08 +01:00
Ted John
870a8fc6b6
Move addresses and hook into rct2 sub directory
2016-12-16 01:25:05 +00:00
Ted John
e9bafc2973
Refactor RCT2 interop code to new source
2016-12-11 12:16:43 +00:00
Marijn van der Werf
15a6575346
Update hooks to return CPU flags
2016-12-01 14:15:47 +01:00
Ted John
ee0ca426b3
Allow building for both VS2015 and VS2017
2016-11-26 23:53:29 +00:00