summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-07-05 13:20:05 +0000
committersmatz <smatz@openttd.org>2009-07-05 13:20:05 +0000
commitc861d9b64b2a63fa86ea87ac1e71f8f7341c694b (patch)
treef3aa246db5e1a5db2728facf1e79d65abe0dc75b /src/core
parent4c6a4e3ab2fb4ebc6a5770c4373b68ff3ffa1d04 (diff)
downloadopenttd-c861d9b64b2a63fa86ea87ac1e71f8f7341c694b.tar.xz
(svn r16745) -Fix [FS#3011]: invalidate JoinStation window after removing item from the pool
Diffstat (limited to 'src/core')
-rw-r--r--src/core/pool_func.hpp1
-rw-r--r--src/core/pool_type.hpp9
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/pool_func.hpp b/src/core/pool_func.hpp
index 3ac28f472..1687b4faf 100644
--- a/src/core/pool_func.hpp
+++ b/src/core/pool_func.hpp
@@ -108,6 +108,7 @@ DEFINE_POOL_METHOD(void)::FreeItem(size_t index)
this->data[index] = NULL;
this->first_free = min(this->first_free, index);
this->items--;
+ if (!this->cleaning) Titem::PostDestructor(index);
}
DEFINE_POOL_METHOD(void)::CleanPool()
diff --git a/src/core/pool_type.hpp b/src/core/pool_type.hpp
index 2d32df724..2f35b4a88 100644
--- a/src/core/pool_type.hpp
+++ b/src/core/pool_type.hpp
@@ -221,6 +221,15 @@ struct Pool {
{
return Tpool->items;
}
+
+ /**
+ * Dummy function called after destructor of each member.
+ * If you want to use it, override it in PoolItem's subclass.
+ * @param index index of deleted item
+ * @note when this function is called, PoolItem::Get(index) == NULL.
+ * @note it's called only when !CleaningPool()
+ */
+ static FORCEINLINE void PostDestructor(size_t index) { }
};
private: