2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:47:43 +00:00

Implement additive body states, rstl::binary_find

This commit is contained in:
Jack Andersen
2017-07-10 21:17:03 -10:00
parent 7e85ab932b
commit daef773f39
17 changed files with 371 additions and 71 deletions

View File

@@ -169,8 +169,8 @@ static const CCharacterIdentifier gCantEndChars[] =
int CWordBreakTables::GetBeginRank(wchar_t ch)
{
auto search = std::lower_bound(std::cbegin(gCantBeginChars), std::cend(gCantBeginChars), ch,
[](const CCharacterIdentifier& item, const wchar_t& test) -> bool {return item.chr < test;});
auto search = rstl::binary_find(std::cbegin(gCantBeginChars), std::cend(gCantBeginChars), ch,
[](const CCharacterIdentifier& item) {return item.chr;});
if (search == std::cend(gCantBeginChars))
return 5;
return search->rank;
@@ -178,8 +178,8 @@ int CWordBreakTables::GetBeginRank(wchar_t ch)
int CWordBreakTables::GetEndRank(wchar_t ch)
{
auto search = std::lower_bound(std::cbegin(gCantEndChars), std::cend(gCantEndChars), ch,
[](const CCharacterIdentifier& item, const wchar_t& test) -> bool {return item.chr < test;});
auto search = rstl::binary_find(std::cbegin(gCantEndChars), std::cend(gCantEndChars), ch,
[](const CCharacterIdentifier& item) {return item.chr;});
if (search == std::cend(gCantEndChars))
return 5;
return search->rank;