amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 20:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codefix: Use snake_case instead of camelCase in layouters.

Browse Source
This commit is contained in:
Peter Nelson
2024-12-20 19:05:08 +00:00
committed by Peter Nelson
parent d623aa0dfb
commit c78e309b16
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/os/windows/string_uniscribe.cpp
+3 -3
View File
@@ -276,14 +276,14 @@ static std::vector<SCRIPT_ITEM> UniscribeItemizeString(UniscribeParagraphLayoutF
return items;
}
/* static */ std::unique_ptr<ParagraphLayouter> UniscribeParagraphLayoutFactory::GetParagraphLayout(CharType *buff, CharType *buff_end, FontMap &fontMapping)
/* static */ std::unique_ptr<ParagraphLayouter> UniscribeParagraphLayoutFactory::GetParagraphLayout(CharType *buff, CharType *buff_end, FontMap &font_mapping)
{
int32_t length = buff_end - buff;
/* Can't layout an empty string. */
if (length == 0) return nullptr;
/* Can't layout our in-built sprite fonts. */
for (auto const &pair : fontMapping) {
for (auto const &pair : font_mapping) {
if (pair.second->fc->IsBuiltInFont()) return nullptr;
}
@@ -297,7 +297,7 @@ static std::vector<SCRIPT_ITEM> UniscribeItemizeString(UniscribeParagraphLayoutF
int cur_pos = 0;
std::vector<SCRIPT_ITEM>::iterator cur_item = items.begin();
for (auto const &i : fontMapping) {
for (auto const &i : font_mapping) {
while (cur_pos < i.first && cur_item != items.end() - 1) {
/* Add a range that spans the intersection of the remaining item and font run. */
int stop_pos = std::min(i.first, (cur_item + 1)->iCharPos);