GRIM: Fix unknown key error when loading savegame #2790
Merged
Conversation
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
henke37
reviewed
Feb 21, 2021
aquadran
reviewed
Mar 7, 2021
| @@ -314,8 +314,9 @@ void PoolObject<T>::Pool::restoreObjects(SaveGame *state) { | |||
| Common::HashMap<int32, T *> tempMap; | |||
| for (int32 i = 0; i < size; ++i) { | |||
| int32 id = state->readLESint32(); | |||
| T *t = _map.getVal(id); | |||
| _map.erase(id); | |||
| T *t = nullptr; | |||
There was a problem hiding this comment.
maybe?
T *t = _map.getValOrDefault(id, nullptr);
criezy
force-pushed
the
mission-impossible-4
branch
from
289f686 to
894a992
Compare
|
I forgot about this pull request and I will merge it now. I think the change is pretty safe. |
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.
A user reported a crash with
Unknown key!error when trying to load a save game in MI4 today on IRC/Discord.@henke37 suggested that the likely culprit was the code changed in this pull request.
I don't have the game, and the demo doesn't let me save games. So I am unable to test this. This is why I am proposing this as a pull request so that developers who know the engine or can at least test it can validate the change.