Fix citizen SelectModel VScript hook having issues in save/restore #350
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
1upD
reviewed
Jan 11, 2025
| @@ -839,6 +839,9 @@ void CNPC_Citizen::SelectModel() | |||
| } | |||
| } | |||
|
|
|||
| // Models selected this way must be unique to avoid conflicts in save/restore | |||
| m_Type = CT_UNIQUE; | |||
There was a problem hiding this comment.
I'm a little bit skeptical of this change. In Entropy : Zero 2, some citizen types have different effects such as jump rebels or rebel brutes. Using the SelectModel hook on them would remove these effects. I don't have a better alternative to suggest but I think maybe there should be a separate way to set m_Type or perhaps the save/restore bugs need to be addressed directly.
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.
This PR fixes citizens which selected a model via
SelectModelswitching back to default citizen models after loading a save.After using the
SelectModelhook, citizens will now have their type set toCT_UNIQUE, which bypasses the model selection code and prevents a new one from being selected by accident later.PR Checklist
developbranch OR targets another branch with a specific goal in mind