mirror of https://github.com/OpenTTD/OpenTTD
Compare commits
No commits in common. "9215e36300fecd8726078505f47b8205618cc7e1" and "1d902a97ce8ded072e41966c13c7d35f0ab5b6a9" have entirely different histories.
9215e36300
...
1d902a97ce
|
@ -183,10 +183,10 @@ void CrashLog::LogConfiguration(std::back_insert_iterator<std::string> &output_i
|
||||||
" Medium: {}\n"
|
" Medium: {}\n"
|
||||||
" Large: {}\n"
|
" Large: {}\n"
|
||||||
" Mono: {}\n\n",
|
" Mono: {}\n\n",
|
||||||
FontCache::GetName(FS_SMALL),
|
FontCache::Get(FS_SMALL)->GetFontName(),
|
||||||
FontCache::GetName(FS_NORMAL),
|
FontCache::Get(FS_NORMAL)->GetFontName(),
|
||||||
FontCache::GetName(FS_LARGE),
|
FontCache::Get(FS_LARGE)->GetFontName(),
|
||||||
FontCache::GetName(FS_MONO)
|
FontCache::Get(FS_MONO)->GetFontName()
|
||||||
);
|
);
|
||||||
|
|
||||||
fmt::format_to(output_iterator, "AI Configuration (local: {}) (current: {}):\n", _local_company, _current_company);
|
fmt::format_to(output_iterator, "AI Configuration (local: {}) (current: {}):\n", _local_company, _current_company);
|
||||||
|
|
|
@ -53,21 +53,6 @@ int FontCache::GetDefaultFontHeight(FontSize fs)
|
||||||
return _default_font_height[fs];
|
return _default_font_height[fs];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the font name of a given font size.
|
|
||||||
* @param fs The font size to look up.
|
|
||||||
* @return The font name.
|
|
||||||
*/
|
|
||||||
std::string FontCache::GetName(FontSize fs)
|
|
||||||
{
|
|
||||||
FontCache *fc = FontCache::Get(fs);
|
|
||||||
if (fc != nullptr) {
|
|
||||||
return fc->GetFontName();
|
|
||||||
} else {
|
|
||||||
return "[NULL]";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get height of a character for a given font size.
|
* Get height of a character for a given font size.
|
||||||
|
|
|
@ -147,8 +147,6 @@ public:
|
||||||
return FontCache::caches[fs];
|
return FontCache::caches[fs];
|
||||||
}
|
}
|
||||||
|
|
||||||
static std::string GetName(FontSize fs);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check whether the font cache has a parent.
|
* Check whether the font cache has a parent.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -5627,8 +5627,6 @@ STR_JUST_DATE_SHORT :{DATE_SHORT}
|
||||||
STR_JUST_DATE_LONG :{DATE_LONG}
|
STR_JUST_DATE_LONG :{DATE_LONG}
|
||||||
STR_JUST_DATE_ISO :{DATE_ISO}
|
STR_JUST_DATE_ISO :{DATE_ISO}
|
||||||
STR_JUST_STRING :{STRING}
|
STR_JUST_STRING :{STRING}
|
||||||
STR_JUST_STRING1 :{STRING}
|
|
||||||
STR_JUST_STRING2 :{STRING}
|
|
||||||
STR_JUST_STRING_STRING :{STRING}{STRING}
|
STR_JUST_STRING_STRING :{STRING}{STRING}
|
||||||
STR_JUST_RAW_STRING :{STRING}
|
STR_JUST_RAW_STRING :{STRING}
|
||||||
STR_JUST_BIG_RAW_STRING :{BIG_FONT}{STRING}
|
STR_JUST_BIG_RAW_STRING :{BIG_FONT}{STRING}
|
||||||
|
|
|
@ -5627,8 +5627,6 @@ STR_JUST_DATE_SHORT :{DATE_SHORT}
|
||||||
STR_JUST_DATE_LONG :{DATE_LONG}
|
STR_JUST_DATE_LONG :{DATE_LONG}
|
||||||
STR_JUST_DATE_ISO :{DATE_ISO}
|
STR_JUST_DATE_ISO :{DATE_ISO}
|
||||||
STR_JUST_STRING :{STRING}
|
STR_JUST_STRING :{STRING}
|
||||||
STR_JUST_STRING1 :{STRING}
|
|
||||||
STR_JUST_STRING2 :{STRING}
|
|
||||||
STR_JUST_STRING_STRING :{STRING}{STRING}
|
STR_JUST_STRING_STRING :{STRING}{STRING}
|
||||||
STR_JUST_RAW_STRING :{STRING}
|
STR_JUST_RAW_STRING :{STRING}
|
||||||
STR_JUST_BIG_RAW_STRING :{BIG_FONT}{STRING}
|
STR_JUST_BIG_RAW_STRING :{BIG_FONT}{STRING}
|
||||||
|
|
|
@ -5627,8 +5627,6 @@ STR_JUST_DATE_SHORT :{DATE_SHORT}
|
||||||
STR_JUST_DATE_LONG :{DATE_LONG}
|
STR_JUST_DATE_LONG :{DATE_LONG}
|
||||||
STR_JUST_DATE_ISO :{DATE_ISO}
|
STR_JUST_DATE_ISO :{DATE_ISO}
|
||||||
STR_JUST_STRING :{STRING}
|
STR_JUST_STRING :{STRING}
|
||||||
STR_JUST_STRING1 :{STRING}
|
|
||||||
STR_JUST_STRING2 :{STRING}
|
|
||||||
STR_JUST_STRING_STRING :{STRING}{STRING}
|
STR_JUST_STRING_STRING :{STRING}{STRING}
|
||||||
STR_JUST_RAW_STRING :{STRING}
|
STR_JUST_RAW_STRING :{STRING}
|
||||||
STR_JUST_BIG_RAW_STRING :{BIG_FONT}{STRING}
|
STR_JUST_BIG_RAW_STRING :{BIG_FONT}{STRING}
|
||||||
|
|
Loading…
Reference in New Issue