Commit Graph

6582 Commits

Author SHA1 Message Date
frutiemax 280a21fa30
Fix #12095: Use ScreenRect on gfx_set_dirty_blocks (#12106) 2020-07-08 13:16:24 -03:00
Tulio Leao b69d48c3ed
Merge pull request #12154 from tupaschoal/coords-text
Use only ScreenCoordsXY for Text.cpp
2020-07-08 12:30:21 -03:00
Tulio Leao d95a0268ef
Merge pull request #11909 from Gymnasiast/fix/more-constants
Use more constants/specific types
2020-07-08 10:18:11 -03:00
Tulio Leao 59236443ba Make StaticLayout::Draw use ScreenCoordsXY 2020-07-08 10:15:02 -03:00
Tulio Leao dabde880cd Make DrawTextEllipsisedCompat use ScreenCoordsXY 2020-07-08 10:13:03 -03:00
Tulio Leao 16147dec64 Make DrawTextCompat use ScreenCoordsXY 2020-07-08 10:13:03 -03:00
Tulio Leao 69b3c97537 Make DrawText use ScreenCoordsXY 2020-07-08 10:13:03 -03:00
Tulio Leao 2ee1a9d9db
Use TitleCase on StaticLayout (#12155) 2020-07-08 09:43:23 -03:00
Gymnasiast 7cc510f6b7
Increment network version 2020-07-07 21:14:16 +02:00
Gymnasiast bf5ffdf497
Clean up favourite ride 2020-07-07 21:13:42 +02:00
Gymnasiast e8d6383f57
Clean up voucher arguments 2020-07-07 21:13:40 +02:00
Gymnasiast db764445ed
Clean up photo refs 2020-07-07 21:13:10 +02:00
Gymnasiast 65fa08ef35
Clean up GuestHeadingToRideId 2020-07-07 21:13:10 +02:00
Gymnasiast 0dd5b3bbda
Clean up current_ride 2020-07-07 21:13:09 +02:00
Duncan 8c1aa43ef4
Add TryGetEntity to fetch entity objects easily (#11979)
Implement TryGetEntity and use it
2020-07-07 13:13:22 -03:00
Duncan 94b3598102
Tiny GetEntity Refactor (#12124)
* Use default template parameter instead of specialising

* Fix null deref issues
2020-07-06 22:02:25 +01:00
Hudson Oliveira 8b5f3b58c5
Part of #9473: Create Vehicle::UpdateMotionCollisionDetection (#11949)
Converted from vehicle_update_motion_collision_detection
2020-07-06 13:57:09 -03:00
Michael Steenbeek f7b42a0254
Merge pull request #11980 from duncanspumpkin/CreateSprite8
SpriteList enum class
2020-07-06 15:21:16 +02:00
Thamara Andrade 8ce799a72e
Close #12118: Prefer foward declaration of *Coords* in headers (#12142)
* Removing unnecessary world/Location includes in headers
* Prefer foward declaration of *Coords* in header files
Closes #12118
2020-07-06 10:10:39 -03:00
Tulio Leao f725fff2da
Clarify CoordsRange-derived interface methods (#12127) 2020-07-06 14:42:11 +02:00
duncanspumpkin 57d2877e67 Provide accesor function for get entity list count 2020-07-05 07:28:38 +01:00
annoyingdroid ad86f7b023
Part of #12098: Use ScreenRect on gfx_filter_rect (#12120)
* Added a gfx_filter_rect function using ScreenRect
2020-07-04 15:16:09 -03:00
frutiemax bee0b4b82d
Part of #11159: Optimize util_zlib_deflate return (#12111) 2020-07-04 09:21:50 -03:00
duncanspumpkin 64ab101b4e Fix formatting and comment 2020-07-04 07:38:11 +01:00
duncanspumpkin e51bbeed23 Convert SPRITE_LIST to an enum class 2020-07-04 07:38:11 +01:00
duncanspumpkin 2d28ca3b28 Remove broken check_for_spatial_index_cycles
There were a number of issues with this function. It was calling index_is_in_list with invalid SPRITE_LISTs. The spatial index is no longer needed to be correct on save/load as it is rebuilt so that it is kept in order.
2020-07-04 07:38:11 +01:00
DrunkBlood 55f0f34fe0
Close #12101: gfx_draw_dashed_line to use ScreenLine (#12116) 2020-07-03 18:05:18 -03:00
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
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
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
frutiemax fec55f590f
Part of #11159: limit_autosave_count uses std::vector instead of utf8** (#12054) 2020-06-28 09:12:13 +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
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
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
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
hdpoliveira d3d853b7d6 Make loc_6DB38B receive only the update flag 2020-06-19 11:14:02 -03:00
Olivier Wervers e280b413c0
Fix plugin get car entities returning null elements (#11988) 2020-06-18 21:50:06 +01:00
Michael Steenbeek ab9b8cd57e
Merge pull request #11983 from frutiemax/11964_RatingsCalculate 2020-06-18 18:22:11 +02:00
frutiemax 642f4f83a8 Merge RideRatingsCalculateFuncTable in RideTypeDescriptor 2020-06-18 09:29:27 -04:00
Michael Steenbeek 5e8a3a709d
Merge pull request #11976 from Gymnasiast/refactor/vehicle-preference
Move build menu preference to objects themselves
2020-06-17 23:41:10 +02:00
Duncan bb34213b93
MapCanConstructAt refactor (#11977)
* Start using MapCanConstructAt

* Fix #11675. Pass the full error message arguments on peep pickup

This was causing a crash as the error message arguments were being cleared which would mean eventually a nullptr dereference would happen.
2020-06-17 22:35:13 +01:00
Michael Steenbeek 2013e1a36f
Merge pull request #11974 from Gymnasiast/refactor/ride-type-misc
Refactor/ride type misc
2020-06-17 23:15:30 +02:00
Michael Steenbeek 8a4724a691
Move covered track piece availability to RTD 2020-06-17 23:15:05 +02:00
frutiemax f6eb9f1cc5
Merge RideRatings in RideTypeDescriptor structure (#11975) 2020-06-17 22:22:52 +02:00
Gymnasiast 2ee21e360c
Bump network version 2020-06-17 21:46:54 +02:00
Gymnasiast c77d500394
Move build menu preference to objects themselves 2020-06-17 21:46:37 +02:00
Michael Steenbeek e2b187c24a
Merge pull request #11921 from duncanspumpkin/CreateSprite6
Entity List Iterator
2020-06-17 21:28:36 +02:00
Gymnasiast 2a9c2be7d0
Remove unused function 2020-06-17 19:11:02 +02:00
Gymnasiast 682b15343b
Create RCT2_RIDE_TYPE_COUNT 2020-06-17 19:10:39 +02:00
frutiemax de1c172c74
Move RideProperties and rideBonusValue to RideTypeDescriptors
Part of #11964.
2020-06-17 18:59:04 +02:00
Gymnasiast f0872ab7b8
Replace 'bumper cars' with 'dodgems' 2020-06-17 18:13:00 +02:00
Gymnasiast 9e702d9e01
Replace 'Bathroom' with 'Toilet' 2020-06-17 18:12:13 +02:00
Olivier Wervers 66c3d8d828
Expose park name to plugins (#11970) 2020-06-17 17:33:38 +02:00
Michael Steenbeek 5e3a99a9ac
Move RideTypeTrackPaintFunctionsOld declaration to TestPaint (#11969) 2020-06-17 13:52:10 +02:00
Michael Steenbeek 97b99122de
Merge pull request #11962 from Gymnasiast/refactor/rtd-rtd-rtd
Move RideNaming, RideHeights and max mass to RTDs
2020-06-17 13:06:26 +02:00
Michael Steenbeek ba5e730c06
Rename UpdateFlag to HasUpdateFlag; refactor to bool (#11966) 2020-06-17 00:05:37 -03:00
Gymnasiast f16a80a481
Fix typo in VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP 2020-06-16 23:31:34 +02:00
Gymnasiast 96678a14eb
Move ride naming to RTD
This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
2020-06-16 22:52:48 +02:00
Duncan 50d22ededd
Create a hookable location checking function for actions (#11860)
* Create a hookable location checking function for actions

* Add location valid to a number of game actions

Actually pass the coordinates to the script

Use LocationValid on further game actions

Add further actions to the LocationValid. Update api

Update remaining actions to use LocationValid

* Fix bug with peep pickup

Adjust api
2020-06-16 20:57:11 +01:00
duncanspumpkin 8eb7356320 Simplify iterator class 2020-06-16 20:27:44 +01:00
duncanspumpkin 6ed17b4ff9 Remove FOR_ALL_PEEPS/GUESTS/STAFF macros
Replaced with an EntityList iterator

Fix formatting

Fix nullptr issues
2020-06-16 20:27:44 +01:00
duncanspumpkin c45a0536eb Use new class 2020-06-16 20:27:40 +01:00
duncanspumpkin 225ae3a0a9 Add EntityList iterator 2020-06-16 20:26:56 +01:00
duncanspumpkin a30374d200 Use new iterator
Fix mac builds

Fix minor mistake

Fix vehicle loops
2020-06-16 20:25:47 +01:00
duncanspumpkin 133d8c4a0a Implement GetSprite and use it in a number of places
This will eventually replace all of the get_sprite and try_get_sprite calls

Further use of GetSprite

Use GetSprite in all remaining easy to use functions

Correct formatting

Rename GetSprite to GetEntity

Make suggested changes

Remove const to allow for building

Fix crashes due to next sprite
2020-06-16 20:25:03 +01:00
duncanspumpkin 904e6c6987 Implement GetSprite and use it in a number of places
This will eventually replace all of the get_sprite and try_get_sprite calls

Further use of GetSprite

Use GetSprite in all remaining easy to use functions

Correct formatting

Rename GetSprite to GetEntity

Make suggested changes

Remove const to allow for building

Fix crashes due to next sprite
2020-06-16 20:21:56 +01:00
Gymnasiast 9cf12e763d
Move RideHeights and max mass to RTDs 2020-06-16 20:57:55 +02:00
Gymnasiast 140f2d6922
Rename rct_ride_data_5 and its fields to RideHeights 2020-06-16 20:17:07 +02:00
Gymnasiast 2eccef5979
Split max_mass from rct_ride_data_5 2020-06-16 20:00:25 +02:00
Irrelevant Irreverent db85f0c78b Bump network version 2020-06-16 09:08:04 -04:00
Irrelevant Irreverent 416fb64e74 Use proper prefix for track piece comments 2020-06-16 08:51:00 -04:00
Irrelevant Irreverent 6c911f203d Fix spacing in track info and adjust comments 2020-06-16 08:24:20 -04:00
Irrelevant Irreverent fc25fb68de Add info for go-kart lanes on some track pieces 2020-06-16 08:19:31 -04:00
Michael Steenbeek 8c67eede5b
Name track vehicle info lists (#11960) 2020-06-16 12:35:13 +01:00
Hudson Oliveira 994dea2722
Pass only TrackLocation instead of whole vehicle (#11954) 2020-06-16 13:01:25 +02:00
Tulio Leao 1336e8ad86
Merge pull request #11900 from hdpoliveira/news_cpp
Create functions for const access to News queues and refactor use
2020-06-15 22:56:29 -03:00
Duncan 78d062943b
Fix #11953: Incorrect shade used for wall banner text 2020-06-15 23:04:34 +02:00
Sohil Adwani 03f016e9ef
Smart pointers (#11852)
* Part of #11159 Added smart pointers to a few functions

* Use camelCase for variables

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-06-15 19:47:07 +01:00
Hudson Oliveira feb3fcfd6e
Remove gotos from TrackMotionForwardsGetNewTrack (#11955)
* Remove gotos from TrackMotionForwardsGetNewTrack

* Move default case to the bottom of the switch

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-06-15 01:25:13 +02:00
Duncan 1e5739b739
Vehicle motion update: small cleanup; work towards unifying code paths 2020-06-14 22:54:34 +02:00
Tulio Leao 112ac33a24
Merge pull request #11952 from tupaschoal/draw_string_centred_11564
Use ScreenCoordsXY for gfx_draw_string_centred_clipped
2020-06-14 17:42:15 -03:00
hdpoliveira a3fe90c250
Create SpriteBase::Invalidate methods (#11948) 2020-06-14 15:18:07 -03:00
Tulio Leao 613cec3f7a Part of #11564: gfx_draw_string_centred_clipped with ScreenCoordsXY 2020-06-14 12:26:53 -03:00
Tulio Leao ce171164c9
Merge pull request #11932 from tupaschoal/draw_string_right-11569
Use ScreenCoordsXY for gfx_draw_string_right
2020-06-14 12:11:10 -03:00
Tulio Leao e54a3d89f2
Rename some Peep member variables to use TitleCase (#11931)
* Rename Peep::destination_tolerance to use TitleCase

* Rename Peep::destination_y to use TitleCase

* Rename Peep::destination_x to use TitleCase

* Rename Peep::trousers_colour to use Title Case

* Rename Peep::tshirt_colour to use TitleCase

* Rename Peep::no_of_rides to use Title Case

* Rename Peep::staff_type to use TitleCase

* Rename Peep::type to use TitleCase

* Rename Peep::sprite_type to use TitleCase

* Rename Peep::sub_state to use TitleCase

* Rename Peep::state to use TitleCase

* Rename Peep::outside_of_park to use TitleCase

* Rename Peep::next_flags to use TitleCase

* Rename Peep::name to use TitleCase

* Rename Peep::NoOfRides to GuestNoOfRides

* Rename Peep::Type to AssignedPeepType

* Rename Peep::GuestNoOfRides to GuestNumRides
2020-06-14 06:31:08 +01:00
hdpoliveira 1b1f812fc9 Create functions for const access to News queues 2020-06-13 19:35:02 -03:00
Michael Steenbeek d695e1d071
Merge pull request #11942 from Gymnasiast/refactor/rtd-build-cost
Move build costs to RTD
2020-06-13 22:26:05 +02:00
Michael Steenbeek aff920c874
Add support for importing RCT Modified ride entrances (#11938) 2020-06-13 20:10:43 +02:00
Gymnasiast f66d103d9a
Move build costs to RTD 2020-06-13 18:48:53 +02:00
Gymnasiast b73b7e73e7
Move PriceEstimateMultiplier to ride_cost 2020-06-13 18:48:53 +02:00
Michael Steenbeek 8f29810e04
Move RideData4 to RideTypeDescriptors (#11939) 2020-06-13 11:29:00 +01:00
hdpoliveira 2dc98e6370
Remove regs use from minigolf vehicle functions (#11937)
* Remove regs use from UpdateTrackMotionMiniGolf

* Remove regs from UpdateTrackMotionMiniGolfVehicle
2020-06-13 07:56:35 +01:00
lightray22 082dfc4bb0
Fix build on OpenBSD (#11870)
Co-authored-by: ibara <ibara@users.noreply.github.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-06-12 16:45:22 +02:00
Duncan 319bab8978
Refactor fountain painting (#11891)
* Refactor fountain painting


Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-06-11 20:20:00 -03:00
Duncan b3d77dd6c9
Remove banner entry when deleting tiles with tile inspector (#11880) 2020-06-11 23:42:48 +02:00
hdpoliveira 5660a59c18
Fix #11914: Notification spam when opening a new scenario 2020-06-11 23:28:44 +02:00
Tulio Leao 8287ef4e7a
Merge pull request #11839 from IntelOrca/plugin/vehicle-entity
[Plugin] Add API for vehicles
2020-06-11 17:57:54 -03:00
hdpoliveira ea22d2c8de
Vehicle update 9473 11 (#11936)
* Part of #9473: Create Vehicle::UpdateTrackMotionForwardsGetNewTrack

Converted from vehicle_update_track_motion_forwards_get_new_track

* Part of #9473: Create Vehicle::UpdateTrackMotionBackwardsGetNewTrack

Converted from vehicle_update_track_motion_backwards_get_new_track
2020-06-11 21:19:11 +01:00
hdpoliveira 55bb2eaec9
Change all invalidate_sprite_2(Vehicle*) to Vehicle->Invalidate() (#11935) 2020-06-11 20:42:11 +01:00
Ted John a3aed8dce1 Update vehicle powered fields 2020-06-11 17:54:41 +01:00
Ted John c5b2b2017a Add vehicle API for plugins 2020-06-11 17:54:36 +01:00
Michael Steenbeek 2743629142
Merge pull request #11716 from hdpoliveira/vehicle_update_9473_10
Remove some of goto from vehicle_update_track_motion_mini_golf
2020-06-11 17:31:06 +02:00
Tulio Leao 03ba7e5301
Merge pull request #11933 from AaronVanGeffen/unused-vars
Patch unused variables
2020-06-11 12:12:06 -03:00
Aaron van Geffen 3090e2af79 Fix compilation failure due to unused vars.
Compilation fails due to warnings-turned-errors.
2020-06-11 15:22:06 +02:00
Tulio Leao fab0ea131f Part of #11569: Use gfx_draw_string_right with ScreenCoordsXY 2020-06-11 10:11:20 -03:00
Michael Steenbeek 1ea1d24f00
Use constant for 255 tile element height (#11928) 2020-06-10 23:18:26 +02:00
Tulio Leao eb154c7b48
Merge pull request #11915 from tupaschoal/prevent-shadow-peep-6
Rename some Peep member variables to use TitleCase
2020-06-10 14:49:21 -03:00
Michael Steenbeek cdcfcbfbe8
Remove no longer relevant CMake hack 2020-06-09 18:03:17 +02:00
Tulio Leao 5d57012390 Rename Peep::var_37 to Var37 2020-06-08 23:47:45 -03:00
Tulio Leao a993ad8408 Rename Peep::energy to Energy 2020-06-08 23:34:35 -03:00
Tulio Leao 1c59cc2aae Rename Peep::energy_target to EnergyTarget 2020-06-08 23:32:22 -03:00
Tulio Leao 92fbb9fc04 Rename Peep::happiness to Happiness 2020-06-08 23:30:27 -03:00
Tulio Leao 1b7223462f Rename Peep::happiness_target to use TitleCase 2020-06-08 23:27:47 -03:00
Tulio Leao e387539802 Rename Peep::nausea to Nausea 2020-06-08 23:25:37 -03:00
Tulio Leao 71dc82e79a Rename Peep::nausea_target to NauseaTarget 2020-06-08 23:21:17 -03:00
Tulio Leao 533695cbe6 Rename Peep::hunger to Hunger 2020-06-08 23:18:12 -03:00
Tulio Leao aad80d3390 Rename Peep::thirst to Thirst 2020-06-08 23:12:38 -03:00
Tulio Leao 3dd4adeb81 Rename Peep::toilet to Toilet 2020-06-08 23:10:18 -03:00
Tulio Leao 05cc016132 Rename Peep::mass to Mass 2020-06-08 23:07:31 -03:00
Tulio Leao 2fdf38a0a9 Rename Peep::time_to_consume to use TitleCase 2020-06-08 23:04:04 -03:00
Tulio Leao 4f9227fd83 Rename Peep::intensity to Intensity 2020-06-08 22:55:07 -03:00
Tulio Leao f1337768f5 Rename Peep::nausea_tolerance to use TitleCase 2020-06-08 22:41:15 -03:00
Tulio Leao f732c2f1cd Rename Peep::window_invalidate_flags to use TitleCase 2020-06-08 22:25:54 -03:00
Tulio Leao 1c566eebcb Rename Peep::paid_on_drink to PaidOnDrink 2020-06-08 20:23:14 -03:00
Tulio Leao 61a598edba Rename Peep::ride_types_been_on to use TitleCase 2020-06-08 20:10:15 -03:00
Tulio Leao 958ffabf15 Rename Peep::item_extra_flags to use TitleCase 2020-06-08 20:07:44 -03:00
Tulio Leao c2322d79c8
Merge pull request #11901 from tupaschoal/prevent-shadow-peep-5
Rename some Peep member variables to use TitleCase
2020-06-08 18:08:56 -03:00
Tulio Leao ea6b3aa05a Fix Peep watching state being based on wrong flag 2020-06-08 17:38:10 -03:00
Tulio Leao 18995664fe Use constant to check null Peep::CurrentRide 2020-06-08 17:38:10 -03:00
Tulio Leao 1ee5653c8c Rename Peep::photo2_ride_ref to use TitleCase 2020-06-08 17:36:35 -03:00
Tulio Leao 397c1137db Rename Peep::photo3_ride_ref to use TitleCase 2020-06-08 17:36:35 -03:00
Tulio Leao df87daaa6e Rename Peep::photo4_ride_ref to use TitleCase 2020-06-08 17:36:35 -03:00
Tulio Leao ccd76f8fc4 Rename Peep::current_ride to CurrentRide 2020-06-08 17:36:35 -03:00
Tulio Leao c302b16386 Rename Peep::current_ride_station to use TitleCase 2020-06-08 17:36:34 -03:00
Tulio Leao 1ac3b3d2dc Rename Peep::current_train to use TitleCase 2020-06-08 17:36:34 -03:00
Tulio Leao 335cbc900e Rename Peep::current_car to CurrentCar 2020-06-08 17:36:34 -03:00
Tulio Leao 1376dc45c0 Rename Peep::current_seat to CurrentSeat 2020-06-08 17:36:34 -03:00
Tulio Leao 7d25480a4d Rename Peep::time_to_sitdown to TimeToSitdown 2020-06-08 17:36:34 -03:00
Tulio Leao 267bec698f Rename Peep::time_to_stand to TimeToStand 2020-06-08 17:36:34 -03:00
Tulio Leao 355bebc63a Rename Peep::standing_flags to StandingFlags 2020-06-08 17:36:34 -03:00
Tulio Leao 3ad2471a24 Rename Peep::special_sprite to SpecialSprite 2020-06-08 17:36:34 -03:00
Tulio Leao 89a084cbc9 Rename Peep::action_sprite_type to use TitleCase 2020-06-08 17:36:34 -03:00
Tulio Leao 0d84779763 Rename Peep::next_action_sprite_type to TitleCase 2020-06-08 17:36:34 -03:00
Tulio Leao d9e36e5592 Rename Peep::action_sprite_image_offset to TitleCase 2020-06-08 17:36:34 -03:00
Tulio Leao e98cea3615 Rename Peep::action* to Action* 2020-06-08 17:36:33 -03:00
Michael Steenbeek e83b86df4d
Replace occurrences of OpenRCT with OpenRCT2 (#11898) 2020-06-08 15:11:07 +02:00
hdpoliveira 95a13cd96b Remove label loc_6DCA7A 2020-06-07 21:23:29 -03:00
hdpoliveira bf8459d61d Create Vehicle::UpdateTrackMotionMiniGolfVehicle 2020-06-07 21:22:48 -03:00
hdpoliveira 7eaeaa6062 Make loop explicit in UpdateTrackMotionMiniGolf 2020-06-07 21:20:44 -03:00
hdpoliveira 178e74fd26 Part of #9473: Create Vehicle::UpdateTrackMotionMiniGolf
Converted from vehicle_update_track_motion_mini_golf
2020-06-07 21:12:17 -03:00
Tulio Leao c953da800a Rename Peep::step_progress to StepProgress 2020-06-07 20:00:07 -03:00
Michael Steenbeek 5fc414eaf6
Remove usage of regs.si (#11899)
esi was also looked at - it wasn't used.
2020-06-07 19:56:23 -03:00
Michael Steenbeek 71531445bb
Remove usage of regs.edi and regs.di (#11897)
regs.edi was only ever written to, not read. regs.di was written to twice, but only used on the next respective line.
2020-06-07 19:06:52 -03:00
Michael Steenbeek a0c6752ff3
Merge pull request #11882 from tupaschoal/prevent-shadow-peep-4
Rename some Peep member variables to use TitleCase
2020-06-07 23:35:23 +02:00
Michael Steenbeek 9ef8d6da42
Convert most remaining C-style casts to C++-style ones (#11867) 2020-06-07 23:18:11 +02:00
Michael Steenbeek 7646f1b7e4
Merge pull request #11896 from hdpoliveira/update_flags
Update flags
2020-06-07 23:03:48 +02:00
hdpoliveira 5b1469b8b7
Create Vehicle::GetTrackType() (#11895) 2020-06-07 21:43:32 +01:00
hdpoliveira 7bef44b020 Create Vehicle::SetUpdateFlag 2020-06-07 17:16:13 -03:00
hdpoliveira 480d1a6d6b Create Vehicle::ClearUpdateFlag 2020-06-07 17:16:12 -03:00
Tulio Leao 42cbd9bbc4
Merge pull request #11884 from hdpoliveira/newsitem_queue_array
Create NewsItemQueue class
2020-06-07 15:53:20 -03:00
Tulio Leao 2e9bbe15d5
Merge pull request #11881 from duncanspumpkin
Implement Sprite Is As functions
2020-06-07 14:14:10 -03:00
hdpoliveira 8c33bccc86 Create NewsItemQueue 2020-06-07 13:10:50 -03:00
hdpoliveira a35c779aef Rename NewsItemQueue to NewsItemQueues 2020-06-07 13:02:54 -03:00
duncanspumpkin efdabd8880 Make suggested changes 2020-06-07 15:54:07 +01:00
Tulio Leao 95624c748e Prefix Peep::NextInQueue with Guest 2020-06-07 10:46:18 -03:00
hdpoliveira ca1a107a8d Extract function modified_speed 2020-06-06 14:14:38 -03:00
hdpoliveira a66b23ffea Return new acceleration value 2020-06-06 14:13:13 -03:00
hdpoliveira 98ad3a23a4 Issue #9473: UpdateTrackMotionPoweredRideAcceleration 2020-06-06 14:12:49 -03:00
Tulio Leao 357db49819 Rename Peep::mechanic_time_sine_call to use TitleCase 2020-06-06 11:53:51 -03:00
Tulio Leao d195c9fb1d Rename Peep::next_in_queue to NextInQueue 2020-06-06 11:53:51 -03:00
Tulio Leao f1f915b540 Rename Peep::maze_last_edge to MazeLastEdge 2020-06-06 11:53:51 -03:00
Tulio Leao 1a3f8490ad Rename Peep::direction to PeepDirection 2020-06-06 11:53:51 -03:00
Tulio Leao 8a50fafdc8 Rename Peep::interaction_ride_index to use TitleCase 2020-06-06 11:53:51 -03:00
Tulio Leao 8400a7f54d Rename Peep::time_in_queue to TimeInQueue 2020-06-06 11:53:51 -03:00
Tulio Leao 3748cdb194 Rename Peep::rides_been_on to RidesBeenOn 2020-06-06 11:53:51 -03:00
Tulio Leao 4cdfccb338 Rename Peep::id to Id 2020-06-06 11:53:51 -03:00
Tulio Leao 77af2326ff Rename Peep::cash_in_pocket to CashInPocket 2020-06-06 11:53:50 -03:00
Tulio Leao 0fc7bd1afd Rename Peep::cash_spent to CashSpent 2020-06-06 11:26:04 -03:00
Tulio Leao cf4b052cd4 Rename Peep::time_in_park to TimeInPark 2020-06-06 11:26:04 -03:00
Tulio Leao 4c459fada3 Rename Peep::rejoin_queue_timeout to use TitleCase 2020-06-06 11:26:00 -03:00
Tulio Leao 3dad0fd500 Rename Peep::previous_ride to PreviousRide 2020-06-06 11:26:00 -03:00
Tulio Leao 7701b1827d Rename Peep::previous_ride_time_out to use TitleCase 2020-06-06 11:25:47 -03:00
Tulio Leao e08c1b44b2 Rename Peep::thoughts to Thoughts 2020-06-06 10:03:58 -03:00
duncanspumpkin 5c48e5f0bb Remove AsPeep 2020-06-06 11:36:48 +01:00
duncanspumpkin 7ba795e96c Remove AsMoneyEffect 2020-06-06 11:36:48 +01:00
duncanspumpkin bee424585a Remove AsDuck 2020-06-06 11:36:48 +01:00
duncanspumpkin 6e78d8d654 Remove AsBalloon 2020-06-06 11:36:48 +01:00
duncanspumpkin 517ed57593 Remove IsPeep 2020-06-06 11:36:48 +01:00
duncanspumpkin 881afc7579 Remove IsMoneyEffect 2020-06-06 11:36:48 +01:00
duncanspumpkin f5772fae48 Remove IsDuck 2020-06-06 11:36:47 +01:00
duncanspumpkin 4485937560 Remove IsBalloon 2020-06-06 11:36:47 +01:00
duncanspumpkin 1758f2a133 Implement As and Is functions for SpriteBase 2020-06-06 11:36:42 +01:00
Michael Steenbeek f21ddb0723
Refactor checks for station pieces (#11876) 2020-06-05 17:55:15 -03:00
Duncan d145b64ab8
Move banner allocations to reduce chance of not freeing a banner id (#11879) 2020-06-05 17:05:48 -03:00
Michael Steenbeek 4efd3dbfbf
Merge pull request #11866 from Gymnasiast/refactor/set_format_arg_be_gone
Move calls to set_format_arg to Formatter::Common()
2020-06-04 23:20:37 +02:00
Tulio Leao 57a2dab064
Rename Peep::NoActionFrameNum to WalkingFrameNum 2020-06-04 19:16:25 +02:00
Tulio Leao c9f071a766
Rename Peep::TimeOnRide to GuestTimeOnRide 2020-06-04 19:16:25 +02:00
Tulio Leao ce952961b9
Rename Peep::PeepIsLostCountdown to GuestIsLostCountdown 2020-06-04 19:16:24 +02:00
Tulio Leao fabdb8cdef
Rename Peep::path_check_optimisation to PathCheckOptimisation 2020-06-04 19:16:24 +02:00
Tulio Leao 6dc08afdd0
Rename Peep:staff_id to StaffId 2020-06-04 19:16:24 +02:00
Tulio Leao d05e5f8dc7
Rename Peep::guest_heading_to_ride_id to GuestHeadingToRideId 2020-06-04 19:16:12 +02:00
Tulio Leao 9fbaf61e07
Rename Peep::staff_orders to StaffOrders 2020-06-04 19:16:12 +02:00
Tulio Leao 480009c0f6
Rename Peep::peep_is_lost_countdown to PeepIsLostCountdown 2020-06-04 19:16:11 +02:00
Tulio Leao 7357eeca60
Rename Peep::photo1_ride_ref to Photo1RideRef 2020-06-04 19:16:11 +02:00
Tulio Leao a2a0fad886
Rename Peep::peep_flags to PeepFlags 2020-06-04 19:16:11 +02:00
Tulio Leao 53bff03a3f
Rename Peep::pathfind_goal to PathfindGoal 2020-06-04 19:16:11 +02:00
Tulio Leao cad809275e
Rename Peep::pathfind_history to PathfindHistory 2020-06-04 19:16:11 +02:00
Tulio Leao f2808eecbe
Rename Peep:no_action_frame_num to NoActionFrameNum 2020-06-04 19:16:11 +02:00
Tulio Leao 0933cd4e57
Rename Peep::litter_count to LitterCount 2020-06-04 19:16:11 +02:00
Tulio Leao 7665d1386f
Rename Peep:time_on_ride to TimeOnRide 2020-06-04 19:16:11 +02:00
Tulio Leao 0e170d40d4
Rename Peep::staff_mowing_timeout to StaffMowingTimeout 2020-06-04 19:16:11 +02:00
Gymnasiast 66a71e009d
Create Rewind method on Formatter 2020-06-03 14:49:04 +02:00
Gymnasiast 09cc95f536
Move remaining calls to set_format_arg() 2020-06-03 14:49:04 +02:00
Duncan 0f92c3b017
Switch vcxproj files to remove wildcards (#11843)
Unfortunately MS has removed the wild card feature from vcxproj files. This will mean all file deletions and creations will need to modify these files to be included in the VS builds.
2020-06-02 13:37:58 +02:00
Ted John 58f32a0afd Make use of gfx_sprite_to_buffer 2020-06-01 21:15:25 +01:00
Ted John 21a9d8f934 Refactor RLE drawing, one arg struct 2020-06-01 20:46:21 +01:00
Ted John d0b1bfbe87 Refactor bitmap drawing, one arg struct 2020-06-01 20:46:21 +01:00
Ted John 1b6899a954
Fix #11845: Disabled icons are not shown as disabled (#11857) 2020-06-01 20:01:37 +01:00
hdpoliveira a1be45d0b7
#9473: Create Vehicle::UpdateFlag (#11850) 2020-06-01 08:35:30 -03:00
Tulio Leao e1d0d21b5e
Merge pull request #11849 from hdpoliveira/swing_vars
Rename swing-related variables in Vehicle
2020-06-01 08:27:57 -03:00
hdpoliveira 04664d3a77 Rename swing-related variables in RCT vehicles 2020-05-31 17:46:01 -03:00
Tulio Leao 87a52f773c
Merge pull request #11834 from tupaschoal/prevent-shadow-peep-2
Renames some Peep member variables to prevent shadowing
2020-05-31 16:47:53 -03:00
hdpoliveira 86550dad20 Rename swing-related variables in Vehicle 2020-05-31 16:37:09 -03:00
Tulio Leao e18abc7e3d Rename NoOf... to AmountOf... on Peep 2020-05-31 09:13:56 -03:00
hdpoliveira bc5aac402a
Part of #9473: UpdateSwingingCar/UpdateSpinningCar (#11836) 2020-05-31 00:16:06 -03:00
Tulio Leao e7625835c8
Merge pull request #11837 from hdpoliveira/vehicle_update_9473_a
Create Vehicle::CableLiftUpdateTrackMotion
2020-05-30 22:33:31 -03:00
hdpoliveira 7cc9f5a46d
Part of #9473: Create Apply(Non)StopBlockBrake (#11835) 2020-05-30 22:15:23 -03:00
Tulio Leao 0c502988ef Rename Peep::disgusting_count to DisgustingCount 2020-05-30 20:35:06 -03:00
Tulio Leao a987a9ee5e Rename Peep::paid_to_enter to PaidToEnter 2020-05-30 20:35:06 -03:00
Tulio Leao 07f36a93de Rename Peep::staff_lawns_mown to StaffLawnsMown 2020-05-30 20:35:05 -03:00
Tulio Leao 133ff992b6 Rename Peep::staff_rides_fixed to StaffRidesFixed 2020-05-30 20:35:05 -03:00
Tulio Leao 3f091d33e2 Rename Peep::paid_on_rides to PaidOnRides 2020-05-30 20:35:05 -03:00
Tulio Leao 719607f876 Rename Peep::staff_gardens_watered to StaffGardensWatered 2020-05-30 20:35:05 -03:00
Tulio Leao 6b56a353f9 Rename Peep::staff_rides_inspected to StaffRidesInspected 2020-05-30 20:35:05 -03:00
Tulio Leao 414cff9b91 Rename Peep::paid_on_food to PaidOnFood 2020-05-30 20:35:05 -03:00
Tulio Leao 5bd3e88972 Rename Peep::staff_litter_swept to StaffLitterSwept 2020-05-30 20:35:05 -03:00
Tulio Leao c2f7efa328 Rename Peep::paid_on_souvenirs to PaidOnSouvenirs 2020-05-30 20:35:05 -03:00
Tulio Leao 7d581e6978 Rename Peep::staff_bins_emptied to StaffBinsEmptied 2020-05-30 20:35:04 -03:00
Tulio Leao a729ac1589 Rename Peep::no_of_food to NoOfFood 2020-05-30 20:35:04 -03:00
Tulio Leao bc7ea40c4b Rename Peep::no_of_drinks to NoOfDrinks 2020-05-30 20:35:04 -03:00
Tulio Leao 625f7859a4 Rename Peep::no_of_souvenirs to NoOfSouvenirs 2020-05-30 20:35:04 -03:00
Tulio Leao fc1ba40dc8 Rename Peep::vandalism_seen to VandalismSeen 2020-05-30 20:35:04 -03:00
Tulio Leao fd71b1b009 Rename Peep::voucher_type to VoucherType 2020-05-30 20:35:04 -03:00
Tulio Leao bf228abf55 Rename Peep::voucher_arguments to VoucherArguments 2020-05-30 20:35:03 -03:00
hdpoliveira 60b54bdd04 #9473: Create CableLiftUpdateTrackMotion functions 2020-05-30 20:23:02 -03:00
hdpoliveira c5e0489a48 #9473: Create Vehicle::CableLiftUpdateTrackMotion 2020-05-30 20:23:02 -03:00
Tulio Leao 99bbfc9034
Merge pull request #11715 from hdpoliveira/newsitem_queue_split
Create NewsItemQueue class
2020-05-30 18:53:38 -03:00
Michael Steenbeek 654dde4436
Merge pull request #11806 from michielbos/develop
Fix #11422 Add a shortcut key for disabling/enabling clearance checks
2020-05-30 21:21:39 +02:00
hdpoliveira a94fc10c77 Add const version of NewsItemQueue::operator[] 2020-05-30 14:46:05 -03:00
hdpoliveira b519247bad Rename FirstOpenOrCreateSlot to FirstOpenOrNewSlot 2020-05-30 14:31:54 -03:00
hdpoliveira b30c76eee9 Renaming 'old' to 'archived' in NewsItem 2020-05-30 14:29:51 -03:00
hdpoliveira 502f11400e Add const version of NewsItemQueue::At 2020-05-30 14:11:14 -03:00
hdpoliveira b6d3868c9d Rename FirstOpenSlot to FirstOpenOrCreateSlot 2020-05-30 13:56:12 -03:00
hdpoliveira 4f698387f6 Move NewsItemQueue methods implementation to .cpp 2020-05-30 13:56:12 -03:00
hdpoliveira efa92a28fa Merge NEWS_ITEM_HISTORY_START variable 2020-05-30 13:56:12 -03:00
hdpoliveira a88f02fdb2 Create operator[] in NewsItemQueue 2020-05-30 13:56:11 -03:00
hdpoliveira d64b3bb152 Format NewsItem.h 2020-05-30 13:56:11 -03:00
hdpoliveira c9574c1070 Create class NewsItemQueue 2020-05-30 13:56:11 -03:00
hdpoliveira f7ec58d53f Use for-range and std::find_if 2020-05-30 13:56:11 -03:00
hdpoliveira c40dd3d3d0 Access news queues directly or with iterators 2020-05-30 13:56:10 -03:00
hdpoliveira f4778a8c01 Split gNewsItems into two 2020-05-30 13:56:10 -03:00
hdpoliveira 230162534b Create constants for sizes of NewsItem queues 2020-05-30 13:56:10 -03:00
hdpoliveira a4d010415b Encapsulate gNewsItems 2020-05-30 13:56:10 -03:00
Ted John 8f77125cdb
Fix #11298: Unable to advertise server (500): Retry with ipv4 only (#11824)
Add new config option to allow any address to be advertised. This then
doesn't rely on the master server retrieving the server IP address via
the HTTP request which can often be IPv6 by default.
2020-05-30 18:21:22 +02:00
Michiel ac8dce44fd Apply suggestions from code review
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-05-30 17:10:08 +02:00
Michiel Bos 3fdab8e7d9 Added icon to Cheats button to indicate clearance checks are disabled 2020-05-30 17:10:08 +02:00