diff options
author | Jonathan G Rennison <j.g.rennison@gmail.com> | 2020-01-06 17:19:24 +0000 |
---|---|---|
committer | Charles Pigott <charlespigott@googlemail.com> | 2020-01-07 09:00:45 +0000 |
commit | 150dfba95b9a6352b869804691aa6c07c83ef9df (patch) | |
tree | f187ba5bb7a393ba74cef5f08feba5b4e7656e32 /src/engine_base.h | |
parent | 4cc1420beb0470ba076c5f30dbd57b05489b0b1b (diff) | |
download | openttd-150dfba95b9a6352b869804691aa6c07c83ef9df.tar.xz |
Codechange: Remove std::function from Pool iteration wrapper
Add a separate template wrapper for filtered iteration
Diffstat (limited to 'src/engine_base.h')
-rw-r--r-- | src/engine_base.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/engine_base.h b/src/engine_base.h index 1328f66a1..203d35f20 100644 --- a/src/engine_base.h +++ b/src/engine_base.h @@ -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 }); } }; |