mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix colour conversion out of range

This commit is contained in:
Ted John 2017-01-08 17:20:10 +00:00
parent e3e435c9f7
commit c1d532be01
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/rct1/S4Importer.cpp
View File

@ -931,8 +931,12 @@ private:
// Guests (indexes converted later)
for (int i = 0; i < 32; i++)
{
dst->peep[i] = src->peep[i];
dst->peep_tshirt_colours[i] = RCT1::GetColour(src->peep_tshirt_colours[i]);
uint16 spriteIndex = src->peep[i];
dst->peep[i] = spriteIndex;
if (spriteIndex != SPRITE_INDEX_NULL)
{
dst->peep_tshirt_colours[i] = RCT1::GetColour(src->peep_tshirt_colours[i]);
}
}
dst->var_CD = src->var_CD;
@ -949,7 +953,15 @@ private:
dst->update_flags = src->update_flags;
dst->colours.body_colour = RCT1::GetColour(src->colours.body_colour);
dst->colours.trim_colour = RCT1::GetColour(src->colours.trim_colour);
dst->colours_extended = RCT1::GetColour(src->colours_extended);
if (_gameVersion == FILE_VERSION_RCT1)
{
// TODO we might need to use a lookup table here for default colours
dst->colours_extended = 0;
}
else
{
dst->colours_extended = RCT1::GetColour(src->colours_extended);
}
dst->mini_golf_current_animation = src->mini_golf_current_animation;
dst->mini_golf_flags = src->mini_golf_flags;