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

15004 Commits

Author SHA1 Message Date
frutiemax d969e93ea1
Fix #12112: Move TrackColourPreviews to RideTypeDescriptors (#12114) 2020-07-03 22:15:11 +02:00
Tulio Leao 3ba505e5bd
Merge pull request #11956 from hdpoliveira/loc_6DB38B 
Simplify code related to V-angle and bank
 2020-07-03 15:16:08 -03:00
Tulio Leao 99b39f04e7
Do not try to force dimensions of a rectangle (#12115) 2020-07-03 09:28:30 +02:00
frutiemax 4661262572
Fix #12085: Use ScreenCoordsXY on clip_drawpixelinfo (#12105) 2020-07-02 14:06:28 -03:00
frutiemax 67a8d833ea
Part of #11159: ImageImporter::ImportResult uses std::vector (#12076) 2020-07-02 14:04:49 -03:00
annoyingdroid 53e8816881
Close #12086: Use ScreenCoordsXY on gfx_draw_pixel (#12104) 2020-07-02 12:10:37 -03:00
frutiemax 26ae2dbf04
Part of #11437: Move PlatformFileExists to Platform2.h (#12077) 2020-07-02 12:03:31 -03:00
frutiemax cb4eba701f
Part of #11159: Remove malloc and free in openrct2-win.cpp (#12075) 2020-07-02 12:00:49 -03:00
annoyingdroid 5056872676
Close #12087: Use ScreenCoordsXY on gfx_filter_pixel (#12102) 2020-07-02 11:08:46 -03:00
Duncan cd716ca4aa
Fix #12093. Incorrect position and animation of staff tab. (#12094) 
Mistake made when refactoring transposed two digits. Additional mistake made when removing a variable that was unused that changed the memory layout of the window. This meant that a part of the code that accessed a different variable in a union fetched the wrong memory. This was a mistake ultimately made during implementation.
 2020-07-02 09:19:19 -03:00
Michael Steenbeek 920115448e
Merge pull request #12088 from tupaschoal/coords-extract-reuse 
Generic coords structs for reusability
 2020-07-02 12:07:10 +02:00
Casey Johnson 2e0f0d3821
Fix #12062: Add chain lift to Flying Coaster pieces when inverted (#12091) 2020-07-02 10:40:59 +02:00
Casey Johnson fc43494d74
Feature: Add Boosters to Wooden Roller Coaster (#12090) 2020-07-02 01:52:33 +02:00
Tulio Leao b5195f77c4 Reuse Rectangle definitions for ScreenRect and MapRange 2020-06-30 09:44:28 -03:00
Tulio Leao a86a60cbf5 Extract ScreenRect from Graph for reusability 2020-06-30 09:32:22 -03:00
Tulio Leao 5ce65eb7dc Create ScreenLine struct 2020-06-30 09:26:42 -03:00
Tulio Leao 70e245a1c3 Add Coords constructor to Map and CoordsRange 2020-06-30 09:12:14 -03:00
Tulio Leao 701f7f6d67 Extract base CoordsRange class from MapRange 
Enforce MapRange to be rectangle shaped
 2020-06-30 09:00:20 -03:00
Gymnasiast 8b6cb7e943
Add config enum name for Forint 2020-06-30 11:27:01 +02:00
Gymnasiast fe402f8bc4
Fix name of 'Deutsche mark' 2020-06-30 11:24:42 +02:00
Michael Steenbeek 33e86ce0d8
Merge pull request #12016 from tupaschoal/screen-coords-string 
Make interfaces use ScreenCoordsXY instead of x-y
 2020-06-30 08:37:14 +02:00
Duncan c723a1a314
Fix #12079: incorrect drawing of attached paint structs (#12082) 
* Fix #12079: incorrect drawing of attached paint structs

The issue is caused by the paint_struct x and y coordinates being incorrectly marked as unsigned. Unfortunately they cannot easily be converted without careful rework. Therefore this is a stop gap until the type is changed to preferably a ScreenCoords.
 2020-06-29 19:13:23 -03:00
finicu212 ec33551b24
Fix #12021: Tie coords on gfx_draw_sprite_raw_masked_software (#12080) 
Make gfx_draw_sprite_raw_masked_software use ScreenCoordsXY object
 2020-06-29 18:38:03 -03:00
Duncan 0f106da7eb
Fix #12065 again. Fixed track design previews with diagonals (#12074) 
Unsure when mistake was made but there was a variety of issues with this section of code. The rotation of the entrance was meant to be relative to the track design rotation not the last track pieces rotation. This caused issues for tracks that were not complete circuits. In addition there was a mistake for diagonal track pieces where the location of the end piece was not incremented this caused the diagonal piece to act as though it didn't exist breaking the preview.
 2020-06-29 10:58:31 -03:00
Tulio Leao b6f252f68e Make gfx_draw_sprite_raw_masked use ScreenCoordsXY 2020-06-29 10:29:05 -03:00
Tulio Leao b0c10f979b Make gfx_draw_glyph use ScreenCoordsXY 2020-06-29 10:26:35 -03:00
Tulio Leao 79d007c780 Make ttf_draw_string use ScreenCoordsXY 2020-06-29 10:25:49 -03:00
Tulio Leao 592b54d354 Make gfx_draw_string_with_y_offsets use ScreenCoordsXY 2020-06-29 10:25:49 -03:00
Tulio Leao b7dc5057e5 Make gfx_draw_string_centred_wrapped_partial use ScreenCoordsXY 2020-06-29 10:25:44 -03:00
Tulio Leao 1717f2a9a3 Make draw_string_centred_raw use ScreenCoordsXY 2020-06-29 10:23:54 -03:00
Tulio Leao a0ed2c181e Make gfx_draw_string_left_centred use ScreenCoordsXY 2020-06-29 10:23:54 -03:00
frutiemax 5ae592ec79
Part of #11437: Move GetDateLocal and GetTimeLocal in Platform2.h 2020-06-28 21:46:14 +02:00
Michael Steenbeek bdbf12892b
Merge pull request #12068 from duncanspumpkin/fix_12065 
Fix #12065. Incorrect Entrance/Exit location on td preview
 2020-06-28 12:08:27 +02:00
frutiemax fec55f590f
Part of #11159: limit_autosave_count uses std::vector instead of utf8** (#12054) 2020-06-28 09:12:13 +01:00
duncanspumpkin 6dfcc1a8b2 Fix #12065. Incorrect Entrance/Exit location on td preview 
Unsure when the mistake was made but it could have been prevented by using const on variables that should be const.
 2020-06-28 09:05:14 +01:00
TomasZilinek f08206a5d0
Fix #11963 - Refactor Peep::OutsideOfPark (#12060) 
* Fix #11963 - Refactor Peep::OutsideOfPark

Changed the definition of Peep::OutsideOfPark from uint8_t to bool and refactored all its occurences in code accordingly.

* Fix #11963 - Refactor Peep::OutsideOfPark

One forgotten instance of Peep::OutsideOfPark occurrence

* Fix #11963 - Refactor Peep::OutsideOfPark

Fix code according to a review suggestion.
 2020-06-28 08:39:30 +01:00
Aaron van Geffen 2cb5402069 Introduce widget::textTop 2020-06-26 19:39:30 +02:00
Aaron van Geffen 2e153a7e95 Introduce widget::midX and widget::midY helper functions 2020-06-25 10:31:15 +02:00
Aaron van Geffen 681b8d7938
Introduce widget::width and widget::height helper functions (#12053) 2020-06-24 22:44:00 -03:00
frutiemax 14a07359b3
Part of #11389: Use formatter class for Ride::FormatNameTo (#12041) 2020-06-24 21:02:08 -03:00
Michael Steenbeek a102892370
Merge pull request #11985 from AaronVanGeffen/windows/object-selection 
Increase widget heights in object selection window
 2020-06-24 23:09:10 +02:00
TomasZilinek 4974d1a9b0
Fix #12050: scenario options initial happiness value misplaced 
Fix a mistake made in PR #11984.
 2020-06-24 19:42:03 +02:00
TomasZilinek cd6076b5bc
FIx #12017 - Create gfx_draw_sprite overload (#12049) 
Second and final part. replaces the rest of the calls and removes the old function.
 2020-06-24 12:48:17 -03:00
Michael Steenbeek f330a22df1
Merge pull request #12030 from tupaschoal/more-coords-stuff 
Small CoordsXY* Refactor
 2020-06-24 13:07:37 +02:00
TomasZilinek 9d965ccfb6
Part of #12017 - create gfx_draw_sprite overload (#12026) 
* Part of #12017 - create gfx_draw_sprite overload

Part 1. Creates the overload and replaces about a half of the calls since there are too many for one PR.

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-06-23 18:32:34 -03:00
frutiemax d2542194fa
Part of #11437: move window_setup_file_association(s) in Platform2.hpp 2020-06-23 22:58:40 +02:00
frutiemax 6e47385b90
Part of #11389 : in peep class, FormatTo* use Formatter class (#12035) 2020-06-23 14:52:08 +01:00
frutiemax 32c342e88d
Part of #11389: Remove FormatTexto that take void* in banner struct (#12034) 2020-06-23 14:50:56 +01:00
Tulio Leao abcb50ff96 Make staff_can_ignore_wide_flag use CoordsXYZ 2020-06-23 00:13:01 -03:00
frutiemax f86931d8a0
Close #12019: Use ScreenCoordsXY on gfx_draw_sprite_software 2020-06-22 23:52:54 +02:00
frutiemax 4a17d1d64e
Fix #12020 - Use ScreenCoordsXY on gfx_draw_sprite_palette_set_software (#12028) 
* Fix #12020 - Use ScreenCoordsXY on gfx_draw_sprite_palette_set_software

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-06-21 22:52:48 -03:00
Tulio Leao caeed92cf0 Make staff_is_location_on_patrol_edge use CoordsXY 2020-06-21 16:41:18 -03:00
Tulio Leao 1a7943a5ab Make DrawOpenRCT2 use ScreenCoordsXY 2020-06-21 16:30:58 -03:00
Tulio Leao f535a4a0c4 Remove undefined and unused wall_remove function 2020-06-21 16:26:51 -03:00
Tulio Leao ad529c7f6c Use const ref on MoneyEffect::Create 2020-06-21 14:32:01 -03:00
Tulio Leao f6dae982a6 Make MoneyEffect::CreateAt use CoordsXYZ 2020-06-21 14:32:01 -03:00
Tulio Leao 3c75481d8a Make litter_can_be_at use CoordsXYZ 2020-06-21 14:32:01 -03:00
Tulio Leao 40a7dfbb24 Make litter_create use CoordsXYZD 2020-06-21 14:32:01 -03:00
Tulio Leao 7622ca513e Make litter_remove_at use CoordsXYZ 2020-06-21 14:06:56 -03:00
Tulio Leao e24de95b82 Make sprite_get_first_in_quadrant use CoordsXY 2020-06-21 14:03:35 -03:00
Tulio Leao f329644dd5 Make sprite_misc_explosion_flare_create use CoordsXYZ 2020-06-21 14:00:37 -03:00
Tulio Leao 2e31a7d64d Make sprite_misc_explosion_cloud_create use CoordsXYZ 2020-06-21 13:58:13 -03:00
Tulio Leao ae1e9b75ed Make sprite_set_coordinates use CoordsXYZ 2020-06-21 13:50:54 -03:00
Tulio Leao d5c7063214 Make create_balloon use CoordsXYZ 2020-06-21 13:43:42 -03:00
Tulio Leao 15bad3898d Make crash_splash_create use CoordsXYZ 2020-06-21 13:41:11 -03:00
Tulio Leao 030686dc6b Make crashed_vehicle_particle_create use CoordsXYZ 2020-06-21 13:35:43 -03:00
Hudson Oliveira 0d20b52949
Part of #9473: Vehicle sounds update functions (#12001) 
* Extract functions for sound frequency

* Pass only SoundId and volume to sounds update

* Create class Sound

* Pass only the corresponding Sound object

* Unify update sound functions

* Fix compilation errors

* Rename Sound1|2 to TrackSound and OtherSound
 2020-06-21 17:16:32 +01:00
TomasZilinek 69db54f770
Fix #12018 - gfx_draw_sprite_solid overload (#12023) 
Creates the overload, replaces all calls to the old function and removes the old function.
 2020-06-21 11:50:05 -03:00
TomasZilinek 9efe43fa59
Fix #11562 - gfx_draw_string_left_wrapped overload (#12015) 
I created the overload, replaced remaining calls with the new function and removed the old function.
 2020-06-21 06:25:31 -03:00
Hudson Oliveira ef5f117373
Part of #9473: Create Vehicle::GetRide (#12002) 
* Part of #9473: Create Vehicle::GetRide

* Redefine Vehicle::GetRide in Compat.cpp
 2020-06-21 08:38:53 +01:00
Hudson Oliveira d82789733e
Part of #9473: Create Vehicle::Sub6DBF3E (#12013) 2020-06-20 16:21:23 -03:00
Duncan f204785c5c
Fix Action Location for SurfaceSetStyle (#12012) 
LocationValid function was not being called in LandSmoothAction. This did not cause issues as the nested call to land set height would check for valid locations.
 2020-06-20 16:17:52 -03:00
TomasZilinek c1546059ad
Close #11571 - Remove <x,y> gfx_draw_string_left overload (#12010) 
Third and final part. replaces the rest of the calls to x,y overload
 2020-06-20 16:09:45 -03:00
TomasZilinek 2264c5f7f1
Part of #11571 - Use gfx_draw_string_left with ScreenCoordsXY (#12008) 2020-06-20 11:56:36 -03:00
Michael Steenbeek 82618f2441
Merge pull request #11972 from Gymnasiast/fix/7324 
Fix #7324: Research window shows vehicle name instead of ride name
 2020-06-20 13:46:31 +02:00
Hudson Oliveira 28c9ddd706
Part of #9473: Create Vehicle::GetRideEntry (#12003) 2020-06-20 00:25:40 -03:00
TomasZilinek e93e32d139
Part of #11571: create gfx_draw_string_left() overload (#11984) 
Replaces a third of all occurrences of the old function
 2020-06-20 00:22:01 -03:00
Tulio Leao 8c77d31c54
Merge pull request #11998 from hdpoliveira/move_info 
Part of #9473: Create GetMoveInfo and GetTrackProgress
 2020-06-20 00:09:28 -03:00
Michael Steenbeek 934673115f
Merge pull request #11993 from hdpoliveira/animate_door 
Part of #9473: Scenery door functions
 2020-06-19 23:43:31 +02:00
Gymnasiast f8699d1244
Apply review requests; fix error; remove debug code 2020-06-19 23:35:18 +02:00
frutiemax 57b50e46df
Part of #11964: Move RideTypeEnumNames to RideTypeDescriptors 2020-06-19 23:03:24 +02:00
Gymnasiast 5029f754ed
Fix #7324: Research window shows vehicle name instead of ride name 2020-06-19 22:50:53 +02:00
hdpoliveira f5ac20176b Use template parameter 2020-06-19 17:42:09 -03:00
hdpoliveira 92584d57f0 Use CamelCase on function name 2020-06-19 17:38:57 -03:00
hdpoliveira c35556d754 Use CamelCase on track functions 2020-06-19 17:35:21 -03:00
frutiemax 51f32130b3
Part of #11964: Merge RideColourKey in RideTypeDescriptor (#11996) 2020-06-19 20:21:16 +02:00
Ted John 5a7fbc8054
Fix #11961: Plugins: ViewportWidget unable to be moved or resized (#11997) 
- Ensure child controls for dropdown and spinners are moved.
- Ensure viewport bounds are re-calculated if widget is moved / resized.
 2020-06-19 20:20:58 +02:00
hdpoliveira 0bdbcbcd88 Part of #9473: Create Vehicle::GetTrackProgress 2020-06-19 15:02:35 -03:00
hdpoliveira f33f3c07bd Part of #9473: Create Vehicle::GetMoveInfo 2020-06-19 15:02:35 -03:00
hdpoliveira 23afe3c453 Extract function animate_scenery_door 2020-06-19 14:41:07 -03:00
hdpoliveira 066ae4d58d Add const to methods 2020-06-19 14:41:05 -03:00
hdpoliveira 06a3f01730 Create Vehicle::UpdateSceneryDoorBackwards 2020-06-19 14:40:36 -03:00
hdpoliveira 64b6e2a2ee Create Vehicle::UpdateSceneryDoor 2020-06-19 14:40:32 -03:00
Hudson Oliveira ea9dd60b91
Part of #9473: Create Vehicle::UpdateGoKartAttemptSwitchLanes (#11995) 2020-06-19 14:06:21 -03:00
frutiemax 57b121d448
Part of 11964: move RideColourPresets to RideTypeDescriptors 2020-06-19 18:04:43 +02:00
hdpoliveira 93b2872747 Rename v-angle to pitch and bank to roll 2020-06-19 12:23:16 -03:00
hdpoliveira 4ce425b436 Fix type issues 2020-06-19 11:18:59 -03:00
hdpoliveira 23cf4b580e Remove global _vehicleVAngleAndBank 2020-06-19 11:17:46 -03:00
hdpoliveira affa0dd30b Create struct VAngleAndBank and simplify code 2020-06-19 11:16:52 -03:00
Tulio Leao 6a8d9007e2
Close #11614: Require plugins to specify their license 2020-06-19 16:14:33 +02:00