Refactor TrackAndDirection #2154
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| uint32_t remainingDistance; // 0x28 | ||
| union | ||
| { | ||
| TrackAndDirection trackAndDirection; |
There was a problem hiding this comment.
The offsets are useful to know. // 0x2C
There was a problem hiding this comment.
It is there on the union
| @@ -120,15 +120,15 @@ namespace OpenLoco::VehicleManager | |||
| } | |||
|
|
|||
| // 0x004B05E4 | |||
| void placeDownVehicle(Vehicles::VehicleHead* const head, const coord_t x, const coord_t y, const uint8_t baseZ, const Vehicles::TrackAndDirection& unk1, const uint16_t unk2) | |||
| void placeDownVehicle(Vehicles::VehicleHead* const head, const coord_t x, const coord_t y, const uint8_t baseZ, const Vehicles::TrackAndDirection& tad, const uint16_t unk2) | |||
There was a problem hiding this comment.
this is a trad. Can be called for roads or tracks.
| @@ -135,7 +135,7 @@ namespace OpenLoco::GameCommands | |||
| newBogie->tileY = 0; | |||
There was a problem hiding this comment.
L49 _backup2C is not a TrackAndDirection its a trad.
LeftofZen
reviewed
Oct 23, 2023
| { | ||
| TrackAndDirection trackAndDirection; | ||
| RoadAndDirection roadAndDirection; | ||
| uint16_t trad; |
There was a problem hiding this comment.
what is this for? trad isn't a very descriptive name
There was a problem hiding this comment.
track or road and direction is a mouthful. Its there for the cases where we don't know what its going to be used for.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Having it stored directly in the union makes the code a bit more readable and definitely shorter, most if not all functions already expected the correct type, there should be no logic changes.