diff options
| author | rubidium42 <rubidium@openttd.org> | 2021-04-28 17:10:15 +0200 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-13 23:13:17 +0200 |
| commit | 77330d09fd8307261e94fe0eb0260f5ca5cc3898 (patch) | |
| tree | 0a2d3efe86b4f0047b558bb668dc9ed17ac63d3f /src/strings.cpp | |
| parent | 65cbde4b30f8fdf6d4cf1196f6a596a5550c9aee (diff) | |
| download | openttd-77330d09fd8307261e94fe0eb0260f5ca5cc3898.tar.xz | |
Codechange: move font settings to std::string
Diffstat (limited to 'src/strings.cpp')
| -rw-r--r-- | src/strings.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index b5cb59d20..fb1943870 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -2090,9 +2090,9 @@ class LanguagePackGlyphSearcher : public MissingGlyphSearcher { void SetFontNames(FreeTypeSettings *settings, const char *font_name, const void *os_data) override { #if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) - strecpy(settings->small.font, font_name, lastof(settings->small.font)); - strecpy(settings->medium.font, font_name, lastof(settings->medium.font)); - strecpy(settings->large.font, font_name, lastof(settings->large.font)); + settings->small.font = font_name; + settings->medium.font = font_name; + settings->large.font = font_name; settings->small.os_handle = os_data; settings->medium.os_handle = os_data; @@ -2123,15 +2123,14 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher) if (bad_font) { /* We found an unprintable character... lets try whether we can find * a fallback font that can print the characters in the current language. */ - FreeTypeSettings backup; - memcpy(&backup, &_freetype, sizeof(backup)); + FreeTypeSettings backup = _freetype; _freetype.mono.os_handle = nullptr; _freetype.medium.os_handle = nullptr; bad_font = !SetFallbackFont(&_freetype, _langpack.langpack->isocode, _langpack.langpack->winlangid, searcher); - memcpy(&_freetype, &backup, sizeof(backup)); + _freetype = backup; if (!bad_font) { /* Show that we loaded fallback font. To do this properly we have |