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
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
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
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
3f091d33e2
Rename Peep::paid_on_rides to PaidOnRides
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
c2f7efa328
Rename Peep::paid_on_souvenirs to PaidOnSouvenirs
2020-05-30 20:35:05 -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
Ted John
f6fbd272ec
Add built_date to ScRide and add GetAge()
2020-05-23 15:28:03 +01:00
Tulio Leao
e87343f9c6
Rename MoneyEffect member variables to prevent shadowing ( #11748 )
2020-05-16 17:04:31 -03:00
Tulio Leao
c17aa095d5
Rename Peep::surrounding_thought_timeout > SurroundingsThoughtTimeout
2020-05-13 23:28:16 -03:00
Tulio Leao
32c8e5614f
Rename Peep::angriness to Angriness
2020-05-13 23:25:09 -03:00
Tulio Leao
589a7a48be
Rename Peep::time_lost to TimeLost
2020-05-13 23:22:08 -03:00
Tulio Leao
a216cb9930
Rename Peep::days_in_queue to DaysInQueue
2020-05-13 23:19:41 -03:00
Tulio Leao
128c1993c1
Rename Peep::balloon_colour to BalloonColour
2020-05-13 23:16:43 -03:00
Tulio Leao
6c57f33dc9
Rename Peep::umbrella_colour to UmbrellaColour
2020-05-13 23:14:45 -03:00
Tulio Leao
222f8df6cb
Rename Peep::hat_colour to HatColour
2020-05-13 23:11:28 -03:00
Tulio Leao
3b632fcf95
Rename Peep::favourite_ride to FavouriteRide
2020-05-13 23:06:40 -03:00
Tulio Leao
7a6de648fe
Rename Peep::favourite_ride_rating to FavouriteRideRating
2020-05-13 23:03:58 -03:00
Tulio Leao
14e0cc5e4a
Rename Peep::item_standard_flags to ItemStandardFlags
2020-05-13 23:01:03 -03:00
Gymnasiast
15b5d97795
Refactor shop items
2020-05-11 19:16:23 +02:00
Ted John
7b8ffdb865
Refactor peep.intensity into new strict struct
2020-05-09 12:37:51 +01:00
Duncan
32eb7071a1
Fix #11550 : Use std::nullopt instead of empty brace ( #11595 )
...
This is technically a gcc bug from the looks of it but since std::nullopt is slightly easier to read I've gone through the codebase and used that over empty braces. In addition noticed a mistake on the scripting viewport get widgetIndex function where it would return an incorrect widgetIndex.
2020-05-02 10:09:12 +02:00
Gymnasiast
cc65564521
Use (RCT12)ObjectEntryIndex in more places
2020-05-01 22:06:13 +02:00
Gymnasiast
73671bbeeb
Make ResearchItem use ObjectEntryIndex
2020-04-30 12:59:18 +02:00
Tulio Leao
a4e4040a0c
Use named casts on openrct2/rct* ( #11169 )
2020-04-18 12:37:34 +02:00
Breno Rodrigues Guimarães
174a480870
Use utf8_remove_format_codes to remove format codes from user strings ( #11289 )
...
The previous code used RCT12::RemoveFormatCodes to remove format codes from RCT strings. But that function uses utf8 methods to identify format codes. In this new version, rct2_to_utf8 is called first to obtain an utf8 string, and then utf8_remove_format_codes can be used.
2020-04-15 07:17:43 +02:00
duncanspumpkin
54a058ca6c
Fix boat location import/export/update.
...
After a refactoring to split off the boat location the import/export functions meant incorrect information could be loaded into the s6 file for boats that had not left the station. Boats that had left the station had other fields clobbered for the same reason
2020-04-07 20:19:26 +01:00
Duncan
919a70361b
Fix incorrect saves in backtrace ( #11229 )
2020-04-05 21:54:11 +02:00
Gymnasiast
cfdc8567f7
Fix #11230 : Seat Rotation not imported correctly for hacked rides
2020-04-05 12:29:07 +02:00
Michael Steenbeek
c6e42ac313
Avoid assertion getting hit in scenery_is_invented() ( #11079 )
2020-03-27 12:53:18 +01:00
Michael Steenbeek
268e81c21b
Fix mistake in #11029 ( #11044 )
2020-03-25 20:52:08 +00:00
Michael Steenbeek
766339d771
Fix #11027 : Third color on walls becomes black when saving ( #11029 )
2020-03-25 13:57:15 +01:00
Ted John
d34dec9c27
Create ZoomLevel struct to add two new zoom levels
2020-03-23 15:54:03 +00:00
Gymnasiast
be4f723287
Avoid writing outside _researchedSceneryItems bounds
2020-03-16 14:04:02 +01:00
Gymnasiast
70e287b076
Clean up scenery handling
2020-03-15 12:15:12 +01:00
Gymnasiast
ad91654a3d
Use big Z in more places
2020-03-07 21:54:47 +01:00
Michael Steenbeek
4f86d0115c
Merge pull request #10866 from Gymnasiast/refactor/more-tile-element-prep
...
Refactor/more tile element prep
2020-03-06 09:25:32 +01:00
Michael Steenbeek
d64b73c29a
Clean up RCT1/2 constants ( #10855 )
2020-03-05 22:49:16 +01:00
Michael Steenbeek
904cad77b5
Merge pull request #10864 from Gymnasiast/refactor/station-starts
...
Change station starts to CoordsXY
2020-03-05 22:48:53 +01:00
Michael Steenbeek
f7151317b4
Translate SV6 object offsets to OpenRCT2 ones ( #10881 )
2020-03-05 22:14:50 +01:00
Michael Steenbeek
d085a0ed20
Split OBJECT_ENTRY_COUNT into RCT2/OpenRCT2 variants ( #10877 )
2020-03-05 17:25:57 +01:00
Gymnasiast
2eb967b30d
Change station start to CoordsXY
2020-03-05 12:29:02 +01:00
Gymnasiast
3ed7694495
Move tile element-specific flags
2020-03-04 22:01:09 +01:00
Gymnasiast
57a40c0657
Extend PathElement
2020-03-04 21:57:42 +01:00
Michael Steenbeek
61175a4fbf
Confine use of LocationXY8 to RCT12 load/save code ( #10698 )
2020-03-01 21:16:10 +01:00
Michael Steenbeek
d5c4d78d49
Move vehicle track location to CoordsXYZ ( #10856 )
...
* Move vehicle track location to CoordsXYZ
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-03-01 15:45:51 -03:00
Michael Steenbeek
270417f788
Merge pull request #10819 from Gymnasiast/refactor/even-more-rtd
...
Move track paint function lookup to RTDs
2020-02-24 10:56:43 +01:00
Michael Steenbeek
6d7a2bea69
Merge pull request #10818 from tupaschoal/coords-xy-2
...
Use ScreenCoordsXY for some window interactions
2020-02-23 13:23:50 +01:00
Gymnasiast
08ad1816d3
Move track paint function to RTDs
2020-02-22 20:15:00 +01:00
Michael Steenbeek
86a79e742f
Use RideTypeDescriptor for available track pieces
2020-02-22 20:13:44 +01:00
Tulio Leao
1b3f0e9a44
Create ScreenCoordsXY gSavedView from separate x,y variables
2020-02-22 16:01:21 -03:00
Gymnasiast
1e6efa6eb4
Extend BannerIndex to 16 bits
2020-02-15 10:37:34 +01:00
Duncan
b8b539c16e
Modify next_x/y/z to become a CoordsXYZ ( #10680 )
...
* Modify next_x/y/z to become a CoordsXYZ
Should be further scope for refactoring from this.
* Make suggested changes
* Fix default construct issues
2020-02-11 22:01:14 +00:00
Michael Steenbeek
d16fbb0cd2
Change ride->overall_view to CoordsXY ( #10673 )
2020-02-08 17:19:59 +01:00
Gymnasiast
ca2f37ae7f
Remove opt::optional polyfill
...
std::optional is supported by Xcode 10. The non-polyfill variant was already used in our code, so this is not likely to break anything that wasn't broken before.
2020-02-01 22:25:03 +01:00
Gymnasiast
c77c69a0c4
Refactor calls
2020-01-26 16:21:42 +01:00
Gymnasiast
e6c32230bc
Convert rawValue to uint32
2020-01-26 14:12:57 +01:00
Gymnasiast
63fddee603
Convert gResearchLast/NextItem to std::optional
2020-01-26 10:07:16 +01:00
Michael Steenbeek
2b6e925744
Fix testing giga coaster with cable lift crashing the game ( #10620 )
2020-01-25 12:24:04 +01:00
duncanspumpkin
a5ef8d6240
Rename rct_vehicle
2020-01-19 17:14:56 +00:00
duncanspumpkin
164acc85cc
Rename sprites to newer style naming
2020-01-19 17:10:53 +00:00
duncanspumpkin
86a20805ad
Correct the types for exporting
2020-01-19 17:08:57 +00:00
duncanspumpkin
4e796ec92d
Increase Sprite size to 0x200
...
This should allow for major refactoring of the sprite classes
2020-01-19 17:08:57 +00:00
modulo7
fdf0c17fd8
Name field var_CD of vehicle struct. Refactor to enum
2020-01-19 17:34:11 +01:00
Michael Steenbeek
0c9b1cec96
Correct max vehicles per ride value ( #10504 )
...
* Correct max vehicles per ride value
* Fix formatting
* Fix constant usage in TrackDesign.cpp
2020-01-04 18:10:33 +01:00
Tulio Leao
1bc399537e
Fix C6001: using uninitialized memory
2019-12-27 15:05:27 -03:00
duncanspumpkin
18af061c16
Fix formatting
2019-12-24 12:22:54 +00:00
duncanspumpkin
38434ad688
Use CoordsXYZ for cable lift location
2019-12-24 12:04:14 +00:00
duncanspumpkin
0f90b2c353
Rename variable as its technically new
2019-12-24 11:46:56 +00:00
duncanspumpkin
370a9b1113
Change type of cur_test_track_location
2019-12-24 11:44:01 +00:00
duncanspumpkin
c08958a705
Prepare cur_test_track_location for type change
2019-12-24 11:43:55 +00:00
duncanspumpkin
a5ad2f9a87
Change overall view and boat hire return type to TileCoordsXY
2019-12-24 08:51:48 +00:00
duncanspumpkin
58339cff2b
Prepare overall_view for type change
2019-12-24 08:39:20 +00:00
duncanspumpkin
0a5d094785
Change type of ChairLiftBullwheel to TileCoordsXYZ
2019-12-24 08:28:10 +00:00
duncanspumpkin
64656cdc0e
Fix mistake made by auto complete
2019-12-21 12:43:13 +00:00
duncanspumpkin
df2393c3f0
Fix clang format
2019-12-21 12:17:57 +00:00
duncanspumpkin
45403ac2d3
Move station_starts to TileCoordsXY
2019-12-21 11:48:13 +00:00
duncanspumpkin
7297125cae
Refactor stations ready for TileCoordsXY
2019-12-21 11:26:37 +00:00
Michael Steenbeek
a2b9598341
Modify code using Location8 to use isNull()/setNull() ( #10403 )
2019-12-21 11:34:46 +01:00
duncanspumpkin
cfb4bba721
Remove todo and clang format where required
...
Change array type to avoid additional code
Make CI's happier
2019-12-15 08:21:32 +00:00
Duncan
0f659794d0
Fix #10108 . Import/Export smoke particles correctly to stop desync ( #10113 )
...
Mistake made whilst refactoring import/export caused steam particiles to have the wrong information for each of its fields. This manifestied on multiplayer games causing an immediate desync.
2019-10-19 18:11:20 +02:00
Denis Khabenkov
4e111c66a3
Fix #10074 : Refactor TrackDesignEntranceElement
2019-10-11 00:25:13 +03:00
duncanspumpkin
bb042213fd
Fix #10069 . Actually pass the track element flags to the new element.
...
Mistake made whilst refactoring #10058 . Flags were incorrectly been taken from the destination and not the source.
Refactored names to use the correct t number
2019-10-10 18:48:05 +01:00
Denis Khabenkov
57a208d560
Fix #10064 : Refactor TrackDesignEntranceElement ( #10066 )
...
* Fix #10064 : Refactor TrackDesignEntranceElement
2019-10-10 18:23:29 +01:00
Tulio Leao
121585578e
Remove implicit conversion constructor
2019-10-08 18:22:02 -03:00
Tulio Leao
6be7c42a3d
Close #10051 : Create TrackDesignSceneryElement
2019-10-08 17:13:34 +02:00
Tulio Leao
68ce43308e
Remove implicit conversion constructor
2019-10-08 07:48:03 -03:00
Denis Khabenkov
de53ac84b8
Fix #10052 : Create a TrackDesignEntranceElement struct to replace rct_td6_entrance_element
2019-10-07 21:59:07 +03:00
Michael Steenbeek
a63395eb1c
Fix #10028 : Saved park--brakes all set to 0mph
2019-09-29 22:53:41 +02:00
Duncan
b94b8880aa
Fix ride station index related bugs
2019-09-19 22:56:54 +02:00
Gymnasiast
0aca04256b
Fix #9978 : Mazes are imported incorrectly
2019-09-12 23:12:54 +02:00
Gymnasiast
bb73dd0dfb
Refactor track element to use 16 bytes
2019-08-31 13:14:19 +02:00
Gymnasiast
b1fb75e496
Move everything to research vectors
2019-08-23 22:41:43 +02:00
Hielke Morsink
371f1fd016
Fix #9926 : Africa - Oasis park has wrong peep spawn ( #9927 )
2019-08-23 21:54:54 +02:00
Gymnasiast
bf1f14b441
Correct memcpy usage
2019-08-18 19:46:44 +02:00
Gymnasiast
169d2980ca
Properly export tile elements to S6
2019-08-18 18:20:56 +02:00
Ted John
a094c5b0ce
Create RCT2 version of ride rating calc data ( #9751 )
2019-08-18 12:53:56 +02:00
duncanspumpkin
748a6338a9
Fix #9885 . Catch exceptions in track design writing
2019-08-17 10:59:36 +01:00
kennycastro007
9708e3a043
Fixed issue #8376 ( #9866 )
...
#8376 : Added static function show_error in S6Importer.cpp
2019-08-15 16:02:03 +02:00
Ted John
132a1916d6
Fix #9832 : Access violation in ride_measurement_update ( #9842 )
...
We can not store a ride pointer in ride measurement as rides are now stored in a vector which means their addresses can change when rides are constructed / removed.
2019-08-10 15:14:22 +01:00
duncanspumpkin
996cbdec02
Correctly input num_holes, inversions
2019-08-09 20:43:03 +01:00
duncanspumpkin
af31404472
Use std::string and cleanup unused functions
...
Use CoordsXY for save pop scenery functions
Use CoordsXY for push save scenery functions
Further refactoring to use coordsxy and standard functions
2019-08-09 20:43:03 +01:00
duncanspumpkin
e9b59064e0
Fix code and clang format. Delete dead code.
...
Use correct TD4 checksum for vanilla TD4's.
Simplified the code for version detection since checksum numbers do not match up to a version
Fix TD4 imports.
Oh yeah TD4 doesn't have scenery or entrances
Move track related structs to correct files
2019-08-09 20:43:02 +01:00
duncanspumpkin
54d6722bf2
Link everything together
2019-08-09 20:40:35 +01:00
duncanspumpkin
af92dcba3e
Creating t6 exporter
2019-08-09 20:39:54 +01:00
duncanspumpkin
e3c63b762e
Create new TrackDesign format
2019-08-09 20:39:53 +01:00
Duncan
659b4d8f9f
Clean up some litter in the codebase ( #9753 )
...
13CA740 and 141F568 have been doing mostly nothing since the game action refacotr. Before that they didn't do much as I've never found any instance where the code was hit.
2019-08-08 06:05:58 +01:00
Ted John
b17e9b1b18
Fix #9755 : Crash when importing ride measurement for null ride
2019-08-07 23:11:11 +01:00
Ted John
cd4eb86a7c
Merge pull request #9725 from IntelOrca/refactor/ride-manager
...
Refactor ride list
2019-08-07 21:03:17 +01:00
Ted John
16a2046032
Fix #9745 : CJK characters are broken in ride names
2019-08-07 12:34:05 +01:00
Ted John
414b53b56d
Remove ride classifications
2019-08-04 16:43:50 +01:00
Ted John
a3fe00f0a3
Refactor ride list to a manager with iterator
2019-08-04 16:43:50 +01:00
Ted John
c3234b1442
Refactor map animations and dynamically create on park load ( #9705 )
2019-08-03 22:18:33 +02:00
Ted John
b3531624a1
Fix saving of banner frame colour
2019-07-30 18:27:50 +01:00
Ted John
af5daaec70
Fix importing and exporting of banner strings containing colour
2019-07-29 21:20:22 +01:00
Ted John
7287b8cf1a
Fix formatting
2019-07-29 20:40:25 +01:00
Ted John
f539fdd79c
Convert user strings to RCT2 encoding when exporting to S6
2019-07-29 20:01:49 +01:00
Ted John
7ce2f38c92
Fix formatting
2019-07-29 20:01:49 +01:00
Ted John
d28799ef18
Remove user strings
2019-07-29 20:01:37 +01:00
Ted John
767b3c8328
Build up the user string list and export in one go
2019-07-29 19:18:16 +01:00
Ted John
40d49b93d3
Do not use user strings for peep names
2019-07-29 19:18:16 +01:00
Ted John
61d64ab8c5
Do not use user strings for banners
2019-07-29 19:18:16 +01:00
Ted John
3f8890afde
Fix remaining errors and a few bugs
2019-07-29 19:18:16 +01:00
Ted John
3ee7824df4
Fix #9678 : Korean scenario name is not saved ( #9679 )
2019-07-29 19:17:49 +01:00
Ted John
0b4d989a67
Rename get_banner to GetBanner
2019-07-26 17:24:19 +01:00
Ted John
3bff25ab22
Use TileCoordsXY
2019-07-26 17:14:09 +01:00
Ted John
5c07c53faf
Refactor get banner
2019-07-25 22:21:19 +01:00
Ted John
85543bd1c8
Separate RCT2 and OpenRCT2 banner struct
2019-07-25 22:21:19 +01:00
Matt
3395079737
Remove NUM_SPRITE_LISTS macro and replace with SPRITE_LIST_COUNT for consistency
2019-07-24 17:53:54 +02:00
Ted John
3e28073981
Log path when loading / saving park
2019-07-22 22:15:01 +01:00
Duncan
ab5f5b20cd
Use enum class for RCT2_SOUND ( #9618 )
...
* Use enum class for RCT2_SOUND
* Fix formatting. Fix mistaken declaration.
* Change name of enum to SoundId
* Fix clang format
2019-07-22 19:02:45 +01:00
Ted John
5733d666b3
Do not store park name as a user string
2019-07-21 11:33:15 +02:00
Duncan
4e44818a04
Merge pull request #9449 from ZehMatt/refactor/sprite-list-pow2
...
Remove unnecessary multiplication and division for sprite lists
2019-07-13 09:37:35 +01:00
duncanspumpkin
fc657e2571
Revert name change in RCT12 struct to reflect its use.
...
The new linked_list_index is only for the internal sprite base struct. When importing we are referring to the old linked_list_type_offset. If the names were the same it would not provide any information as to why one was a factor of two different.
2019-07-13 07:20:15 +01:00
Jim Armstrong
9c976daa51
Refactor #9474 : Refactor jumping fountain code ( #9475 )
...
* Refactor jumping_fountain_update to Update
* Refactor jumping_fountain_get_type to GetType
* Refactor jumping_fountain_continue to Continue
Fix typos and misc refactoring
* Refactor begin and create functions into static member functions
Move jumping_fountain_begin and jumping_fountain_create into the rct_jumping_fountain struct and make them static
* Refactor remaining fountain functionality into member functions
* Rename JumpingFountain struct and move to proper header file
JumpingFountain code was refactored to conform to variable naming conventions and moved into the Fountain.h file.
rct_sprite_generic struct was moved to SpriteBase.h - this was done to get around a circular header dependency between Fountain.h and Sprite.h
* Set access modifier for private functions
* Change JumpingFountain variable names to TitleCase
* Refactor #9474 : Clarify where auto is being used with pointers
* Refactor #9474 : Change function names for clarity
* Refactor #9474 : Fix incorrect function names
2019-07-11 20:38:30 +01:00
Matt
fc3afb3349
Remove unnecessary multiplication and division for sprite lists
2019-06-22 17:38:28 +02:00
Matt
df30d5d9bc
Fix MarketingCampaignFlags::FIRST_WEEK not being imported/exported with sv6
2019-06-19 03:20:19 +02:00