summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2011-02-19 18:25:24 +0000
committersmatz <smatz@openttd.org>2011-02-19 18:25:24 +0000
commit1d9cae9afadece0195347a12664bc4124b578819 (patch)
tree91ca5f94183418b59c3f0cbaf2ee582bb2e2da12
parent5fd13843f7ada744d221ea473ba781809cd97a85 (diff)
downloadopenttd-1d9cae9afadece0195347a12664bc4124b578819.tar.xz
(svn r22113) -Codechange: use PoolBase::CleanAll() to clean all pools at game exit
-rw-r--r--src/openttd.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp
index c95657d20..829b51a4c 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -265,17 +265,6 @@ static void ShutdownGame()
/* Uninitialize variables that are allocated dynamically */
GamelogReset();
- _town_pool.CleanPool();
- _industry_pool.CleanPool();
- _station_pool.CleanPool();
- _roadstop_pool.CleanPool();
- _vehicle_pool.CleanPool();
- _sign_pool.CleanPool();
- _order_pool.CleanPool();
- _group_pool.CleanPool();
- _cargopacket_pool.CleanPool();
- _engine_pool.CleanPool();
- _company_pool.CleanPool();
#ifdef ENABLE_NETWORK
free(_config_file);
@@ -283,6 +272,8 @@ static void ShutdownGame()
ResetNewGRFData();
+ PoolBase::CleanAll();
+
/* Close all and any open filehandles */
FioCloseAll();
}