feat(rdr3/streaming): native map store reload#3845
Open
Ehbw wants to merge 1 commit intocitizenfx:masterfrom
Open
feat(rdr3/streaming): native map store reload#3845Ehbw wants to merge 1 commit intocitizenfx:masterfrom
Ehbw wants to merge 1 commit intocitizenfx:masterfrom
Conversation
f3c9f56 to
3d5b297
Compare
Handles reloading map stores natively instead of with the workaround of unloading and loading 'GROUP_MAP' to attempt to reload map store. This matches the behaviour in FiveM This is the proper fix to citizenfx#3573 which served as a temporary fix after another PR resolved an issue with 'g_lastStreamingName' being assigned with the wrong value, causing the logic dependent on NativeMapStore reloading to begin working in RDR3.
3d5b297 to
0fc0ef8
Compare
This file contains hidden or 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
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.
Goal of this PR
Matches FiveM behaviour by handling map store reloading natively, rather then the half-functional workaround of disabling GROUP_MAP (or GROUP_MAP_SP for singleplayer) and re-enabling it. Which didn't work as intended in RedM.
Reloading custom collisions works as intended now in RedM, where as before it custom collisions would fail and cause client instability. This serves as the proper fix replacing what #3573 temporarily patched.
How is this PR achieving the goal
Porting the patches inside of
ReloadMapStoreNativeto RedM.This PR applies to the following area(s)
FiveM, RedM
Successfully tested on
Game builds: 1491 (Debug and Release)
Platforms: Windows
Checklist
Fixes issues