From 09b66e9075bf91e812bfab956d04f5c8815c03ec Mon Sep 17 00:00:00 2001 From: jason-mills Date: Sat, 28 Sep 2024 03:01:10 -0700 Subject: [PATCH] Part of #21421: Update FontFamilies.h, audio.h with new constant notation (#22838) Co-authored-by: Tulio Leao --- src/openrct2/audio/Audio.cpp | 2 +- src/openrct2/audio/audio.h | 5 +-- src/openrct2/interface/FontFamilies.h | 6 ++- src/openrct2/interface/Fonts.cpp | 2 +- src/openrct2/localisation/Language.cpp | 56 +++++++++++++------------- 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 91a2371d2b..4b9f01e1d3 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -202,7 +202,7 @@ namespace OpenRCT2::Audio static void Play(IAudioSource* audioSource, int32_t volume, int32_t pan) { int32_t mixerPan = 0; - if (pan != AUDIO_PLAY_AT_CENTRE) + if (pan != kAudioPlayAtCentre) { int32_t x2 = pan << 16; uint16_t screenWidth = std::max(64, OpenRCT2::GetContext()->GetUiContext()->GetWidth()); diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/audio.h index 31de84ac66..b888ee75ed 100644 --- a/src/openrct2/audio/audio.h +++ b/src/openrct2/audio/audio.h @@ -27,8 +27,7 @@ namespace OpenRCT2::Audio constexpr size_t kMaxVehicleSounds = 14; constexpr size_t kMaxDefaultMusic = 46; constexpr uint16_t kSoundIdNull = 0xFFFF; - -#define AUDIO_PLAY_AT_CENTRE 0x8000 + constexpr int32_t kAudioPlayAtCentre = 0x8000; struct IAudioChannel; struct IAudioSource; @@ -210,7 +209,7 @@ namespace OpenRCT2::Audio * Plays the specified sound. * @param soundId The sound effect to play. * @param volume The volume at which the sound effect should be played. - * @param pan The pan at which the sound effect should be played. If set to anything other than AUDIO_PLAY_AT_CENTRE, plays + * @param pan The pan at which the sound effect should be played. If set to anything other than kAudioPlayAtCentre, plays * the sound at a position relative to the centre of the viewport. */ void Play(SoundId soundId, int32_t volume, int32_t pan); diff --git a/src/openrct2/interface/FontFamilies.h b/src/openrct2/interface/FontFamilies.h index b351a719ac..cf22871f51 100644 --- a/src/openrct2/interface/FontFamilies.h +++ b/src/openrct2/interface/FontFamilies.h @@ -9,7 +9,9 @@ #pragma once -#define FAMILY_OPENRCT2_SPRITE nullptr +#include + +constexpr std::nullptr_t kFamilyOpenRCT2Sprite = nullptr; #ifndef NO_TTF @@ -29,6 +31,6 @@ extern TTFontFamily const TTFFamilySansSerif; #else // NO_TTF -# define FAMILY(x) FAMILY_OPENRCT2_SPRITE +# define FAMILY(x) kFamilyOpenRCT2Sprite #endif // NO_TTF diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index b38b4699b6..683ca94f2f 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -157,7 +157,7 @@ void TryLoadFonts(LocalisationService& localisationService) auto currentLanguage = localisationService.GetCurrentLanguage(); TTFontFamily const* fontFamily = LanguagesDescriptors[currentLanguage].font_family; - if (fontFamily != FAMILY_OPENRCT2_SPRITE) + if (fontFamily != kFamilyOpenRCT2Sprite) { if (!Config::Get().fonts.FileName.empty()) { diff --git a/src/openrct2/localisation/Language.cpp b/src/openrct2/localisation/Language.cpp index 3df44bedd8..0d6100c524 100644 --- a/src/openrct2/localisation/Language.cpp +++ b/src/openrct2/localisation/Language.cpp @@ -25,34 +25,34 @@ using namespace OpenRCT2; // clang-format off const LanguageDescriptor LanguagesDescriptors[LANGUAGE_COUNT] = { - { "", "", "", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_UNDEFINED - { "ar-EG", "Arabic (experimental)", "Arabic (experimental)", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilySansSerif), true }, // LANGUAGE_ARABIC - { "ca-ES", "Catalan", u8"Català", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_CATALAN - { "zh-CN", "Chinese (Simplified)", "Chinese (Simplified)", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyChineseSimplified), false }, // LANGUAGE_CHINESE_SIMPLIFIED - { "zh-TW", "Chinese (Traditional)", "Chinese (Traditional)", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyChineseTraditional), false }, // LANGUAGE_CHINESE_TRADITIONAL - { "cs-CZ", "Czech", u8"Čeština", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_CZECH - { "da-DK", "Danish", "Dansk", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_DANISH - { "de-DE", "German", "Deutsch", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_GERMAN - { "en-GB", "English (UK)", "English (UK)", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_ENGLISH_UK - { "en-US", "English (US)", "English (US)", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_ENGLISH_US - { "eo-ZZ", "Esperanto", "Esperanto", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_ESPERANTO - { "es-ES", "Spanish", u8"Español", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_SPANISH - { "fr-FR", "French", u8"Français", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_FRENCH - { "fr-CA", "French (CA)", u8"Français (CA)", LANGUAGE_FRENCH, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_FRENCH_CA - { "it-IT", "Italian", "Italiano", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_ITALIAN - { "ja-JP", "Japanese", "Japanese", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyJapanese), false }, // LANGUAGE_JAPANESE - { "ko-KR", "Korean", "Korean", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyKorean), false }, // LANGUAGE_KOREAN - { "hu-HU", "Hungarian", "Magyar", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_HUNGARIAN - { "nl-NL", "Dutch", "Nederlands", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_DUTCH - { "nb-NO", "Norwegian", "Norsk", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_NORWEGIAN - { "pl-PL", "Polish", "Polski", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_POLISH - { "pt-BR", "Portuguese (BR)", u8"Português (BR)", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_PORTUGUESE_BR - { "ru-RU", "Russian", u8"Русский", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_RUSSIAN - { "fi-FI", "Finnish", "Suomi", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_FINNISH - { "sv-SE", "Swedish", "Svenska", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_SWEDISH - { "tr-TR", "Turkish", "Türkçe", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_TURKISH - { "uk-UA", "Ukrainian", u8"Українська", LANGUAGE_UNDEFINED, FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_UKRAINIAN - { "vi-VN", "Vietnamese", "Vietnamese", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilySansSerif), false }, // LANGUAGE_VIETNAMESE + { "", "", "", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_UNDEFINED + { "ar-EG", "Arabic (experimental)", "Arabic (experimental)", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilySansSerif), true }, // LANGUAGE_ARABIC + { "ca-ES", "Catalan", u8"Català", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_CATALAN + { "zh-CN", "Chinese (Simplified)", "Chinese (Simplified)", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyChineseSimplified), false }, // LANGUAGE_CHINESE_SIMPLIFIED + { "zh-TW", "Chinese (Traditional)", "Chinese (Traditional)", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyChineseTraditional), false }, // LANGUAGE_CHINESE_TRADITIONAL + { "cs-CZ", "Czech", u8"Čeština", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_CZECH + { "da-DK", "Danish", "Dansk", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_DANISH + { "de-DE", "German", "Deutsch", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_GERMAN + { "en-GB", "English (UK)", "English (UK)", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_ENGLISH_UK + { "en-US", "English (US)", "English (US)", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_ENGLISH_US + { "eo-ZZ", "Esperanto", "Esperanto", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_ESPERANTO + { "es-ES", "Spanish", u8"Español", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_SPANISH + { "fr-FR", "French", u8"Français", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_FRENCH + { "fr-CA", "French (CA)", u8"Français (CA)", LANGUAGE_FRENCH, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_FRENCH_CA + { "it-IT", "Italian", "Italiano", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_ITALIAN + { "ja-JP", "Japanese", "Japanese", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyJapanese), false }, // LANGUAGE_JAPANESE + { "ko-KR", "Korean", "Korean", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilyKorean), false }, // LANGUAGE_KOREAN + { "hu-HU", "Hungarian", "Magyar", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_HUNGARIAN + { "nl-NL", "Dutch", "Nederlands", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_DUTCH + { "nb-NO", "Norwegian", "Norsk", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_NORWEGIAN + { "pl-PL", "Polish", "Polski", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_POLISH + { "pt-BR", "Portuguese (BR)", u8"Português (BR)", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_PORTUGUESE_BR + { "ru-RU", "Russian", u8"Русский", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_RUSSIAN + { "fi-FI", "Finnish", "Suomi", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_FINNISH + { "sv-SE", "Swedish", "Svenska", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_SWEDISH + { "tr-TR", "Turkish", "Türkçe", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_TURKISH + { "uk-UA", "Ukrainian", u8"Українська", LANGUAGE_UNDEFINED, kFamilyOpenRCT2Sprite, false }, // LANGUAGE_UKRAINIAN + { "vi-VN", "Vietnamese", "Vietnamese", LANGUAGE_UNDEFINED, FAMILY(&TTFFamilySansSerif), false }, // LANGUAGE_VIETNAMESE }; // clang-format on