From 23ba18ada7706577d7ff31f07ef640734effbc65 Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Sun, 23 Feb 2025 09:27:03 +0100
Subject: [PATCH] Codechange: remove SimpleSpriteAllocator

---
 src/spritecache.cpp            | 8 --------
 src/spritecache.h              | 6 ------
 src/tests/mock_spritecache.cpp | 2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/spritecache.cpp b/src/spritecache.cpp
index 66683692dc..a4eeb809ac 100644
--- a/src/spritecache.cpp
+++ b/src/spritecache.cpp
@@ -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)
 {
 	this->data = std::make_unique<uint8_t[]>(size);
diff --git a/src/spritecache.h b/src/spritecache.h
index 5f4960e22e..3f0e99dd7a 100644
--- a/src/spritecache.h
+++ b/src/spritecache.h
@@ -31,12 +31,6 @@ enum SpriteCacheCtrlFlags : uint8_t {
 
 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. */
 class UniquePtrSpriteAllocator : public SpriteAllocator {
 public:
diff --git a/src/tests/mock_spritecache.cpp b/src/tests/mock_spritecache.cpp
index 222d49043f..18ff34c872 100644
--- a/src/tests/mock_spritecache.cpp
+++ b/src/tests/mock_spritecache.cpp
@@ -17,7 +17,7 @@
 
 static bool MockLoadNextSprite(SpriteID load_index)
 {
-	SimpleSpriteAllocator allocator;
+	static UniquePtrSpriteAllocator allocator;
 	static Sprite *sprite = allocator.Allocate<Sprite>(sizeof(*sprite));
 
 	bool is_mapgen = IsMapgenSpriteID(load_index);