Fix calling map::move_vehicle with a combined horizontal and vertical movement #33506
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
…ve_vehicle. So the caller does not have to do it. At least one caller (from `monster::shove_vehicle`) did not do this.
Add two separate checks for 1) empty displacement vector and 2) for displacement vector being too large. Changed third check into an assertion as it is ensured by the splitting code above.
Qrox
reviewed
Aug 24, 2019
| @@ -1876,6 +1876,9 @@ void monster::shove_vehicle( const tripoint &remote_destination, | |||
| veh.skidding = true; | |||
| veh.velocity = shove_velocity; | |||
| if( shove_destination != tripoint_zero ) { | |||
| if( shove_destination.z != 0 ) { | |||
| veh.vertical_velocity = shove_destination.z < 0 ? -shove_velocity : +shove_velocity; | |||
| } | |||
| g->m.move_vehicle( veh, shove_destination, veh.face ); | |||
| } | |||
| veh.move = tileray( destination_delta_x, destination_delta_y ); | |||
There was a problem hiding this comment.
Should this use the new vehicle pointer returned by move_vehicle?
There was a problem hiding this comment.
it doesn't really matter. move_vehicle either returns null or the input vehicle. It never creates a new one. Those movement functions need a rework anyway (returning bool instead of pointers, displace_vehicle taking a vehicle reference instead of a point and so on).
ZhilkinSerg
added
<Bugfix>
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.
SUMMARY: NoneFixes #32490
The function checks for the displacement vector indicating a vertical only or a horizontal only movement. If it indicates both at once (e.g. (1, 0, 1)), it would show the message (and not do anything).
Some other place called the function and did split the movement into two calls, so I moved that splitting into the function itself.
Also added vertical velocity to the vehicle as the function complained about that as well.