miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Use std::range::find_if where possible.

Browse Source
This commit is contained in:
Peter Nelson
2024-11-10 10:57:48 +00:00
committed by Peter Nelson
parent 059a4b22f7
commit fa1849b855
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/newgrf_text.cpp
+2 -2
View File
@@ -560,7 +560,7 @@ StringID AddGRFString(uint32_t grfid, uint16_t stringid, uint8_t langid_to_add,
}
}
auto it = std::find_if(std::begin(_grf_text), std::end(_grf_text), [&grfid, &stringid](const GRFTextEntry &grf_text) { return grf_text.grfid == grfid && grf_text.stringid == stringid; });
auto it = std::ranges::find_if(_grf_text, [&grfid, &stringid](const GRFTextEntry &grf_text) { return grf_text.grfid == grfid && grf_text.stringid == stringid; });
if (it == std::end(_grf_text)) {
/* Too many strings allocated, return empty. */
if (_grf_text.size() == TAB_SIZE_NEWGRF) return STR_EMPTY;
@@ -586,7 +586,7 @@ StringID AddGRFString(uint32_t grfid, uint16_t stringid, uint8_t langid_to_add,
*/
StringID GetGRFStringID(uint32_t grfid, StringID stringid)
{
auto it = std::find_if(std::begin(_grf_text), std::end(_grf_text), [&grfid, &stringid](const GRFTextEntry &grf_text) { return grf_text.grfid == grfid && grf_text.stringid == stringid; });
auto it = std::ranges::find_if(_grf_text, [&grfid, &stringid](const GRFTextEntry &grf_text) { return grf_text.grfid == grfid && grf_text.stringid == stringid; });
if (it != std::end(_grf_text)) {
uint id = static_cast<uint>(it - std::begin(_grf_text));
return MakeStringID(TEXT_TAB_NEWGRF_START, id);