petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Remove std::function from Pool iteration wrapper

Browse Source 
Add a separate template wrapper for filtered iteration
This commit is contained in:
Jonathan G Rennison
2020-01-06 17:19:24 +00:00
committed by Charles Pigott
parent 4cc1420beb
commit 150dfba95b
3 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine_base.h
View File

@@ -142,15 +142,21 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> {
uint32 GetGRFID() const;
struct EngineTypeFilter {
VehicleType vt;
bool operator() (size_t index) { return Engine::Get(index)->type == this->vt; }
};
/**
* Returns an iterable ensemble of all valid engines of the given type
* @param vt the VehicleType for engines to be valid
* @param from index of the first engine to consider
* @return an iterable ensemble of all valid engines of the given type
*/
static Pool::IterateWrapper<Engine> IterateType(VehicleType vt, size_t from = 0)
static Pool::IterateWrapperFiltered<Engine, EngineTypeFilter> IterateType(VehicleType vt, size_t from = 0)
{
return Pool::IterateWrapper<Engine>(from, [vt](size_t index) { return Engine::Get(index)->type == vt; });
return Pool::IterateWrapperFiltered<Engine, EngineTypeFilter>(from, EngineTypeFilter{ vt });
}
};