(svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved

1 files changed, 4 insertions, 5 deletions

diff --git a/src/engine_base.h b/src/engine_base.h
index e3e055164..3e53564e4 100644
--- a/src/engine_base.h
+++ b/src/engine_base.h
@@ -7,12 +7,13 @@
 
 #include "engine_type.h"
 #include "economy_type.h"
-#include "oldpool.h"
+#include "core/pool.hpp"
 #include "core/smallvec_type.hpp"
 
-DECLARE_OLD_POOL(Engine, Engine, 6, 10000)
+typedef Pool<Engine, EngineID, 64, 64000> EnginePool;
+extern EnginePool _engine_pool;
 
-struct Engine : PoolItem<Engine, EngineID, &_Engine_pool> {
+struct Engine : EnginePool::PoolItem<&_engine_pool> {
 	char *name;         ///< Custom name of engine
 	Date intro_date;
 	Date age;
@@ -49,8 +50,6 @@ struct Engine : PoolItem<Engine, EngineID, &_Engine_pool> {
 	Engine(VehicleType type, EngineID base);
 	~Engine();
 
-	inline bool IsValid() const { return this->info.climates != 0; }
-
 	CargoID GetDefaultCargoType() const;
 	bool CanCarryCargo() const;
 	uint GetDisplayDefaultCapacity() const;