mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,867 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

326 Commits

Author SHA1 Message Date
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
Michał Janiszewski 3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Ted John 84e8b00900 Merge pull request #4678 from marijnvdwerf/fix/paint-4 
Track Paint fixes: segment support height
 2016-10-22 14:22:03 +01:00
Marijn van der Werf 4b4c00a1af Check for `SEGMENTS_ALL` when printing 2016-10-22 14:42:30 +02:00
Marijn van der Werf 157d535f67 Only fallback if only one element differs 2016-10-22 02:40:35 +02:00
Marijn van der Werf 6f2b20d3c0 Fix lay down rc station tunnels 2016-10-22 01:51:55 +02:00
Marijn van der Werf ce5831f9b4 Fix upward single-tile turns 2016-10-22 01:36:50 +02:00
Marijn van der Werf ffbe380da7 Fix tunnel dumping 2016-10-22 01:04:17 +02:00
Marijn van der Werf 1be2dd996c Make testpaint a lot more quiet 2016-10-19 01:58:47 +02:00
Marijn van der Werf 3dcebfc97f Update TODOs 2016-10-18 19:37:08 +02:00
Marijn van der Werf a44745e2fa Fix General/SegmentSupportHeightCalls 2016-10-17 23:12:54 +02:00
Marijn van der Werf 4f10555002 Move include to extern C 2016-10-17 21:43:31 +02:00
Michał Janiszewski 262655e2e0 Validate access to functionNames 
# Conflicts:
#	test/testpaint/Printer.cpp
 2016-10-17 21:42:03 +02:00
