Fix French and German ultimate staff sprite with PoL assets #9204
+34
−13
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
zenseii
added
improvement
ihhub
requested changes
Oct 21, 2024
Comment on lines
+4206
to
+4218
| imageStream.seek( headerSize + assetIndex * 13 ); | ||
|
|
||
| fheroes2::ICNHeader header1; | ||
| imageStream >> header1; | ||
|
|
||
| fheroes2::ICNHeader header2; | ||
| imageStream >> header2; | ||
| const uint32_t dataSize = header2.offsetData - header1.offsetData; | ||
|
|
||
| const uint8_t * data = body.data() + headerSize + header1.offsetData; | ||
| const uint8_t * dataEnd = data + dataSize; | ||
|
|
||
| _icnVsSprite[id][assetIndex] = fheroes2::decodeICNSprite( data, dataEnd, header1 ); |
There was a problem hiding this comment.
How about we create a helper function for this code which is duplicate of the code in function void LoadOriginalICN( const int id )? I think it could be like this:
void readImage( ROStreamBuf & stream, fheroes2::Sprite & image, const int32_t imageIndex, const bool isLastImage )
{
...
}and then we can use this function in both places. What do you think?
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.
The staff sprite is corrupted/wrong in at least the German and French PoL assets from GOG. Apparently this bug was introduced with patch 2.0 in those languages. In the Succession Wars asset the correct sprite is still present so we use that instead.
In
master:In original game:
