dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
smatz
2009-05-22 15:13:50 +00:00
parent 7eb14aa49f
commit 50624d5c0f
69 changed files with 834 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine.cpp
View File

@@ -18,15 +18,16 @@
#include "date_func.h"
#include "autoreplace_gui.h"
#include "string_func.h"
#include "oldpool_func.h"
#include "ai/ai.hpp"
#include "vehicle_func.h"
#include "settings_type.h"
#include "core/pool_func.hpp"
#include "table/strings.h"
#include "table/engines.h"
DEFINE_OLD_POOL_GENERIC(Engine, Engine)
EnginePool _engine_pool("Engine");
INSTANTIATE_POOL_METHODS(Engine)
EngineOverrideManager _engine_mngr;
@@ -356,7 +357,7 @@ EngineID EngineOverrideManager::GetID(VehicleType type, uint16 grf_local_id, uin
*/
void SetCachedEngineCounts()
{
uint engines = Engine::GetPoolSize();
size_t engines = Engine::GetPoolSize();
/* Set up the engine count for all companies */
Company *c;
@@ -392,8 +393,7 @@ void SetCachedEngineCounts()
void SetupEngines()
{
_Engine_pool.CleanPool();
_Engine_pool.AddBlockToPool();
_engine_pool.CleanPool();
assert(_engine_mngr.Length() >= _engine_mngr.NUM_DEFAULT_ENGINES);
const EngineIDMapping *end = _engine_mngr.End();