mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity

Fix peep links in vehicles

Browse Source
This commit is contained in:
Ted John
2017-01-06 22:22:07 +00:00
parent 748d82f517
commit 6c339787ee
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -902,7 +902,7 @@ private:
dst->next_vehicle_on_ride = src->next_vehicle_on_ride;
dst->next_vehicle_on_train = src->next_vehicle_on_train;
// Guests
// Guests (indexes converted later)
for (int i = 0; i < 32; i++)
{
dst->peep[i] = src->peep[i];
@@ -942,20 +942,43 @@ private:
}
}
void FixVehiclePeepLinks(rct_vehicle * vehicle, const uint16 * spriteIndexMap)
{
for (int i = 0; i < 32; i++)
{
uint16 originalSpriteIndex = vehicle->peep[i];
if (originalSpriteIndex != SPRITE_INDEX_NULL)
{
vehicle->peep[i] = spriteIndexMap[originalSpriteIndex];
}
}
}
void ImportPeeps()
{
uint16 spriteIndexMap[RCT1_MAX_SPRITES];
for (size_t i = 0; i < RCT1_MAX_SPRITES; i++)
{
spriteIndexMap[i] = SPRITE_INDEX_NULL;
if (_s4.sprites[i].unknown.sprite_identifier == SPRITE_IDENTIFIER_PEEP)
{
rct1_peep *srcPeep = &_s4.sprites[i].peep;
rct_peep *peep = (rct_peep*)create_sprite(SPRITE_IDENTIFIER_PEEP);
rct1_peep * srcPeep = &_s4.sprites[i].peep;
rct_peep * peep = (rct_peep*)create_sprite(SPRITE_IDENTIFIER_PEEP);
move_sprite_to_list((rct_sprite*)peep, SPRITE_LIST_PEEP * 2);
spriteIndexMap[i] = peep->sprite_index;
ImportPeep(peep, srcPeep);
}
}
for (size_t i = 0; i < MAX_SPRITES; i++)
{
rct_sprite * sprite = get_sprite(i);
if (sprite->unknown.sprite_identifier == SPRITE_IDENTIFIER_VEHICLE)
{
rct_vehicle * vehicle = (rct_vehicle *)sprite;
FixVehiclePeepLinks(vehicle, spriteIndexMap);
}
}
}
void ImportPeep(rct_peep * dst, rct1_peep * src)