diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 178061978c..c6c67092df 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -21,6 +21,7 @@ add_files(
mem_func.hpp
multimap.hpp
overflowsafe_type.hpp
+ pod_pool.hpp
pool_func.cpp
pool_func.hpp
pool_type.hpp
diff --git a/src/core/pod_pool.hpp b/src/core/pod_pool.hpp
new file mode 100644
index 0000000000..11c9b974e0
--- /dev/null
+++ b/src/core/pod_pool.hpp
@@ -0,0 +1,106 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
+ */
+
+/** @file pod_pool.hpp A pool-type container for POD data. */
+
+#ifndef POD_POOL_HPP
+#define POD_POOL_HPP
+
+#include
+
+/**
+ * Pool-type container for POD data..
+ */
+template
+class PodPool {
+ static_assert(SIZE >= sizeof(IDX));
+
+ std::vector used_blocks;
+
+ void *current_block = nullptr;
+ IDX last_freed = (IDX)(-1);
+ IDX next_position = 0;
+
+ void NewBlock()
+ {
+ current_block = malloc(SIZE * N_PER_CHUNK);
+ assert(current_block != nullptr);
+ next_position = 0;
+ used_blocks.push_back(current_block);
+ }
+
+ public:
+ PodPool() = default;
+ PodPool(const PodPool &other) = delete;
+ PodPool& operator=(const PodPool &other) = delete;
+
+ PodPool(PodPool &&other)
+ {
+ *this = std::move(other);
+ }
+
+ PodPool& operator=(PodPool &&other)
+ {
+ this->used_blocks = std::move(other.used_blocks);
+ this->current_block = other.current_block;
+ this->last_freed = other.last_freed;
+ this->next_position = other.next_position;
+ other.used_blocks.clear();
+ other.current_block = nullptr;
+ other.last_freed = (IDX)(-1);
+ other.next_position = 0;
+ return *this;
+ }
+
+ ~PodPool()
+ {
+ this->Clear();
+ }
+
+ void Clear()
+ {
+ this->current_block = nullptr;
+ this->last_freed = (IDX)(-1);
+ this->next_position = 0;
+ for (void *block : this->used_blocks) {
+ free(block);
+ }
+ this->used_blocks.clear();
+ }
+
+ inline PTR operator[](IDX idx) { return reinterpret_cast(reinterpret_cast(this->used_blocks[idx / N_PER_CHUNK]) + (SIZE * (idx % N_PER_CHUNK))); }
+
+ std::pair Allocate() {
+ if (this->last_freed != (IDX)(-1)) {
+ IDX idx = this->last_freed;
+ PTR item = (*this)[idx];
+ this->last_freed = *reinterpret_cast(item);
+ return std::make_pair(idx, item);
+ } else {
+ if (current_block == nullptr || next_position == N_PER_CHUNK) {
+ NewBlock();
+ }
+ IDX idx = this->next_position + ((IDX)(this->used_blocks.size() - 1) * N_PER_CHUNK);
+ PTR item = reinterpret_cast(reinterpret_cast(current_block) + (SIZE * next_position));
+ this->next_position++;
+ return std::make_pair(idx, item);
+ }
+ }
+
+ void Free(IDX idx) {
+ this->Free(idx, (*this)[idx]);
+ }
+
+ void Free(IDX idx, PTR item) {
+ dbg_assert(current_block != nullptr);
+
+ *reinterpret_cast(item) = this->last_freed;
+ this->last_freed = idx;
+ }
+};
+
+#endif /* POD_POOL_HPP */