Marijn van der Werf d7f27cff72 Fix GCC 2016-10-17 21:28:27 +02:00
Marijn van der Werf c150c968bf Remove `printf` call 2016-10-17 20:04:24 +02:00
Marijn van der Werf a93e12b5d9 Add silent mode 2016-10-17 20:04:13 +02:00
Marijn van der Werf ed9f67cc46 Fix original call 2016-10-17 19:56:26 +02:00
Marijn van der Werf 58e5df75f0 Fix MSVC 2016-10-17 19:16:53 +02:00
Marijn van der Werf 54964857da Indent call test 2016-10-17 19:15:57 +02:00
Marijn van der Werf ba986f14ae Actually return after failed test 2016-10-17 18:04:12 +02:00
Marijn van der Werf 7d126126ed Add filters 2016-10-17 17:59:51 +02:00
Marijn van der Werf e1c4e3e8f2 Remove more C bridging code 2016-10-17 16:07:32 +02:00
Marijn van der Werf d05dfbe5dc Rename intercept2 to TestPaint 2016-10-17 16:06:05 +02:00
Marijn van der Werf 455080d8b8 Fix MSVC 2016-10-17 15:36:26 +02:00
Marijn van der Werf 18d9b1e91e Don't use C for PaintIntercept functions 2016-10-17 12:45:27 +02:00
Marijn van der Werf d3ce7d1d75 Extract vertical tunnel testing 2016-10-17 12:45:27 +02:00
Marijn van der Werf 9efb41a13f Extract Side tunnels 2016-10-17 12:44:50 +02:00
Marijn van der Werf cb4519e9c5 Move support height testing 2016-10-17 12:43:14 +02:00
Marijn van der Werf 1bd87537eb Attempt to fix automatic segment heights 2016-10-17 12:43:14 +02:00
Marijn van der Werf deb266c443 Extract SupportHeightCalls 2016-10-17 12:43:14 +02:00
Marijn van der Werf 7d69446464 Attempt to fix GCC 2016-10-17 12:43:14 +02:00
Marijn van der Werf 6c54bba6f6 Fix MSVC 2016-10-17 12:43:14 +02:00
Marijn van der Werf 334b8cca05 Extract all of `intercept.c` to C++ 2016-10-17 12:43:14 +02:00
Marijn van der Werf abe6b8ee9e Update VS project 2016-10-17 12:43:14 +02:00
Marijn van der Werf 263dc9f189 Remove unneeded declarations from intercept 2016-10-17 12:43:14 +02:00
Marijn van der Werf f813a2871b Extract function comparison 2016-10-17 12:43:14 +02:00
Marijn van der Werf b8b3eb5af5 Fix for msvc 2016-10-17 12:43:14 +02:00
Marijn van der Werf 3b19dc02d3 Extract utilty functions 2016-10-17 12:43:14 +02:00
Marijn van der Werf 28db02885d Extract function printing 2016-10-17 12:43:14 +02:00
Marijn van der Werf d6772865f5 Use return codes for test results 2016-10-17 12:43:13 +02:00
Marijn van der Werf 70654e9ee5 Extract tunnel/segment resetting 2016-10-17 12:43:13 +02:00
Marijn van der Werf 486d9da0a0 Extract environment resetting 2016-10-17 12:43:13 +02:00
Marijn van der Werf a552a80165 Attempt to fix msvc compatibility 2016-10-17 12:43:13 +02:00
Marijn van der Werf 6642dc534c Update Project files 2016-10-17 12:43:13 +02:00
Marijn van der Werf 8034f6f427 Extract method interception to seperate class 2016-10-17 12:43:13 +02:00
Michał Janiszewski 2c58543928 Fix unintialised variables in testpaint 2016-10-15 21:26:29 +02:00
Marijn van der Werf 40dbb9db1f Fix typo in filename 2016-10-15 19:23:13 +02:00
Marijn van der Werf 564139b29b Test supports 2016-10-15 13:16:56 +02:00
Ted John 41dfbed6aa testpaint: draw stations covered for extra validation 2016-10-13 22:14:50 +01:00
Ted John f65609de67 testpaint: Validate tracks with inverted flag enabled 2016-10-13 22:12:39 +01:00
Marijn van der Werf 8eb2e37a54 [SCRIPT] Fix wooden b supports 2016-10-13 20:13:59 +02:00
Marijn van der Werf 5a77261ee9 Generate empty station function 2016-10-13 18:48:37 +02:00
Marijn van der Werf b7fc980373 Block segments before drawing supports 2016-10-13 18:48:37 +02:00
Marijn van der Werf a5e1433e25 Check if segments heights are set before supports 2016-10-13 18:48:37 +02:00
Marijn van der Werf 6cb9297968 Decompile wooden_b_supports_paint_setup 2016-10-11 21:42:39 +01:00
Marijn van der Werf 6a902f4f92 Ignore unused variable warnings 2016-10-11 02:11:38 +02:00
Marijn van der Werf b24b23c28a Add comment with function table address 2016-10-11 02:11:33 +02:00
Michał Janiszewski 053945034a Fix uninitialised value in testpaint 2016-10-10 23:08:48 +02:00
Ted John b54cb2ca8a testpaint: Add flying rc and lay down rc as invertable 2016-10-10 22:05:15 +01:00
Ted John 6f95ba4ae5 Merge pull request #4569 from janisozaur/generate-rides 
Generated rides
 2016-10-10 08:08:45 +01:00
