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

Split up Sprite header (#14764)

Browse Source 
* Remove fields from rct_sprite union

* more header fun

* Fix guest include
This commit is contained in:
Duncan
2021-05-29 06:01:32 +01:00
committed by GitHub
parent 21bb949322
commit 39fcc5d078
63 changed files with 223 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,14 @@
#include "../interface/Viewport.h"
#include "../localisation/Date.h"
#include "../localisation/Localisation.h"
#include "../peep/Peep.h"
#include "../ride/Vehicle.h"
#include "../scenario/Scenario.h"
#include "Balloon.h"
#include "Duck.h"
#include "Fountain.h"
#include "MoneyEffect.h"
#include "Particle.h"
#include <algorithm>
#include <cmath>
@@ -36,6 +42,9 @@ static std::vector<uint16_t> _freeIdList;
static bool _spriteFlashingList[MAX_ENTITIES];
constexpr const uint32_t SPATIAL_INDEX_SIZE = (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) + 1;
constexpr const uint32_t SPATIAL_INDEX_LOCATION_NULL = SPATIAL_INDEX_SIZE - 1;
static std::array<std::vector<uint16_t>, SPATIAL_INDEX_SIZE> gSpriteSpatialIndex;
constexpr size_t GetSpatialIndexOffset(int32_t x, int32_t y)
@@ -135,7 +144,7 @@ std::string rct_sprite_checksum::ToString() const
SpriteBase* try_get_sprite(size_t spriteIndex)
{
return spriteIndex >= MAX_ENTITIES ? nullptr : &_spriteList[spriteIndex].misc;
return spriteIndex >= MAX_ENTITIES ? nullptr : &_spriteList[spriteIndex].base;
}
SpriteBase* get_sprite(size_t spriteIndex)