mirror of https://github.com/OpenTTD/OpenTTD
Codechange: remove SimpleSpriteAllocator
parent
b50cf8f252
commit
23ba18ada7
|
@ -887,14 +887,6 @@ void *CacheSpriteAllocator::AllocatePtr(size_t mem_req)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sprite allocator simply using malloc.
|
|
||||||
*/
|
|
||||||
void *SimpleSpriteAllocator::AllocatePtr(size_t size)
|
|
||||||
{
|
|
||||||
return MallocT<uint8_t>(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void *UniquePtrSpriteAllocator::AllocatePtr(size_t size)
|
void *UniquePtrSpriteAllocator::AllocatePtr(size_t size)
|
||||||
{
|
{
|
||||||
this->data = std::make_unique<uint8_t[]>(size);
|
this->data = std::make_unique<uint8_t[]>(size);
|
||||||
|
|
|
@ -31,12 +31,6 @@ enum SpriteCacheCtrlFlags : uint8_t {
|
||||||
|
|
||||||
extern uint _sprite_cache_size;
|
extern uint _sprite_cache_size;
|
||||||
|
|
||||||
/** SpriteAllocate that uses malloc to allocate memory. */
|
|
||||||
class SimpleSpriteAllocator : public SpriteAllocator {
|
|
||||||
protected:
|
|
||||||
void *AllocatePtr(size_t size) override;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** SpriteAllocator that allocates memory via a unique_ptr array. */
|
/** SpriteAllocator that allocates memory via a unique_ptr array. */
|
||||||
class UniquePtrSpriteAllocator : public SpriteAllocator {
|
class UniquePtrSpriteAllocator : public SpriteAllocator {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
static bool MockLoadNextSprite(SpriteID load_index)
|
static bool MockLoadNextSprite(SpriteID load_index)
|
||||||
{
|
{
|
||||||
SimpleSpriteAllocator allocator;
|
static UniquePtrSpriteAllocator allocator;
|
||||||
static Sprite *sprite = allocator.Allocate<Sprite>(sizeof(*sprite));
|
static Sprite *sprite = allocator.Allocate<Sprite>(sizeof(*sprite));
|
||||||
|
|
||||||
bool is_mapgen = IsMapgenSpriteID(load_index);
|
bool is_mapgen = IsMapgenSpriteID(load_index);
|
||||||
|
|
Loading…
Reference in New Issue