LRFLEW 7dccbba8b2 Improve String Handling in PaintTest 2016-10-09 15:29:58 -05:00
Ted John 1b65acc0fb Fix corkscrew roller coaster painting 2016-10-09 21:13:34 +01:00
Ted John 842a52e193 Fix compact inverted coaster painting 2016-10-09 20:39:04 +01:00
Ted John d864cb95d1 Enable multi processor compile for testpaint 2016-10-09 19:18:46 +01:00
Michał Janiszewski e5141c0f69 Include copyright notice in ride generator 2016-10-09 15:24:38 +02:00
Michał Janiszewski f1c6ef94da Compilation fixes to latest testpaint 2016-10-09 09:54:20 +01:00
Ted John 157a93d7a5 Support multi-dimension coaster 2016-10-09 03:35:39 +01:00
Ted John 81fdd7d340 Add more mirror entries 2016-10-09 02:37:52 +01:00
Ted John 7cba0e46a8 Various fixes and improvements 2016-10-09 02:01:10 +01:00
Ted John d3ae28e502 Implement vertical tunnels 2016-10-09 01:35:48 +01:00
Ted John 5f3130b945 Don't generate cable lift case for non-giga coaster 2016-10-09 01:06:13 +01:00
Ted John b0995be156 Implement conditional supports 2016-10-09 00:36:01 +01:00
Ted John 38aba7d091 Improve tunnel code generation more 2016-10-09 00:15:34 +01:00
Ted John 567a99c3bf Improve / fix tunnel generation 2016-10-08 23:28:35 +01:00
Ted John f46b97192a Implement lift hill and cable lift cases 2016-10-08 23:20:29 +01:00
Ted John bc36bb48a2 Trim common calls out direction switch 2016-10-08 22:20:59 +01:00
Ted John 643247237c Use rotated paint functions for easier manual transform 2016-10-08 22:07:42 +01:00
Ted John 23246c2d3f Merge cases with identical calls 2016-10-08 21:49:28 +01:00
Ted John 04a468c9a0 Support mirror calls for various other tracks 2016-10-08 19:16:46 +01:00
Ted John 4d87d010de Support mirror calls for helix 2016-10-08 18:47:44 +01:00
Ted John 313f766fad Support mirror calls for turn eighth 2016-10-08 16:33:17 +01:00
Ted John 47ccfdb73c Support mirror calls for turn 1 2016-10-08 16:15:22 +01:00
Ted John 4a0d18c0a7 Support mirror calls for turn 3 2016-10-08 16:02:59 +01:00
Ted John 2b4c0b2fd9 Support mirror calls for turn 5 2016-10-08 15:51:09 +01:00
Ted John 70113689eb Generate some mirror calls 2016-10-08 14:37:10 +01:00
Ted John 2cec1de4d0 Generate support calls 2016-10-08 14:05:52 +01:00
Ted John 2249a63073 More improvements to function names and fix maze anomaly 2016-10-08 13:50:12 +01:00
Ted John a505d77a9c Improve naming of functions 2016-10-08 13:16:09 +01:00
Ted John 0c3f8da3b2 Support sub_98196C too 2016-10-08 13:02:34 +01:00
Ted John fd456d1b7c Generate paint calls for all track sequences 2016-10-08 01:11:41 +01:00
Ted John 24f143bb2a Generate paint calls 2016-10-08 00:59:27 +01:00
Ted John e17180db08 Generate basic tunnels 2016-10-08 00:27:07 +01:00
Ted John ec082b4ac8 Generate set segment support height and other fixes 2016-10-07 23:55:17 +01:00
Ted John a0f041b43a Start initial generation of ride and general support calls 2016-10-07 21:49:23 +01:00
Ted John a8a4c0deb4 testpaint: Print sprite_bb info for 7C / 9C calls 2016-10-07 20:47:13 +01:00
Michał Janiszewski 9966052ca7 Fix more configurations 2016-10-06 23:32:10 +02:00
Michał Janiszewski 9da9b6f29a Remove unnecessary sprintf 2016-10-06 23:13:28 +02:00
Michał Janiszewski 4bfd5c6f4c Hide unused variables in some configurations 2016-10-06 23:13:28 +02:00
Ted John df65f3686c testpaint: Test chain lift and improve general support height assertion 2016-10-05 22:16:46 +01:00
Michał Janiszewski 43eba72f66 Fix testpaint for GCC 2016-10-02 10:41:03 +02:00
Ted John 6d047924c2 Compile track_element_is_lift_hill for testpaint 2016-10-01 18:03:31 +01:00
Ted John b977304996 Allow testpaint to build without SolutionDir being set 2016-10-01 16:58:30 +01:00
Ted John 25aabf6470 Fix heap overflow in testpaint 2016-10-01 12:43:03 +01:00
Marijn van der Werf 4860f0c6ab Add sprite group for spiral slide fences 2016-10-01 01:20:44 +02:00
Ted John 0070f0d057 Add listing of ride types, inc. status in testpaint 2016-09-24 11:54:45 +01:00
Ted John cdb85023a6 Rollback .user files 2016-09-24 11:21:04 +01:00
Ted John a4b75fd84a Allow test ignoring 2016-09-24 11:21:04 +01:00
Ted John 21bb6c507d Fix bugs spotted by testpaint 2016-09-24 11:20:12 +01:00
Ted John 0c569e6b02 Add support for passing a single ride type to testpaint 2016-09-24 11:20:12 +01:00
Ted John fd4103d8f5 Move sub_98197C_rotated and sub_98199C_rotated to helpers source 
Because paint.c can't be used by testpaint.
 2016-09-24 11:20:12 +01:00
