tweak(extra-natives/five): sanitize mission train creation #2982
+150
−47
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.
Goal of this PR
Prevent client crashes when using the CREATE_MISSION_TRAIN native.
How is this PR achieving the goal
By adding checks that are missing with the original native implementation. Such as invalid train variations (that do not exist in trains.xml), required carriage models not being loaded, and checking to ensure that there is at least a single track enabled to create a train on (this wouldn't crash the client, but would rather return a native error in the console which could be confusing to users).
This PR also moves some Train structs from TrackNatives to a Train header file to reduce code duplication
This PR applies to the following area(s)
FiveM
Successfully tested on
Game builds: 1604, 3258
Platforms: Windows
I've created a repro resource to reproduce the crashes and their new behaviour with this PR.
train-crash-test.zip
Checklist
Fixes issues