From 5cc188076c5fddb850f284079eb69510b1ba97f5 Mon Sep 17 00:00:00 2001 From: rwjuk Date: Wed, 5 Jul 2017 22:42:45 +0100 Subject: [PATCH] Restore resetting of sprite index --- src/openrct2/world/sprite.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c index 086d8b8306..2da130a022 100644 --- a/src/openrct2/world/sprite.c +++ b/src/openrct2/world/sprite.c @@ -262,6 +262,10 @@ void sprite_clear_all_unused() sprite_reset(sprite); sprite->linked_list_type_offset = SPRITE_LIST_NULL * 2; + // This shouldn't be necessary, as sprite_reset() preserves the index + // but it has been left in as a safety net in case the index isn't set correctly + sprite->sprite_index = spriteIndex; + // sprite->next_in_quadrant will only end up as zero owing to corruption // most likely due to previous builds not preserving it when resetting sprites // We reset it to SPRITE_INDEX_NULL to prevent cycles in the sprite lists