Ted John 9fe4a9b41f Add support for Windows coloured console 2016-09-24 11:20:12 +01:00
Ted John 843d865f01 Fix passing defines for msbuild proj 2016-09-21 00:06:24 +01:00
Ted John 1c6f964773 Integrate _viewportDpi1 and _viewportDpi2 2016-09-17 13:38:18 +01:00
Ted John edb918a883 Fix heap overflow in getTunnelEdgeString 2016-09-16 18:59:41 +01:00
Ted John dbb822ad35 Ignore zero sized array warning to fix VS builds 2016-09-16 19:45:25 +02:00
Marijn van der Werf c233e0491a Improve tunnel offset detection 2016-09-16 19:45:24 +02:00
Marijn van der Werf 52282e399b Use named addresses for bound box catching 2016-09-16 19:45:22 +02:00
Marijn van der Werf 9ca2f89831 Improve test output 2016-09-16 19:45:21 +02:00
Marijn van der Werf c526d0da3f Rename default palette options 2016-09-16 19:45:13 +02:00
Marijn van der Werf 5524bd0e14 Print address of failed function 2016-09-16 19:45:11 +02:00
Marijn van der Werf 1c585e45e3 Improve Visual Studio compatibility 2016-09-16 19:45:10 +02:00
Marijn van der Werf 987bfa409a Improve track type support check 2016-09-16 19:45:09 +02:00
Marijn van der Werf f2f99d7bb1 Improve environment simulation 2016-09-16 19:45:08 +02:00
Marijn van der Werf 4e4a07d1b0 Update testpaint to match develop 2016-09-16 19:45:07 +02:00
Marijn van der Werf 1cc43d5012 Add missing compat function 2016-09-16 19:45:05 +02:00
Marijn van der Werf 0f51be809c Update code to match develop 2016-09-16 19:45:04 +02:00
Marijn van der Werf 2d688e1056 Expand message for support height mismatch 2016-09-16 19:45:03 +02:00
Marijn van der Werf 8af6dd1577 Attempt to fix size mismatch 2016-09-16 19:45:02 +02:00
Ted John 527d18c9f1 Fix testpaint.vcxproj 2016-09-16 19:45:00 +02:00
Michał Janiszewski 88ffe5f8c2 Fixes for testpaint 
Test of `paint_launched_freefall_tower_section` is invalid. Do note this
function [expects another element right past the one just
passed](https://github.com/OpenRCT2/OpenRCT2/blob/d00aa2c/src/ride/thrill/launched_freefall.c#L147):

```
rct_map_element * nextMapElement = mapElement + 1;
```

but you pass only a single map element, which is not marked as last for
tile. The same prevails throughout other tests.
 2016-09-16 19:44:56 +02:00
Michał Janiszewski ef008d6fd2 Fixes for GCC6.1 on Linux 
GCC6.1 does not support non-trivial designated initializers, but there
are so few fields used, they don't have to be used.
 2016-09-16 19:44:55 +02:00
Michał Janiszewski eed46dc367 Fixes for testpaint on Linux 2016-09-16 19:44:54 +02:00
Ted John f13e5c9e3a Add painttest to openrct2.proj 2016-09-16 19:44:54 +02:00
Marijn van der Werf fdbb4998f6 Add vertical tunnel testing 2016-09-16 19:44:53 +02:00
Marijn van der Werf 95f68a3e6a Validate side tunnel calls 2016-09-16 19:44:52 +02:00
Marijn van der Werf a904391a6d Get expected tunnel pattern 2016-09-16 19:44:52 +02:00
Marijn van der Werf 66310a6285 Add check for general supports 2016-09-16 19:44:50 +02:00
Marijn van der Werf 52e4800660 Add rough version of support segment checking 2016-09-16 19:44:49 +02:00
Michał Janiszewski f354c0ec3f Fix testpaint target for Linux 2016-09-16 19:44:45 +02:00
Ted John de5aa4b7d6 Fix VS solution and test 2016-09-16 19:44:43 +02:00
Ted John a30f2b8f7f Remove x64 configurations from vs project 2016-09-16 19:44:42 +02:00
Ted John 5f0f49be46 Move testpaint vs project to new location 2016-09-16 19:44:41 +02:00
Marijn van der Werf df202d86a6 Change folder structure 2016-09-16 19:44:40 +02:00