mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Use sprite_identifier when identifying entitys

Browse Source 
The linked list index is only meant to be used for accessing the linked lists. Using the wrong variable is unlikely to cause issues for this exact case but it makes things cleaner.
This commit is contained in:
duncanspumpkin
2020-04-27 18:47:51 +01:00
parent 06bbf5ddda
commit 5b07a76f05
7 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/world/Sprite.cpp
View File

@@ -163,7 +163,7 @@ void reset_sprite_list()
spr->generic.sprite_identifier = SPRITE_IDENTIFIER_NULL;
spr->generic.sprite_index = i;
spr->generic.next = SPRITE_INDEX_NULL;
spr->generic.linked_list_index = 0;
spr->generic.linked_list_index = SPRITE_LIST_FREE;
if (previous_spr != nullptr)
{
@@ -827,7 +827,7 @@ void litter_remove_at(int32_t x, int32_t y, int32_t z)
{
rct_sprite* sprite = get_sprite(spriteIndex);
uint16_t nextSpriteIndex = sprite->generic.next_in_quadrant;
if (sprite->generic.linked_list_index == SPRITE_LIST_LITTER)
if (sprite->generic.sprite_identifier == SPRITE_IDENTIFIER_LITTER)
{
Litter* litter = &sprite->litter;
@@ -884,11 +884,10 @@ uint16_t remove_floating_sprites()
*/
static bool sprite_should_tween(rct_sprite* sprite)
{
switch (sprite->generic.linked_list_index)
switch (sprite->generic.sprite_identifier)
{
case SPRITE_LIST_PEEP:
case SPRITE_LIST_TRAIN_HEAD:
case SPRITE_LIST_VEHICLE:
case SPRITE_IDENTIFIER_PEEP:
case SPRITE_IDENTIFIER_VEHICLE:
return true;
}
return false;