diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7d486b2256..0879fbe3ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,7 @@ to create a new issue in the OpenRCT2/Localisation repository about the new stri so that they can translate the new strings as quick as possible. Similarly if you change any existing string, it is more important that you create an issue as this can be more easily overlooked. -When coding, please also add a string constant for your strings to ```./src/localisation/string_ids.h```. +When coding, please also add a string constant for your strings to ```./src/localisation/StringIds.h```. ### Coding style Use [this](https://github.com/OpenRCT2/OpenRCT2/wiki/Coding-Style) code style as a reference for new or changed code. diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index f7f46fcb64..abebb3ab29 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -54,6 +54,17 @@ 4C729BC91FC2E6E9001DFF2F /* MoneyEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BC81FC2E6E9001DFF2F /* MoneyEffect.cpp */; }; 4C7B53A51FFC180400A52E21 /* ObjectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53A31FFC180400A52E21 /* ObjectList.cpp */; }; 4C7B53A81FFD15B200A52E21 /* Map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53A61FFD15B200A52E21 /* Map.cpp */; }; + 4C7B53BC1FFF935B00A52E21 /* Convert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */; }; + 4C7B53BD1FFF935B00A52E21 /* Currency.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */; }; + 4C7B53BE1FFF935B00A52E21 /* Date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AD1FFF935B00A52E21 /* Date.cpp */; }; + 4C7B53BF1FFF935B00A52E21 /* FormatCodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AF1FFF935B00A52E21 /* FormatCodes.cpp */; }; + 4C7B53C01FFF935B00A52E21 /* Language.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53B11FFF935B00A52E21 /* Language.cpp */; }; + 4C7B53C11FFF935B00A52E21 /* LanguagePack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53B31FFF935B00A52E21 /* LanguagePack.cpp */; }; + 4C7B53C21FFF935B00A52E21 /* Localisation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53B51FFF935B00A52E21 /* Localisation.cpp */; }; + 4C7B53C31FFF935B00A52E21 /* RealNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53B71FFF935B00A52E21 /* RealNames.cpp */; }; + 4C7B53C41FFF935B00A52E21 /* User.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53B91FFF935B00A52E21 /* User.cpp */; }; + 4C7B53C51FFF935B00A52E21 /* UTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53BB1FFF935B00A52E21 /* UTF8.cpp */; }; + 4C7B53C81FFF94F900A52E21 /* ConversionTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53C61FFF94F900A52E21 /* ConversionTables.cpp */; }; 4C7B53CE200029CE00A52E21 /* Line.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53CD200029CE00A52E21 /* Line.cpp */; }; 4C7B53D1200029D900A52E21 /* Rect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53CF200029D900A52E21 /* Rect.cpp */; }; 4C7B53D2200029D900A52E21 /* ScrollingText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53D0200029D900A52E21 /* ScrollingText.cpp */; }; @@ -345,16 +356,6 @@ F76C86221EC4E88300FA49E2 /* viewport_interaction.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83CF1EC4E7CC00FA49E2 /* viewport_interaction.c */; }; F76C86231EC4E88300FA49E2 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D01EC4E7CC00FA49E2 /* widget.c */; }; F76C86251EC4E88300FA49E2 /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D21EC4E7CC00FA49E2 /* window.c */; }; - F76C86291EC4E88300FA49E2 /* convert.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D81EC4E7CC00FA49E2 /* convert.c */; }; - F76C862A1EC4E88300FA49E2 /* currency.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D91EC4E7CC00FA49E2 /* currency.c */; }; - F76C862C1EC4E88300FA49E2 /* date.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83DB1EC4E7CC00FA49E2 /* date.c */; }; - F76C862E1EC4E88300FA49E2 /* format_codes.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83DD1EC4E7CC00FA49E2 /* format_codes.c */; }; - F76C86301EC4E88300FA49E2 /* Language.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83DF1EC4E7CC00FA49E2 /* Language.cpp */; }; - F76C86321EC4E88300FA49E2 /* LanguagePack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83E11EC4E7CC00FA49E2 /* LanguagePack.cpp */; }; - F76C86341EC4E88300FA49E2 /* localisation.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83E31EC4E7CC00FA49E2 /* localisation.c */; }; - F76C86361EC4E88300FA49E2 /* real_names.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83E51EC4E7CC00FA49E2 /* real_names.c */; }; - F76C86381EC4E88300FA49E2 /* user.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83E71EC4E7CC00FA49E2 /* user.c */; }; - F76C863A1EC4E88300FA49E2 /* utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83E91EC4E7CC00FA49E2 /* utf8.c */; }; F76C86451EC4E88300FA49E2 /* Http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83F61EC4E7CC00FA49E2 /* Http.cpp */; }; F76C86471EC4E88300FA49E2 /* Network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83F81EC4E7CC00FA49E2 /* Network.cpp */; }; F76C86491EC4E88300FA49E2 /* NetworkAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83FA1EC4E7CC00FA49E2 /* NetworkAction.cpp */; }; @@ -659,6 +660,27 @@ 4C7B53A61FFD15B200A52E21 /* Map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Map.cpp; sourceTree = ""; }; 4C7B53A71FFD15B200A52E21 /* Map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Map.h; sourceTree = ""; }; 4C7B53A91FFD15BB00A52E21 /* Park.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Park.h; sourceTree = ""; }; + 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Convert.cpp; sourceTree = ""; }; + 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Currency.cpp; sourceTree = ""; }; + 4C7B53AC1FFF935B00A52E21 /* Currency.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Currency.h; sourceTree = ""; }; + 4C7B53AD1FFF935B00A52E21 /* Date.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Date.cpp; sourceTree = ""; }; + 4C7B53AE1FFF935B00A52E21 /* Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Date.h; sourceTree = ""; }; + 4C7B53AF1FFF935B00A52E21 /* FormatCodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormatCodes.cpp; sourceTree = ""; }; + 4C7B53B01FFF935B00A52E21 /* FormatCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormatCodes.h; sourceTree = ""; }; + 4C7B53B11FFF935B00A52E21 /* Language.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Language.cpp; sourceTree = ""; }; + 4C7B53B31FFF935B00A52E21 /* LanguagePack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LanguagePack.cpp; sourceTree = ""; }; + 4C7B53B41FFF935B00A52E21 /* LanguagePack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LanguagePack.h; sourceTree = ""; }; + 4C7B53B51FFF935B00A52E21 /* Localisation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Localisation.cpp; sourceTree = ""; }; + 4C7B53B61FFF935B00A52E21 /* Localisation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Localisation.h; sourceTree = ""; }; + 4C7B53B71FFF935B00A52E21 /* RealNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealNames.cpp; sourceTree = ""; }; + 4C7B53B81FFF935B00A52E21 /* StringIds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringIds.h; sourceTree = ""; }; + 4C7B53B91FFF935B00A52E21 /* User.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = User.cpp; sourceTree = ""; }; + 4C7B53BA1FFF935B00A52E21 /* user.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user.h; sourceTree = ""; }; + 4C7B53BB1FFF935B00A52E21 /* UTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UTF8.cpp; sourceTree = ""; }; + 4C7B53C61FFF94F900A52E21 /* ConversionTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConversionTables.cpp; sourceTree = ""; }; + 4C7B53C71FFF94F900A52E21 /* ConversionTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConversionTables.h; sourceTree = ""; }; + 4C7B53C91FFF991000A52E21 /* Language.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Language.h; sourceTree = ""; }; + 4C7B53CB1FFF995100A52E21 /* Font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Font.h; sourceTree = ""; }; 4C7B53CD200029CE00A52E21 /* Line.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Line.cpp; sourceTree = ""; }; 4C7B53CF200029D900A52E21 /* Rect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Rect.cpp; sourceTree = ""; }; 4C7B53D0200029D900A52E21 /* ScrollingText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingText.cpp; sourceTree = ""; }; @@ -1155,7 +1177,6 @@ F76C839A1EC4E7CC00FA49E2 /* Zip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Zip.h; sourceTree = ""; }; F76C839F1EC4E7CC00FA49E2 /* drawing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = drawing.h; sourceTree = ""; }; F76C83A01EC4E7CC00FA49E2 /* DrawingFast.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingFast.cpp; sourceTree = ""; }; - F76C83A21EC4E7CC00FA49E2 /* font.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = ""; }; F76C83A31EC4E7CC00FA49E2 /* IDrawingContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDrawingContext.h; sourceTree = ""; }; F76C83A41EC4E7CC00FA49E2 /* IDrawingEngine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDrawingEngine.h; sourceTree = ""; }; F76C83A51EC4E7CC00FA49E2 /* Image.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Image.cpp; sourceTree = ""; }; @@ -1191,24 +1212,6 @@ F76C83D11EC4E7CC00FA49E2 /* widget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = widget.h; sourceTree = ""; }; F76C83D21EC4E7CC00FA49E2 /* window.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = window.c; sourceTree = ""; }; F76C83D31EC4E7CC00FA49E2 /* window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = ""; }; - F76C83D81EC4E7CC00FA49E2 /* convert.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = convert.c; sourceTree = ""; }; - F76C83D91EC4E7CC00FA49E2 /* currency.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = currency.c; sourceTree = ""; }; - F76C83DA1EC4E7CC00FA49E2 /* currency.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = currency.h; sourceTree = ""; }; - F76C83DB1EC4E7CC00FA49E2 /* date.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = date.c; sourceTree = ""; }; - F76C83DC1EC4E7CC00FA49E2 /* date.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = date.h; sourceTree = ""; }; - F76C83DD1EC4E7CC00FA49E2 /* format_codes.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = format_codes.c; sourceTree = ""; }; - F76C83DE1EC4E7CC00FA49E2 /* format_codes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = format_codes.h; sourceTree = ""; }; - F76C83DF1EC4E7CC00FA49E2 /* Language.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Language.cpp; sourceTree = ""; }; - F76C83E01EC4E7CC00FA49E2 /* language.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = language.h; sourceTree = ""; }; - F76C83E11EC4E7CC00FA49E2 /* LanguagePack.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LanguagePack.cpp; sourceTree = ""; }; - F76C83E21EC4E7CC00FA49E2 /* LanguagePack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LanguagePack.h; sourceTree = ""; }; - F76C83E31EC4E7CC00FA49E2 /* localisation.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = localisation.c; sourceTree = ""; }; - F76C83E41EC4E7CC00FA49E2 /* localisation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = localisation.h; sourceTree = ""; }; - F76C83E51EC4E7CC00FA49E2 /* real_names.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = real_names.c; sourceTree = ""; }; - F76C83E61EC4E7CC00FA49E2 /* string_ids.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = string_ids.h; sourceTree = ""; }; - F76C83E71EC4E7CC00FA49E2 /* user.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = user.c; sourceTree = ""; }; - F76C83E81EC4E7CC00FA49E2 /* user.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = user.h; sourceTree = ""; }; - F76C83E91EC4E7CC00FA49E2 /* utf8.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = utf8.c; sourceTree = ""; }; F76C83F61EC4E7CC00FA49E2 /* Http.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Http.cpp; sourceTree = ""; }; F76C83F71EC4E7CC00FA49E2 /* http.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = http.h; sourceTree = ""; }; F76C83F81EC4E7CC00FA49E2 /* Network.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Network.cpp; sourceTree = ""; }; @@ -1980,7 +1983,7 @@ F76C839F1EC4E7CC00FA49E2 /* drawing.h */, F76C83A01EC4E7CC00FA49E2 /* DrawingFast.cpp */, 4C7B53D620002CA400A52E21 /* Font.cpp */, - F76C83A21EC4E7CC00FA49E2 /* font.h */, + 4C7B53CB1FFF995100A52E21 /* Font.h */, F76C83A31EC4E7CC00FA49E2 /* IDrawingContext.h */, F76C83A41EC4E7CC00FA49E2 /* IDrawingEngine.h */, F76C83A51EC4E7CC00FA49E2 /* Image.cpp */, @@ -2039,24 +2042,26 @@ F76C83D71EC4E7CC00FA49E2 /* localisation */ = { isa = PBXGroup; children = ( - F76C83D81EC4E7CC00FA49E2 /* convert.c */, - F76C83D91EC4E7CC00FA49E2 /* currency.c */, - F76C83DA1EC4E7CC00FA49E2 /* currency.h */, - F76C83DB1EC4E7CC00FA49E2 /* date.c */, - F76C83DC1EC4E7CC00FA49E2 /* date.h */, - F76C83DD1EC4E7CC00FA49E2 /* format_codes.c */, - F76C83DE1EC4E7CC00FA49E2 /* format_codes.h */, - F76C83DF1EC4E7CC00FA49E2 /* Language.cpp */, - F76C83E01EC4E7CC00FA49E2 /* language.h */, - F76C83E11EC4E7CC00FA49E2 /* LanguagePack.cpp */, - F76C83E21EC4E7CC00FA49E2 /* LanguagePack.h */, - F76C83E31EC4E7CC00FA49E2 /* localisation.c */, - F76C83E41EC4E7CC00FA49E2 /* localisation.h */, - F76C83E51EC4E7CC00FA49E2 /* real_names.c */, - F76C83E61EC4E7CC00FA49E2 /* string_ids.h */, - F76C83E71EC4E7CC00FA49E2 /* user.c */, - F76C83E81EC4E7CC00FA49E2 /* user.h */, - F76C83E91EC4E7CC00FA49E2 /* utf8.c */, + 4C7B53C61FFF94F900A52E21 /* ConversionTables.cpp */, + 4C7B53C71FFF94F900A52E21 /* ConversionTables.h */, + 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */, + 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */, + 4C7B53AC1FFF935B00A52E21 /* Currency.h */, + 4C7B53AD1FFF935B00A52E21 /* Date.cpp */, + 4C7B53AE1FFF935B00A52E21 /* Date.h */, + 4C7B53AF1FFF935B00A52E21 /* FormatCodes.cpp */, + 4C7B53B01FFF935B00A52E21 /* FormatCodes.h */, + 4C7B53B11FFF935B00A52E21 /* Language.cpp */, + 4C7B53C91FFF991000A52E21 /* Language.h */, + 4C7B53B31FFF935B00A52E21 /* LanguagePack.cpp */, + 4C7B53B41FFF935B00A52E21 /* LanguagePack.h */, + 4C7B53B51FFF935B00A52E21 /* Localisation.cpp */, + 4C7B53B61FFF935B00A52E21 /* Localisation.h */, + 4C7B53B71FFF935B00A52E21 /* RealNames.cpp */, + 4C7B53B81FFF935B00A52E21 /* StringIds.h */, + 4C7B53B91FFF935B00A52E21 /* User.cpp */, + 4C7B53BA1FFF935B00A52E21 /* user.h */, + 4C7B53BB1FFF935B00A52E21 /* UTF8.cpp */, ); path = localisation; sourceTree = ""; @@ -3098,6 +3103,7 @@ C666EE7C1F37ACB10061AA04 /* TitleLogo.cpp in Sources */, 4C8B42741EEB1B6F00F015CA /* Screenshot.cpp in Sources */, 4C93F1491F8B744400A9330D /* MineRide.cpp in Sources */, + 4C7B53BC1FFF935B00A52E21 /* Convert.cpp in Sources */, F76C88781EC5324E00FA49E2 /* AudioChannel.cpp in Sources */, C666EE6D1F37ACB10061AA04 /* Cheats.cpp in Sources */, 4C6A66A81FE2787700694CB6 /* Fence.cpp in Sources */, @@ -3167,6 +3173,7 @@ 4CB832AB1EFFB8D100B88761 /* ttf_sdlport.c in Sources */, C654DF371F69C0430040F43D /* Sign.cpp in Sources */, 4C93F1751F8B745700A9330D /* MiniHelicopters.cpp in Sources */, + 4C7B53C41FFF935B00A52E21 /* User.cpp in Sources */, 4CE462431FD1612C0001CD98 /* android.c in Sources */, 4CE4624B1FD1613D0001CD98 /* Platform.macOS.cpp in Sources */, 4C7B53A51FFC180400A52E21 /* ObjectList.cpp in Sources */, @@ -3182,6 +3189,7 @@ 4C6A669B1FE2786F00694CB6 /* Sprite.cpp in Sources */, C6D2BEE61F9BAACE008B557C /* TrackList.cpp in Sources */, 4C93F1AB1F8B748900A9330D /* WaterCoaster.cpp in Sources */, + 4C7B53C21FFF935B00A52E21 /* Localisation.cpp in Sources */, 4C93F16D1F8B745700A9330D /* Dodgems.cpp in Sources */, 4C93F1A81F8B748900A9330D /* RiverRapids.cpp in Sources */, 4C7B53DC20002CA400A52E21 /* TTF.cpp in Sources */, @@ -3208,6 +3216,7 @@ C654DF331F69C0430040F43D /* LoadSave.cpp in Sources */, C68313C61FDB4EBA006DB3D8 /* input.cpp in Sources */, 4C6A66A71FE2787700694CB6 /* Entrance.cpp in Sources */, + 4C7B53C51FFF935B00A52E21 /* UTF8.cpp in Sources */, C61ADB211FB7DC060024F2EF /* Scenery.cpp in Sources */, F775F5341EE35A6B001F00E7 /* DummyUiContext.cpp in Sources */, C654DF401F69C18C0040F43D /* Intent.cpp in Sources */, @@ -3218,6 +3227,7 @@ C685E51C1F8907850090598F /* Map.cpp in Sources */, F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */, 4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */, + 4C7B53BD1FFF935B00A52E21 /* Currency.cpp in Sources */, 4C93F18F1F8B747A00A9330D /* PirateShip.cpp in Sources */, 4C6A66B61FE278C900694CB6 /* Painter.cpp in Sources */, C654DF381F69C0430040F43D /* StaffFirePrompt.cpp in Sources */, @@ -3236,6 +3246,7 @@ C6D2BEE81F9BAACE008B557C /* MazeConstruction.cpp in Sources */, C666EE771F37ACB10061AA04 /* SavePrompt.cpp in Sources */, 4C6A669A1FE2786F00694CB6 /* Peep.cpp in Sources */, + 4C7B53C31FFF935B00A52E21 /* RealNames.cpp in Sources */, 4C93F16C1F8B745700A9330D /* CrookedHouse.cpp in Sources */, 4C93F18A1F8B747A00A9330D /* Enterprise.cpp in Sources */, 4CE4624A1FD1613D0001CD98 /* Platform.Linux.cpp in Sources */, @@ -3259,6 +3270,7 @@ 4C6A66AC1FE2787700694CB6 /* Surface.cpp in Sources */, 4C93F1BB1F8E185600A9330D /* Finance.cpp in Sources */, 4C93F19A1F8B748200A9330D /* Lift.cpp in Sources */, + 4C7B53BF1FFF935B00A52E21 /* FormatCodes.cpp in Sources */, C654DF351F69C0430040F43D /* Park.cpp in Sources */, 4C93F1901F8B747A00A9330D /* RotoDrop.cpp in Sources */, 4CFE4E801F90A3F1005243C2 /* Peep.cpp in Sources */, @@ -3291,6 +3303,7 @@ 4C93F1711F8B745700A9330D /* HauntedHouse.cpp in Sources */, F76C88841EC5324E00FA49E2 /* OpenGLDrawingEngine.cpp in Sources */, 4C93F1471F8B744400A9330D /* LimLaunchedRollerCoaster.cpp in Sources */, + 4C7B53BE1FFF935B00A52E21 /* Date.cpp in Sources */, C654DF2D1F69C0430040F43D /* Banner.cpp in Sources */, 4C93F18E1F8B747A00A9330D /* MotionSimulator.cpp in Sources */, C666EE711F37ACB10061AA04 /* MapGen.cpp in Sources */, @@ -3310,6 +3323,7 @@ 4C93F1A61F8B748900A9330D /* DingySlide.cpp in Sources */, 4C7B53D920002CA400A52E21 /* Drawing.cpp in Sources */, C68D98BC1FC6B8AB008E8378 /* TileInspector.cpp in Sources */, + 4C7B53C11FFF935B00A52E21 /* LanguagePack.cpp in Sources */, F76C88891EC5324E00FA49E2 /* SoftwareDrawingEngine.cpp in Sources */, 4C93F1A91F8B748900A9330D /* SplashBoats.cpp in Sources */, 4C93F1721F8B745700A9330D /* Maze.cpp in Sources */, @@ -3322,12 +3336,14 @@ 4C6A66B51FE278C900694CB6 /* Paint.cpp in Sources */, 4C93F1741F8B745700A9330D /* MiniGolf.cpp in Sources */, 4C93F1911F8B747A00A9330D /* SwingingInverterShip.cpp in Sources */, + 4C7B53C81FFF94F900A52E21 /* ConversionTables.cpp in Sources */, 4C93F1461F8B744400A9330D /* LayDownRollerCoaster.cpp in Sources */, 4C93F1991F8B748200A9330D /* Chairlift.cpp in Sources */, 4C31B2E41FB6115600F6A38A /* MapGen.cpp in Sources */, 4C6AC20F1F9E1693004324AA /* Station.cpp in Sources */, C64644FE1F3FA4120026AC2D /* Main.cpp in Sources */, 4C93F16B1F8B745700A9330D /* CircusShow.cpp in Sources */, + 4C7B53C01FFF935B00A52E21 /* Language.cpp in Sources */, 4C93F19B1F8B748200A9330D /* MiniatureRailway.cpp in Sources */, F76C888B1EC5324E00FA49E2 /* Ui.cpp in Sources */, C685E51A1F8907850090598F /* Staff.cpp in Sources */, @@ -3397,17 +3413,7 @@ F76C86221EC4E88300FA49E2 /* viewport_interaction.c in Sources */, F76C86231EC4E88300FA49E2 /* widget.c in Sources */, F76C86251EC4E88300FA49E2 /* window.c in Sources */, - F76C86291EC4E88300FA49E2 /* convert.c in Sources */, - F76C862A1EC4E88300FA49E2 /* currency.c in Sources */, - F76C862C1EC4E88300FA49E2 /* date.c in Sources */, - F76C862E1EC4E88300FA49E2 /* format_codes.c in Sources */, - F76C86301EC4E88300FA49E2 /* Language.cpp in Sources */, - F76C86321EC4E88300FA49E2 /* LanguagePack.cpp in Sources */, - F76C86341EC4E88300FA49E2 /* localisation.c in Sources */, - F76C86361EC4E88300FA49E2 /* real_names.c in Sources */, - F76C86381EC4E88300FA49E2 /* user.c in Sources */, C6607F481FE2B97E00D3FC0D /* Input.cpp in Sources */, - F76C863A1EC4E88300FA49E2 /* utf8.c in Sources */, F76C86451EC4E88300FA49E2 /* Http.cpp in Sources */, F76C86471EC4E88300FA49E2 /* Network.cpp in Sources */, F76C86491EC4E88300FA49E2 /* NetworkAction.cpp in Sources */, diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index 89cdffb140..a0eccbf41e 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #ifdef __MACOSX__ // macOS uses COMMAND rather than CTRL for many keyboard shortcuts diff --git a/src/openrct2-ui/UiContext.Linux.cpp b/src/openrct2-ui/UiContext.Linux.cpp index a576ea1c41..2fa859d8f4 100644 --- a/src/openrct2-ui/UiContext.Linux.cpp +++ b/src/openrct2-ui/UiContext.Linux.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "UiContext.h" diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index 1b28b8ef7e..0ace56586c 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/audio/AudioMixer.cpp b/src/openrct2-ui/audio/AudioMixer.cpp index 4bfd751c55..9b3c476d19 100644 --- a/src/openrct2-ui/audio/AudioMixer.cpp +++ b/src/openrct2-ui/audio/AudioMixer.cpp @@ -31,7 +31,7 @@ #include "AudioFormat.h" #include -#include +#include #include #include diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index 08f82ea177..1d4b8eb4a0 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/KeyboardShortcuts.cpp b/src/openrct2-ui/input/KeyboardShortcuts.cpp index 3d52632612..4891a6106a 100644 --- a/src/openrct2-ui/input/KeyboardShortcuts.cpp +++ b/src/openrct2-ui/input/KeyboardShortcuts.cpp @@ -25,7 +25,7 @@ #include #include "KeyboardShortcuts.h" -#include +#include using namespace OpenRCT2; using namespace OpenRCT2::Input; diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index ab20a1736c..32d8af49c1 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/Graph.cpp b/src/openrct2-ui/interface/Graph.cpp index 2eec10c655..6927d22691 100644 --- a/src/openrct2-ui/interface/Graph.cpp +++ b/src/openrct2-ui/interface/Graph.cpp @@ -14,8 +14,8 @@ *****************************************************************************/ #pragma endregion -#include -#include +#include +#include #include static void graph_draw_months_uint8(rct_drawpixelinfo *dpi, uint8 *history, sint32 count, sint32 baseX, sint32 baseY) diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index ed495d04eb..c2682891c7 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #define WW 400 diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 452c7e4516..3919e5e062 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 46fca28ef5..bc4af0abb8 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index b43cda01ae..39e4169720 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 89ebf62619..edf2cd4fe9 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index ac45bb9490..090d1616c3 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 4b9274fe30..4e64b062ed 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -18,7 +18,7 @@ #include #include - #include + #include #include #include #include diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index 298ec41dde..de6d8d05ff 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index c644466a94..15bcde8207 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 6f30b99e1e..a4e8dfb457 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 00795ae743..e359ce1c37 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorMain.cpp b/src/openrct2-ui/windows/EditorMain.cpp index a8a3618e6b..9dd35a94dd 100644 --- a/src/openrct2-ui/windows/EditorMain.cpp +++ b/src/openrct2-ui/windows/EditorMain.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include static void window_editor_main_paint(rct_window *w, rct_drawpixelinfo *dpi); diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 9a11554ba9..9089042205 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 6fd4ece16f..e51eea6702 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 4679537ba8..ad56b6e6f2 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index 4a5e559cce..84abc0ea2c 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include enum { WIDX_BACKGROUND diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index ef9e1ef4de..2d49806df7 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index f35451f5b2..a664bbb7ca 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 8134477389..ff5348499f 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index dc307de685..01c160ca67 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index e6dee75dc6..a98a6bb52a 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 7ac63c1b03..f383d2b2e7 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 70a3256ffa..d653457912 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 7b9010f512..e6eb115851 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include enum WINDOW_WATER_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 676720a073..8fcc8385d4 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index 9a9b134e68..4e78708387 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include static rct_widget window_main_widgets[] = { diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 326d16a4ab..724ddbe9bd 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 47c6e55001..1cf37d2f74 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp index bcdd9e9d11..90685ba4d3 100644 --- a/src/openrct2-ui/windows/MapTooltip.cpp +++ b/src/openrct2-ui/windows/MapTooltip.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include static rct_widget window_map_tooltip_widgets[] = { { WWT_IMGBTN, 0, 0, 199, 0, 29, 0xFFFFFFFF, STR_NONE }, diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 6aec934818..411ba0f607 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index c487be833f..3e18096c34 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MusicCredits.cpp b/src/openrct2-ui/windows/MusicCredits.cpp index 88a049587e..bf7a8db560 100644 --- a/src/openrct2-ui/windows/MusicCredits.cpp +++ b/src/openrct2-ui/windows/MusicCredits.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include enum WINDOW_MUSIC_CREDITS_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 5a674aba66..81c1dc07ab 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index b3c1273b32..5baa978147 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index ab3aaeed87..94f9af4a53 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 246d55a1c7..b5bb4e39f0 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 85e0574c4c..89c446a091 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index f33bd057ea..8b5e6dd976 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 718f6f42b4..6157af8cf8 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -39,10 +39,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index fd93614b9a..c15debcf08 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index ae20749aaf..660bd062e2 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 738c6cc287..3cd64167ea 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 0a57e486b6..9d9e85d20b 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 18f1eed8fe..4757df41e3 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 30b674c0bc..88f1c157b3 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 55b02f4368..123962774a 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include enum WINDOW_SAVE_PROMPT_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 9c18b3e507..53c806a371 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 62f0d2cfbd..e4abbfc6e4 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 6f4a98be00..b0d23e99ad 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include static char _port[7]; diff --git a/src/openrct2-ui/windows/ShortcutKeyChange.cpp b/src/openrct2-ui/windows/ShortcutKeyChange.cpp index b32cffe7a5..476d967175 100644 --- a/src/openrct2-ui/windows/ShortcutKeyChange.cpp +++ b/src/openrct2-ui/windows/ShortcutKeyChange.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #define WW 250 #define WH 60 diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 3bbdedab4c..ee7767adb2 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -19,7 +19,7 @@ #include "Window.h" #include -#include +#include #define WW 420 #define WH 280 diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index d89ba224be..1e1174d5c2 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index ece8468ed7..80101eea4d 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index c9d96c207e..9bb84d2613 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #define WW 200 #define WH 100 diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 40170d6a67..f18b24c664 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 2498274fca..e176edbcaa 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #define WW 250 diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 4aeff332f2..69779e6026 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index c133b129a0..5993c8609f 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index d919044eca..9f855f47e0 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index e24a374d2f..9dc5157ba7 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 7ab170a100..7389631814 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index 2cb1b3895b..637752cc66 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index 38ac190272..4cc17278e2 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index 51b48049db..88c5ddd6dd 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include enum WINDOW_TITLE_OPTIONS_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp index ce88d45de4..25457d33cc 100644 --- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp +++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index e3aed68d9e..5cd050d541 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 2a22bc9d44..cc5bda5e84 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #pragma region Widgets diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 3e52c5a457..d1f1b53d16 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 7cd3844110..4a39d18c09 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 3b740a96db..d2828270e6 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include enum WINDOW_VIEW_CLIPPING_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 9437ee4fcc..0b5506e49c 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 27b6f76a71..4073703679 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include enum WINDOW_WATER_WIDGET_IDX { diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index d4aa33bb25..7cf5670484 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -19,7 +19,7 @@ #include "Editor.h" #include "Game.h" #include "interface/window.h" -#include "localisation/localisation.h" +#include "localisation/Localisation.h" #include "management/Finance.h" #include "network/network.h" #include "ride/Station.h" diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp index bf3091bf2a..d8ad4d0448 100644 --- a/src/openrct2/CmdlineSprite.cpp +++ b/src/openrct2/CmdlineSprite.cpp @@ -20,7 +20,7 @@ #include "CmdlineSprite.h" #include "drawing/Drawing.h" #include "Imaging.h" -#include "localisation/localisation.h" +#include "localisation/Localisation.h" #include "OpenRCT2.h" #include "platform/platform.h" #include "util/Util.h" diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index bc048fc5ac..1323a3e6cd 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -57,8 +57,8 @@ #include "interface/console.h" #include "interface/themes.h" #include "Intro.h" -#include "localisation/date.h" -#include "localisation/language.h" +#include "localisation/Date.h" +#include "localisation/Language.h" #include "network/DiscordService.h" #include "network/http.h" #include "network/network.h" diff --git a/src/openrct2/Date.cpp b/src/openrct2/Date.cpp index 375a35406f..47f20a4652 100644 --- a/src/openrct2/Date.cpp +++ b/src/openrct2/Date.cpp @@ -16,7 +16,7 @@ #include "core/Guard.hpp" #include "core/Math.hpp" -#include "localisation/date.h" +#include "localisation/Date.h" #include "Date.h" using namespace OpenRCT2; diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index fda2220ea5..de9c585fce 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -24,7 +24,7 @@ #include "audio/audio.h" #include "core/Math.hpp" #include "interface/viewport.h" -#include "localisation/localisation.h" +#include "localisation/Localisation.h" #include "management/NewsItem.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 00fb665064..549e7a962a 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -19,7 +19,7 @@ #include "Editor.h" #include "EditorObjectSelectionSession.h" #include "Game.h" -#include "localisation/localisation.h" +#include "localisation/Localisation.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" #include "OpenRCT2.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 21b0aa694b..3d0c35a594 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -28,7 +28,7 @@ #include "interface/viewport.h" #include "interface/widget.h" #include "interface/window.h" -#include "localisation/localisation.h" +#include "localisation/Localisation.h" #include "management/Finance.h" #include "management/Marketing.h" #include "management/NewsItem.h" diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 11bd169727..87a2c513d9 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -23,7 +23,7 @@ #include "GameAction.h" #include "../platform/platform.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../world/Park.h" GameActionResult::GameActionResult() diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h index 1fc94513be..121f72bf6a 100644 --- a/src/openrct2/actions/GameAction.h +++ b/src/openrct2/actions/GameAction.h @@ -24,7 +24,7 @@ #include "../core/IStream.hpp" #include "../Game.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../world/Map.h" /** diff --git a/src/openrct2/actions/GuestSetNameAction.hpp b/src/openrct2/actions/GuestSetNameAction.hpp index ccd37e4352..a3abd5a376 100644 --- a/src/openrct2/actions/GuestSetNameAction.hpp +++ b/src/openrct2/actions/GuestSetNameAction.hpp @@ -17,12 +17,12 @@ #pragma once #include "../core/MemoryStream.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "GameAction.h" #include "../Cheats.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../world/Park.h" struct GuestSetNameAction : public GameActionBase diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index 0bdf397e25..4ede42fa0a 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -17,7 +17,7 @@ #pragma once #include "../core/MemoryStream.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../OpenRCT2.h" #include "GameAction.h" diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index cac2f24616..5b8953179a 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -18,10 +18,10 @@ #include "../core/Memory.hpp" #include "../core/MemoryStream.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "GameAction.h" -#include "../localisation/date.h" +#include "../localisation/Date.h" #include "../Cheats.h" #include "../interface/window.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index 99e2c9b173..ea0c244f07 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -20,7 +20,7 @@ #include "../Context.h" #include "../core/MemoryStream.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../ride/Ride.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" diff --git a/src/openrct2/actions/RideSetName.hpp b/src/openrct2/actions/RideSetName.hpp index 93fb78c30c..363c2d28a9 100644 --- a/src/openrct2/actions/RideSetName.hpp +++ b/src/openrct2/actions/RideSetName.hpp @@ -20,8 +20,8 @@ #include "../Context.h" #include "../core/MemoryStream.h" #include "../interface/window.h" -#include "../localisation/localisation.h" -#include "../localisation/string_ids.h" +#include "../localisation/Localisation.h" +#include "../localisation/StringIds.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/RideSetStatus.hpp b/src/openrct2/actions/RideSetStatus.hpp index 910d4bc9b5..5cf30a8ad3 100644 --- a/src/openrct2/actions/RideSetStatus.hpp +++ b/src/openrct2/actions/RideSetStatus.hpp @@ -17,7 +17,7 @@ #pragma once #include "../core/MemoryStream.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "GameAction.h" #include "../Cheats.h" diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.hpp b/src/openrct2/actions/SetParkEntranceFeeAction.hpp index 3a862fd761..d9a47c20f6 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.hpp +++ b/src/openrct2/actions/SetParkEntranceFeeAction.hpp @@ -17,7 +17,7 @@ #pragma once #include "../core/MemoryStream.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "GameAction.h" #include "../Cheats.h" diff --git a/src/openrct2/actions/StaffSetNameAction.hpp b/src/openrct2/actions/StaffSetNameAction.hpp index be06cac54c..82c29261cd 100644 --- a/src/openrct2/actions/StaffSetNameAction.hpp +++ b/src/openrct2/actions/StaffSetNameAction.hpp @@ -17,13 +17,13 @@ #pragma once #include "../core/MemoryStream.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "GameAction.h" #include "../Cheats.h" #include "../peep/Staff.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../world/Park.h" struct StaffSetNameAction : public GameActionBase diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index cada0c7df3..ba979854d2 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -21,7 +21,7 @@ #include "../core/Memory.hpp" #include "../core/String.hpp" #include "../core/Util.hpp" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../OpenRCT2.h" #include "../ui/UiContext.h" #include "audio.h" @@ -30,7 +30,7 @@ #include "../interface/viewport.h" #include "../Intro.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../ride/Ride.h" #include "../util/Util.h" diff --git a/src/openrct2/cmdline/RootCommands.cpp b/src/openrct2/cmdline/RootCommands.cpp index 64e70430c8..e27e9f0e9b 100644 --- a/src/openrct2/cmdline/RootCommands.cpp +++ b/src/openrct2/cmdline/RootCommands.cpp @@ -21,7 +21,7 @@ #include "../config/Config.h" #include "../platform/crash.h" #include "../platform/platform.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../core/Console.hpp" #include "../core/Memory.hpp" diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 71f6dfb2b9..f7f6a9521e 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -32,9 +32,9 @@ #include "IniReader.hpp" #include "IniWriter.hpp" -#include "../localisation/currency.h" -#include "../localisation/date.h" -#include "../localisation/language.h" +#include "../localisation/Currency.h" +#include "../localisation/Date.h" +#include "../localisation/Language.h" #include "../platform/platform.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index b788aa416b..81f5835e4a 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -28,7 +28,7 @@ #include #elif defined(_WIN32) // Windows needs this for widechar <-> utf8 conversion utils - #include "../localisation/language.h" + #include "../localisation/Language.h" #endif #include diff --git a/src/openrct2/core/FileStream.hpp b/src/openrct2/core/FileStream.hpp index 02b2a37c0f..0495399670 100644 --- a/src/openrct2/core/FileStream.hpp +++ b/src/openrct2/core/FileStream.hpp @@ -21,7 +21,7 @@ #include "Math.hpp" #include "String.hpp" -#include "../localisation/language.h" +#include "../localisation/Language.h" enum { diff --git a/src/openrct2/core/Path.cpp b/src/openrct2/core/Path.cpp index ceb756bc66..c58c77e6ac 100644 --- a/src/openrct2/core/Path.cpp +++ b/src/openrct2/core/Path.cpp @@ -19,7 +19,7 @@ #endif #include "../platform/platform.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../util/Util.h" #include "File.h" diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index 8356866763..d4cd9bf831 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -18,7 +18,7 @@ #include #include -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../util/Util.h" #include "Math.hpp" diff --git a/src/openrct2/core/StringReader.hpp b/src/openrct2/core/StringReader.hpp index ebf4786a5e..195f5ddfbf 100644 --- a/src/openrct2/core/StringReader.hpp +++ b/src/openrct2/core/StringReader.hpp @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../util/Util.h" #include "String.hpp" diff --git a/src/openrct2/core/textinputbuffer.c b/src/openrct2/core/textinputbuffer.c index f3ec628f9d..0a73b78487 100644 --- a/src/openrct2/core/textinputbuffer.c +++ b/src/openrct2/core/textinputbuffer.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "textinputbuffer.h" void textinputbuffer_init(textinputbuffer * tib, utf8 * buffer, size_t size) diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 1204e85bc2..0f03f56435 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -18,7 +18,7 @@ #include "../Context.h" #include "../core/Guard.hpp" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../object/Object.h" #include "../OpenRCT2.h" #include "../platform/platform.h" diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index cf29dbb9f3..06a7c40c8e 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -16,7 +16,8 @@ #include "../core/Guard.hpp" #include "../core/Util.hpp" -#include "../localisation/localisation.h" +#include "../localisation/ConversionTables.h" +#include "../localisation/Localisation.h" #include "../sprites.h" #include "Drawing.h" #include "Font.h" diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index c514fc84ae..bd7cfef1e5 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -25,7 +25,7 @@ #include "../config/Config.h" #include "../drawing/Drawing.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../platform/platform.h" using namespace OpenRCT2; diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index 7876be66c6..4f2c11d055 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -17,7 +17,7 @@ #include #include "../config/Config.h" #include "../interface/colour.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../paint/Paint.h" #include "../sprites.h" #include "Drawing.h" diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/String.cpp index 28506144ce..1d0a50e68e 100644 --- a/src/openrct2/drawing/String.cpp +++ b/src/openrct2/drawing/String.cpp @@ -18,7 +18,7 @@ #include "../config/Config.h" #include "../interface/colour.h" #include "../interface/viewport.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../platform/platform.h" #include "../sprites.h" #include "../util/Util.h" diff --git a/src/openrct2/drawing/TTF.cpp b/src/openrct2/drawing/TTF.cpp index 54f90bb3ad..dc2f3ed28b 100644 --- a/src/openrct2/drawing/TTF.cpp +++ b/src/openrct2/drawing/TTF.cpp @@ -20,7 +20,7 @@ #include FT_FREETYPE_H #include "../config/Config.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../OpenRCT2.h" #include "../platform/platform.h" #include "TTF.h" diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 800a5f6e27..7ba9e33e6d 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -16,7 +16,7 @@ #include "Text.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" static TextPaint _legacyPaint; diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index 7c409ebb18..01d80ef392 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -23,7 +23,7 @@ #include "../drawing/Drawing.h" #include "../drawing/TTF.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #ifndef NO_TTF uint8 const HINTING_THRESHOLD_LOW = 40; diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 49005c1ae3..c569c0a20a 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -26,7 +26,7 @@ #include "../drawing/Drawing.h" #include "../Game.h" #include "../Intro.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../platform/platform.h" #include "../util/Util.h" #include "../world/Climate.h" diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index 30d8e13676..614a0e2fd2 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -32,8 +32,8 @@ #include "../core/Path.hpp" #include "../core/String.hpp" #include "../core/Util.hpp" -#include "../localisation/language.h" -#include "../localisation/string_ids.h" +#include "../localisation/Language.h" +#include "../localisation/StringIds.h" struct WindowThemeDesc; diff --git a/src/openrct2/interface/chat.c b/src/openrct2/interface/chat.c index b2b1bbce19..a4e49685cf 100644 --- a/src/openrct2/interface/chat.c +++ b/src/openrct2/interface/chat.c @@ -18,7 +18,7 @@ #include "../audio/AudioMixer.h" #include "../Context.h" #include "../interface/themes.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../network/network.h" #include "../platform/platform.h" #include "../util/Util.h" diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index 5121f5f0c2..610a24e812 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -19,13 +19,14 @@ #include "../config/Config.h" #include "../Context.h" #include "../drawing/Drawing.h" +#include "../drawing/Font.h" #include "../Editor.h" #include "../EditorObjectSelectionSession.h" #include "../Game.h" #include "../Input.h" #include "../interface/themes.h" -#include "../localisation/localisation.h" -#include "../localisation/user.h" +#include "../localisation/Localisation.h" +#include "../localisation/User.h" #include "../management/Finance.h" #include "../management/Research.h" #include "../network/network.h" diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index d88b66f8be..4b71580420 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -19,7 +19,7 @@ #include "../drawing/Drawing.h" #include "../Game.h" #include "../Input.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../OpenRCT2.h" #include "../paint/Paint.h" #include "../paint/Supports.h" diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 8ce69941b6..0b5ae6c953 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -18,7 +18,7 @@ #include "../Editor.h" #include "../Game.h" #include "../Input.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../OpenRCT2.h" #include "../ride/Ride.h" #include "../ride/ride_data.h" diff --git a/src/openrct2/interface/widget.c b/src/openrct2/interface/widget.c index d65de57af4..1c58cdefab 100644 --- a/src/openrct2/interface/widget.c +++ b/src/openrct2/interface/widget.c @@ -20,7 +20,7 @@ #include "widget.h" #include "window.h" #include "../platform/platform.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../util/Util.h" #include "../Context.h" diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index 41c3cb8e77..e2f6270fa6 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -24,8 +24,8 @@ #include "../Input.h" #include "../interface/Cursors.h" #include "../interface/themes.h" -#include "../localisation/localisation.h" -#include "../localisation/string_ids.h" +#include "../localisation/Localisation.h" +#include "../localisation/StringIds.h" #include "../OpenRCT2.h" #include "../platform/platform.h" #include "../world/Map.h" diff --git a/src/openrct2/localisation/convert.c b/src/openrct2/localisation/ConversionTables.cpp similarity index 99% rename from src/openrct2/localisation/convert.c rename to src/openrct2/localisation/ConversionTables.cpp index ba262129ae..0de3b3506b 100644 --- a/src/openrct2/localisation/convert.c +++ b/src/openrct2/localisation/ConversionTables.cpp @@ -1,4 +1,4 @@ -#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers +#pragma region Copyright (c) 2014-2018 OpenRCT2 Developers /***************************************************************************** * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. * @@ -14,114 +14,11 @@ *****************************************************************************/ #pragma endregion -#include "localisation.h" +#include "ConversionTables.h" +#include "FormatCodes.h" -typedef struct encoding_convert_entry { - uint16 code; - uint16 unicode; -} encoding_convert_entry; - -static const encoding_convert_entry GB2312ToUnicodeTable[7445]; -static const encoding_convert_entry Big5ToUnicodeTable[13710]; -static const encoding_convert_entry RCT2ToUnicodeTable[256]; -static const encoding_convert_entry CP932ToUnicodeTable[7916]; -static const encoding_convert_entry CP949ToUnicodeTable[17176]; - -sint32 rct2_to_utf8(utf8 *dst, const char *src) +const encoding_convert_entry RCT2ToUnicodeTable[256] = { - sint32 codepoint; - - utf8 *start = dst; - const char *ch = src; - while (*ch != 0) { - if (*ch == (char)(uint8)0xFF) { - ch++; - - // Read wide char - uint8 a = *ch++; - uint8 b = *ch++; - codepoint = (a << 8) | b; - } else { - codepoint = (uint8)(*ch++); - codepoint = encoding_convert_rct2_to_unicode(codepoint); - } - - dst = utf8_write_codepoint(dst, codepoint); - } - dst = utf8_write_codepoint(dst, 0); - return (sint32)(dst - start); -} - -sint32 utf8_to_rct2(char *dst, const utf8 *src) -{ - char *start = dst; - const utf8 *ch = src; - sint32 codepoint; - while ((codepoint = utf8_get_next(ch, &ch)) != 0) { - codepoint = encoding_convert_unicode_to_rct2(codepoint); - if (codepoint < 256) { - *dst++ = (char)codepoint; - } else if (codepoint <= 0xFFFF) { - *dst++ = (char)(uint8)0xFF; - *dst++ = (codepoint >> 8) & 0xFF; - *dst++ = codepoint & 0xFF; - } - } - *dst++ = 0; - return (sint32)(dst - start); -} - -static sint32 encoding_search_compare(const void *pKey, const void *pEntry) -{ - uint16 key = *((uint16*)pKey); - encoding_convert_entry *entry = (encoding_convert_entry*)pEntry; - if (key < entry->code) return -1; - if (key > entry->code) return 1; - return 0; -} - -static wchar_t encoding_convert_x_to_unicode(wchar_t code, const encoding_convert_entry *table, sint32 count) -{ - encoding_convert_entry *entry = bsearch(&code, table, count, sizeof(encoding_convert_entry), encoding_search_compare); - if (entry == NULL) return code; - else return entry->unicode; -} - -wchar_t encoding_convert_unicode_to_rct2(wchar_t unicode) -{ - // Can't do a binary search as it's sorted by RCT2 code, not unicode - for (sint32 i = 0; i < countof(RCT2ToUnicodeTable); i++) { - if (RCT2ToUnicodeTable[i].unicode == unicode) return RCT2ToUnicodeTable[i].code; - } - return unicode; -} - -wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str) -{ - return encoding_convert_x_to_unicode(rct2str, RCT2ToUnicodeTable, countof(RCT2ToUnicodeTable)); -} - -wchar_t encoding_convert_gb2312_to_unicode(wchar_t gb2312) -{ - return encoding_convert_x_to_unicode(gb2312 - 0x8080, GB2312ToUnicodeTable, countof(GB2312ToUnicodeTable)); -} - -wchar_t encoding_convert_big5_to_unicode(wchar_t big5) -{ - return encoding_convert_x_to_unicode(big5, Big5ToUnicodeTable, countof(Big5ToUnicodeTable)); -} - -wchar_t encoding_convert_cp932_to_unicode(wchar_t cp932) -{ - return encoding_convert_x_to_unicode(cp932, CP932ToUnicodeTable, countof(CP932ToUnicodeTable)); -} - -wchar_t encoding_convert_cp949_to_unicode(wchar_t cp949) -{ - return encoding_convert_x_to_unicode(cp949, CP949ToUnicodeTable, countof(CP949ToUnicodeTable)); -} - -static const encoding_convert_entry RCT2ToUnicodeTable[256] = { { 0, 0 }, { 1, FORMAT_MOVE_X }, { 2, FORMAT_ADJUST_PALETTE }, @@ -379,8 +276,9 @@ static const encoding_convert_entry RCT2ToUnicodeTable[256] = { { RCT2_Z_ACUTE, UNICODE_Z_ACUTE }, { 255, 255 } }; - -static const encoding_convert_entry GB2312ToUnicodeTable[7445] = { + +const encoding_convert_entry GB2312ToUnicodeTable[7445] = +{ { 8481, 12288 }, { 8482, 12289 }, { 8483, 12290 }, @@ -7827,8 +7725,9 @@ static const encoding_convert_entry GB2312ToUnicodeTable[7445] = { { 30589, 40766 }, { 30590, 40772 }, }; - -static const encoding_convert_entry Big5ToUnicodeTable[13710] = { + +const encoding_convert_entry Big5ToUnicodeTable[13710] = +{ { 0xA140, 0x3000 }, { 0xA141, 0xFF0C }, { 0xA142, 0x3001 }, @@ -15832,8 +15731,8 @@ static const encoding_convert_entry Big5ToUnicodeTable[13710] = { { 0xD57B, 0x637C }, { 0xD57C, 0x63A4 }, { 0xD57D, 0x633B }, - - + + { 0xD57E, 0x639F }, { 0xD5A1, 0x6378 }, { 0xD5A2, 0x6385 }, @@ -19836,8 +19735,8 @@ static const encoding_convert_entry Big5ToUnicodeTable[13710] = { { 0xEEEA, 0x9367 }, { 0xEEEB, 0x9380 }, { 0xEEEC, 0x934E }, - - + + { 0xEEED, 0x9359 }, { 0xEEEE, 0x95C7 }, { 0xEEEF, 0x95C0 }, @@ -21542,13 +21441,14 @@ static const encoding_convert_entry Big5ToUnicodeTable[13710] = { { 0xF9D3, 0x9F7E }, { 0xF9D4, 0x9F49 }, { 0xF9D5, 0x9F98 }, -}; - -/* Adapted from ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT - Column #1 is the cp932 code (in hex) - Column #2 is the Unicode (in hex as 0xXXXX) - Column #3 is the Unicode name (follows a comment sign, '//') */ -static const encoding_convert_entry CP932ToUnicodeTable[7916] = { + }; + + /* Adapted from ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT + Column #1 is the cp932 code (in hex) + Column #2 is the Unicode (in hex as 0xXXXX) + Column #3 is the Unicode name (follows a comment sign, '//') */ +const encoding_convert_entry CP932ToUnicodeTable[7916] = +{ { 0xA1, 0xFF61 }, // HALFWIDTH IDEOGRAPHIC FULL STOP { 0xA2, 0xFF62 }, // HALFWIDTH LEFT CORNER BRACKET { 0xA3, 0xFF63 }, // HALFWIDTH RIGHT CORNER BRACKET @@ -29337,12 +29237,13 @@ static const encoding_convert_entry CP932ToUnicodeTable[7916] = { { 0xFC4A, 0x9E19 }, // CJK UNIFIED IDEOGRAPH { 0xFC4B, 0x9ED1 }, // CJK UNIFIED IDEOGRAPH }; - -/* Adapted from ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP949.TXT - Column #1 is the cp949 code (in hex) - Column #2 is the Unicode (in hex as 0xXXXX) - Column #3 is the Unicode name (follows a comment sign, '//') */ -static const encoding_convert_entry CP949ToUnicodeTable[17176] = { + + /* Adapted from ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP949.TXT + Column #1 is the cp949 code (in hex) + Column #2 is the Unicode (in hex as 0xXXXX) + Column #3 is the Unicode name (follows a comment sign, '//') */ +const encoding_convert_entry CP949ToUnicodeTable[17176] = +{ { 0x8141, 0xAC02 }, // HANGUL SYLLABLE KIYEOK A SSANGKIYEOK { 0x8142, 0xAC03 }, // HANGUL SYLLABLE KIYEOK A KIYEOKSIOS { 0x8143, 0xAC05 }, // HANGUL SYLLABLE KIYEOK A NIEUNCIEUC diff --git a/src/openrct2/localisation/ConversionTables.h b/src/openrct2/localisation/ConversionTables.h new file mode 100644 index 0000000000..688a47b10a --- /dev/null +++ b/src/openrct2/localisation/ConversionTables.h @@ -0,0 +1,76 @@ +#pragma region Copyright (c) 2014-2018 OpenRCT2 Developers +/***************************************************************************** + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * OpenRCT2 is the work of many authors, a full list can be found in contributors.md + * For more information, visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * A full copy of the GNU General Public License can be found in licence.txt + *****************************************************************************/ +#pragma endregion + +#pragma once + +#include "../common.h" + +typedef struct encoding_convert_entry +{ + uint16 code; + uint16 unicode; +} +encoding_convert_entry; + +extern const encoding_convert_entry GB2312ToUnicodeTable[7445]; +extern const encoding_convert_entry Big5ToUnicodeTable[13710]; +extern const encoding_convert_entry RCT2ToUnicodeTable[256]; +extern const encoding_convert_entry CP932ToUnicodeTable[7916]; +extern const encoding_convert_entry CP949ToUnicodeTable[17176]; + +typedef enum RCT2Polish +{ + RCT2_A_OGONEK_UC = 159, // 0x9F + RCT2_C_ACUTE_UC = 162, // 0xA2 + RCT2_E_OGONEK_UC = 166, // 0xA6 + RCT2_N_ACUTE_UC = 198, // 0xC6 + RCT2_L_STROKE_UC = 167, // 0xA7 + RCT2_S_ACUTE_UC = 208, // 0xD0 + RCT2_Z_DOT_UC = 216, // 0xD8 + RCT2_Z_ACUTE_UC = 215, // 0xD7 + + RCT2_A_OGONEK = 221, // 0xDD + RCT2_C_ACUTE = 222, // 0xDE + RCT2_E_OGONEK = 230, // 0xE6 + RCT2_N_ACUTE = 240, // 0xF0 + RCT2_L_STROKE = 247, // 0xF7 + RCT2_S_ACUTE = 248, // 0xF8 + RCT2_Z_DOT = 253, // 0xFD + RCT2_Z_ACUTE = 254, // 0xFE +} +RCT2Polish; + +typedef enum UnicodePolish +{ + UNICODE_A_OGONEK_UC = 260, + UNICODE_C_ACUTE_UC = 262, + UNICODE_E_OGONEK_UC = 280, + UNICODE_N_ACUTE_UC = 323, + UNICODE_L_STROKE_UC = 321, + UNICODE_S_ACUTE_UC = 346, + UNICODE_Z_DOT_UC = 379, + UNICODE_Z_ACUTE_UC = 377, + + UNICODE_A_OGONEK = 261, + UNICODE_C_ACUTE = 263, + UNICODE_E_OGONEK = 281, + UNICODE_N_ACUTE = 324, + UNICODE_L_STROKE = 322, + UNICODE_S_ACUTE = 347, + UNICODE_Z_DOT = 380, + UNICODE_Z_ACUTE = 378, +} +UnicodePolish; diff --git a/src/openrct2/localisation/Convert.cpp b/src/openrct2/localisation/Convert.cpp new file mode 100644 index 0000000000..82a63eab71 --- /dev/null +++ b/src/openrct2/localisation/Convert.cpp @@ -0,0 +1,114 @@ +#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers +/***************************************************************************** + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * OpenRCT2 is the work of many authors, a full list can be found in contributors.md + * For more information, visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * A full copy of the GNU General Public License can be found in licence.txt + *****************************************************************************/ +#pragma endregion + +#include "../core/Util.hpp" +#include "ConversionTables.h" +#include "Localisation.h" + +sint32 rct2_to_utf8(utf8 *dst, const char *src) +{ + sint32 codepoint; + + utf8 *start = dst; + const char *ch = src; + while (*ch != 0) { + if (*ch == (char)(uint8)0xFF) { + ch++; + + // Read wide char + uint8 a = *ch++; + uint8 b = *ch++; + codepoint = (a << 8) | b; + } else { + codepoint = (uint8)(*ch++); + codepoint = encoding_convert_rct2_to_unicode(codepoint); + } + + dst = utf8_write_codepoint(dst, codepoint); + } + dst = utf8_write_codepoint(dst, 0); + return (sint32)(dst - start); +} + +sint32 utf8_to_rct2(char *dst, const utf8 *src) +{ + char *start = dst; + const utf8 *ch = src; + sint32 codepoint; + while ((codepoint = utf8_get_next(ch, &ch)) != 0) { + codepoint = encoding_convert_unicode_to_rct2(codepoint); + if (codepoint < 256) { + *dst++ = (char)codepoint; + } else if (codepoint <= 0xFFFF) { + *dst++ = (char)(uint8)0xFF; + *dst++ = (codepoint >> 8) & 0xFF; + *dst++ = codepoint & 0xFF; + } + } + *dst++ = 0; + return (sint32)(dst - start); +} + +static sint32 encoding_search_compare(const void *pKey, const void *pEntry) +{ + uint16 key = *((uint16*)pKey); + encoding_convert_entry *entry = (encoding_convert_entry*)pEntry; + if (key < entry->code) return -1; + if (key > entry->code) return 1; + return 0; +} + +static wchar_t encoding_convert_x_to_unicode(wchar_t code, const encoding_convert_entry *table, size_t count) +{ + encoding_convert_entry * entry = (encoding_convert_entry *)bsearch(&code, table, count, sizeof(encoding_convert_entry), encoding_search_compare); + if (entry == NULL) return code; + else return entry->unicode; +} + +wchar_t encoding_convert_unicode_to_rct2(wchar_t unicode) +{ + // Can't do a binary search as it's sorted by RCT2 code, not unicode + for (uint32 i = 0; i < Util::CountOf(RCT2ToUnicodeTable); i++) { + if (RCT2ToUnicodeTable[i].unicode == unicode) return RCT2ToUnicodeTable[i].code; + } + return unicode; +} + +wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str) +{ + return encoding_convert_x_to_unicode(rct2str, RCT2ToUnicodeTable, Util::CountOf(RCT2ToUnicodeTable)); +} + +wchar_t encoding_convert_gb2312_to_unicode(wchar_t gb2312) +{ + return encoding_convert_x_to_unicode(gb2312 - 0x8080, GB2312ToUnicodeTable, Util::CountOf(GB2312ToUnicodeTable)); +} + +wchar_t encoding_convert_big5_to_unicode(wchar_t big5) +{ + return encoding_convert_x_to_unicode(big5, Big5ToUnicodeTable, Util::CountOf(Big5ToUnicodeTable)); +} + +wchar_t encoding_convert_cp932_to_unicode(wchar_t cp932) +{ + return encoding_convert_x_to_unicode(cp932, CP932ToUnicodeTable, Util::CountOf(CP932ToUnicodeTable)); +} + +wchar_t encoding_convert_cp949_to_unicode(wchar_t cp949) +{ + return encoding_convert_x_to_unicode(cp949, CP949ToUnicodeTable, Util::CountOf(CP949ToUnicodeTable)); +} + diff --git a/src/openrct2/localisation/currency.c b/src/openrct2/localisation/Currency.cpp similarity index 98% rename from src/openrct2/localisation/currency.c rename to src/openrct2/localisation/Currency.cpp index 2e07a0b5df..fc424b365e 100644 --- a/src/openrct2/localisation/currency.c +++ b/src/openrct2/localisation/Currency.cpp @@ -16,8 +16,8 @@ #include "../config/Config.h" #include "../util/Util.h" -#include "currency.h" -#include "string_ids.h" +#include "Currency.h" +#include "StringIds.h" currency_descriptor CurrencyDescriptors[CURRENCY_END] = { { "GBP", 10, CURRENCY_PREFIX, "\xC2\xA3", CURRENCY_SUFFIX, "GBP", STR_POUNDS }, // British Pound diff --git a/src/openrct2/localisation/currency.h b/src/openrct2/localisation/Currency.h similarity index 100% rename from src/openrct2/localisation/currency.h rename to src/openrct2/localisation/Currency.h diff --git a/src/openrct2/localisation/date.c b/src/openrct2/localisation/Date.cpp similarity index 98% rename from src/openrct2/localisation/date.c rename to src/openrct2/localisation/Date.cpp index 1d1286ac8b..9b1499cbf2 100644 --- a/src/openrct2/localisation/date.c +++ b/src/openrct2/localisation/Date.cpp @@ -16,8 +16,8 @@ #include #include "../Game.h" -#include "date.h" -#include "string_ids.h" +#include "Date.h" +#include "StringIds.h" uint16 gDateMonthTicks; uint16 gDateMonthsElapsed; diff --git a/src/openrct2/localisation/date.h b/src/openrct2/localisation/Date.h similarity index 100% rename from src/openrct2/localisation/date.h rename to src/openrct2/localisation/Date.h diff --git a/src/openrct2/localisation/format_codes.c b/src/openrct2/localisation/FormatCodes.cpp similarity index 96% rename from src/openrct2/localisation/format_codes.c rename to src/openrct2/localisation/FormatCodes.cpp index f2c0beb5e8..174740ef81 100644 --- a/src/openrct2/localisation/format_codes.c +++ b/src/openrct2/localisation/FormatCodes.cpp @@ -15,8 +15,9 @@ #pragma endregion #include "../common.h" -#include "format_codes.h" -#include "localisation.h" +#include "../core/Util.hpp" +#include "FormatCodes.h" +#include "Localisation.h" #pragma region Format codes @@ -101,19 +102,21 @@ static const format_code_token format_code_tokens[] = { uint32 format_get_code(const char *token) { - sint32 i; - for (i = 0; i < countof(format_code_tokens); i++) + for (uint32 i = 0; i < Util::CountOf(format_code_tokens); i++) + { if (_strcmpi(token, format_code_tokens[i].token) == 0) return format_code_tokens[i].code; + } return 0; } const char *format_get_token(uint32 code) { - sint32 i; - for (i = 0; i < countof(format_code_tokens); i++) + for (uint32 i = 0; i < Util::CountOf(format_code_tokens); i++) + { if (code == format_code_tokens[i].code) return format_code_tokens[i].token; + } return 0; } diff --git a/src/openrct2/localisation/format_codes.h b/src/openrct2/localisation/FormatCodes.h similarity index 100% rename from src/openrct2/localisation/format_codes.h rename to src/openrct2/localisation/FormatCodes.h diff --git a/src/openrct2/localisation/Language.cpp b/src/openrct2/localisation/Language.cpp index 5c015dbe32..fce6e33ff5 100644 --- a/src/openrct2/localisation/Language.cpp +++ b/src/openrct2/localisation/Language.cpp @@ -24,7 +24,7 @@ #include "LanguagePack.h" #include "../platform/platform.h" -#include "localisation.h" +#include "Localisation.h" const language_descriptor LanguagesDescriptors[LANGUAGE_COUNT] = { diff --git a/src/openrct2/localisation/language.h b/src/openrct2/localisation/Language.h similarity index 100% rename from src/openrct2/localisation/language.h rename to src/openrct2/localisation/Language.h diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index 3902399728..a139dee789 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -18,7 +18,7 @@ #include #include "../common.h" -#include "localisation.h" +#include "Localisation.h" #include "../core/FileStream.hpp" #include "../core/Math.hpp" diff --git a/src/openrct2/localisation/localisation.c b/src/openrct2/localisation/Localisation.cpp similarity index 98% rename from src/openrct2/localisation/localisation.c rename to src/openrct2/localisation/Localisation.cpp index 1898d3ff23..b32d03a231 100644 --- a/src/openrct2/localisation/localisation.c +++ b/src/openrct2/localisation/Localisation.cpp @@ -14,8 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../common.h" - #include #include @@ -30,12 +28,15 @@ #include #endif // _WIN32 +#include "../common.h" #include "../config/Config.h" +#include "../core/Util.hpp" +#include "../management/Marketing.h" #include "../Game.h" #include "../util/Util.h" -#include "date.h" -#include "localisation.h" -#include "../management/Marketing.h" +#include "Date.h" +#include "Localisation.h" +#include "../core/Math.hpp" char gCommonStringFormatBuffer[256]; uint8 gCommonFormatArgs[80]; @@ -357,7 +358,7 @@ static void format_append_string(char **dest, size_t *size, const utf8 *string) static void format_append_string_n(char **dest, size_t *size, const utf8 *string, size_t maxlen) { if ((*size) == 0) return; - size_t length = min(maxlen, strlen(string)); + size_t length = Math::Min(maxlen, strlen(string)); if (length < (*size)) { memcpy((*dest), string, length); (*dest) += length; @@ -782,7 +783,7 @@ static void format_currency_2dp(char **dest, size_t *size, sint64 value) static void format_date(char **dest, size_t *size, uint16 value) { - uint16 args[] = { date_get_month(value), date_get_year(value) + 1 }; + uint16 args[] = { static_cast(date_get_month(value)), static_cast(date_get_year(value) + 1) }; uint16 *argsRef = args; format_string_part(dest, size, STR_DATE_FORMAT_MY, (char**)&argsRef); } @@ -1108,10 +1109,10 @@ static void format_string_part(utf8 **dest, size_t *size, rct_string_id format, // Real name format -= -REAL_NAME_START; - format_append_string(dest, size, real_names[format % countof(real_names)]); + format_append_string(dest, size, real_names[format % Util::CountOf(real_names)]); if ((*size) == 0) return; format_push_char(' '); - format_push_char(real_name_initials[(format >> 10) % countof(real_name_initials)]); + format_push_char(real_name_initials[(format >> 10) % Util::CountOf(real_name_initials)]); format_push_char('.'); *(*dest) = '\0'; @@ -1326,7 +1327,7 @@ utf8 *win1252_to_utf8_alloc(const char *src, size_t srcMaxSize) { size_t stringLength = strnlen(src, srcMaxSize); size_t reservedSpace = (stringLength * 4) + 1; - utf8 *result = malloc(reservedSpace); + utf8 * result = (utf8 *)malloc(reservedSpace); sint32 actualSpace = win1252_to_utf8(result, src, stringLength, reservedSpace); return (utf8*)realloc(result, actualSpace); } @@ -1337,11 +1338,11 @@ sint32 win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t utf16 stackBuffer[256]; utf16 *heapBuffer = NULL; utf16 *intermediateBuffer = stackBuffer; - size_t bufferCount = countof(stackBuffer); + size_t bufferCount = Util::CountOf(stackBuffer); if (maxBufferLength > bufferCount) { if (srcLength > bufferCount) { bufferCount = srcLength + 4; - heapBuffer = malloc(bufferCount * sizeof(utf16)); + heapBuffer = (utf16 *)malloc(bufferCount * sizeof(utf16)); assert(heapBuffer != NULL); intermediateBuffer = heapBuffer; } diff --git a/src/openrct2/localisation/localisation.h b/src/openrct2/localisation/Localisation.h similarity index 78% rename from src/openrct2/localisation/localisation.h rename to src/openrct2/localisation/Localisation.h index f538fca509..3854846836 100644 --- a/src/openrct2/localisation/localisation.h +++ b/src/openrct2/localisation/Localisation.h @@ -17,61 +17,17 @@ #ifndef LOCALISATION_H #define LOCALISATION_H -#include "currency.h" -#include "date.h" -#include "format_codes.h" -#include "language.h" -#include "string_ids.h" +#include "Currency.h" +#include "Date.h" +#include "FormatCodes.h" +#include "Language.h" +#include "StringIds.h" #include "../management/Marketing.h" #ifdef __cplusplus extern "C" { #endif -typedef enum RCT2Polish -{ - RCT2_A_OGONEK_UC = 159, // 0x9F - RCT2_C_ACUTE_UC = 162, // 0xA2 - RCT2_E_OGONEK_UC = 166, // 0xA6 - RCT2_N_ACUTE_UC = 198, // 0xC6 - RCT2_L_STROKE_UC = 167, // 0xA7 - RCT2_S_ACUTE_UC = 208, // 0xD0 - RCT2_Z_DOT_UC = 216, // 0xD8 - RCT2_Z_ACUTE_UC = 215, // 0xD7 - - RCT2_A_OGONEK = 221, // 0xDD - RCT2_C_ACUTE = 222, // 0xDE - RCT2_E_OGONEK = 230, // 0xE6 - RCT2_N_ACUTE = 240, // 0xF0 - RCT2_L_STROKE = 247, // 0xF7 - RCT2_S_ACUTE = 248, // 0xF8 - RCT2_Z_DOT = 253, // 0xFD - RCT2_Z_ACUTE = 254, // 0xFE -} -RCT2Polish; - -typedef enum UnicodePolish -{ - UNICODE_A_OGONEK_UC = 260, - UNICODE_C_ACUTE_UC = 262, - UNICODE_E_OGONEK_UC = 280, - UNICODE_N_ACUTE_UC = 323, - UNICODE_L_STROKE_UC = 321, - UNICODE_S_ACUTE_UC = 346, - UNICODE_Z_DOT_UC = 379, - UNICODE_Z_ACUTE_UC = 377, - - UNICODE_A_OGONEK = 261, - UNICODE_C_ACUTE = 263, - UNICODE_E_OGONEK = 281, - UNICODE_N_ACUTE = 324, - UNICODE_L_STROKE = 322, - UNICODE_S_ACUTE = 347, - UNICODE_Z_DOT = 380, - UNICODE_Z_ACUTE = 378, -} -UnicodePolish; - bool utf8_is_format_code(sint32 codepoint); bool utf8_is_colour_code(sint32 codepoint); bool utf8_should_use_sprite_for_codepoint(sint32 codepoint); @@ -142,10 +98,6 @@ extern const rct_string_id DateDayNames[31]; extern const rct_string_id DateGameMonthNames[MONTH_COUNT]; extern const rct_string_id DateGameShortMonthNames[MONTH_COUNT]; -#ifdef __cplusplus -} -#endif - static inline void set_format_arg_body(uint8 *args, size_t offset, uintptr_t value, size_t size) { memcpy(args + offset, &value, size); @@ -162,4 +114,8 @@ static inline void set_format_arg_body(uint8 *args, size_t offset, uintptr_t val do { static_assert(sizeof(type) <= sizeof(uintptr_t), "Type too large"); \ set_format_arg_body(gMapTooltipFormatArgs, offset, (uintptr_t)value, sizeof(type)); } while (false) +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/openrct2/localisation/real_names.c b/src/openrct2/localisation/RealNames.cpp similarity index 99% rename from src/openrct2/localisation/real_names.c rename to src/openrct2/localisation/RealNames.cpp index e35dadb7c3..3dbabcf59b 100644 --- a/src/openrct2/localisation/real_names.c +++ b/src/openrct2/localisation/RealNames.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "localisation.h" +#include "Localisation.h" const char real_name_initials[] = { 'B', 'C', 'D', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'R', 'S', 'T', 'W' diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/StringIds.h similarity index 100% rename from src/openrct2/localisation/string_ids.h rename to src/openrct2/localisation/StringIds.h diff --git a/src/openrct2/localisation/utf8.c b/src/openrct2/localisation/UTF8.cpp similarity index 96% rename from src/openrct2/localisation/utf8.c rename to src/openrct2/localisation/UTF8.cpp index 3fa43fd7d8..b39ae55100 100644 --- a/src/openrct2/localisation/utf8.c +++ b/src/openrct2/localisation/UTF8.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "localisation.h" +#include "Localisation.h" #include uint32 utf8_get_next(const utf8 *char_ptr, const utf8 **nextchar_ptr) @@ -118,7 +118,7 @@ sint32 utf8_length(const utf8 *text) wchar_t *utf8_to_widechar(const utf8 *src) { - wchar_t *result = malloc((utf8_length(src) + 1) * sizeof(wchar_t)); + wchar_t * result = (wchar_t *)malloc((utf8_length(src) + 1) * sizeof(wchar_t)); wchar_t *dst = result; const utf8 *ch = src; @@ -137,7 +137,7 @@ wchar_t *utf8_to_widechar(const utf8 *src) utf8 *widechar_to_utf8(const wchar_t *src) { - utf8 *result = malloc((wcslen(src) * 4) + 1); + utf8 *result = (utf8 *)malloc((wcslen(src) * 4) + 1); utf8 *dst = result; for (; *src != 0; src++) { @@ -146,7 +146,7 @@ utf8 *widechar_to_utf8(const wchar_t *src) *dst++ = 0; size_t size = (size_t)(dst - result); - return realloc(result, size); + return (utf8 *)realloc(result, size); } diff --git a/src/openrct2/localisation/user.c b/src/openrct2/localisation/User.cpp similarity index 98% rename from src/openrct2/localisation/user.c rename to src/openrct2/localisation/User.cpp index a6c2efb1a1..9a535b7710 100644 --- a/src/openrct2/localisation/user.c +++ b/src/openrct2/localisation/User.cpp @@ -17,8 +17,8 @@ #include "../Game.h" #include "../ride/Ride.h" #include "../util/Util.h" -#include "localisation.h" -#include "user.h" +#include "Localisation.h" +#include "User.h" utf8 gUserStrings[MAX_USER_STRINGS][USER_STRING_MAX_LENGTH]; diff --git a/src/openrct2/localisation/user.h b/src/openrct2/localisation/User.h similarity index 90% rename from src/openrct2/localisation/user.h rename to src/openrct2/localisation/User.h index bd7beaf168..b534a921d5 100644 --- a/src/openrct2/localisation/user.h +++ b/src/openrct2/localisation/User.h @@ -14,9 +14,14 @@ *****************************************************************************/ #pragma endregion -#ifndef USER_H -#define USER_H +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif void reset_user_strings(); -#endif // USER_H \ No newline at end of file +#ifdef __cplusplus +} +#endif diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 9b3b59851f..1293fffd44 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -17,7 +17,7 @@ #include "../config/Config.h" #include "../core/Util.hpp" #include "../interface/window.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../peep/Peep.h" #include "../ride/Ride.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index d99f9319dd..7fdb3da041 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -16,8 +16,8 @@ #include "../Game.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../peep/Peep.h" #include "../peep/Staff.h" #include "../ride/Ride.h" diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index 6141360ccb..0040534196 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -18,7 +18,7 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../ride/Ride.h" #include "../ride/ride_data.h" #include "../Cheats.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 154c834a73..9c6d17adde 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -19,8 +19,8 @@ #include "../core/Util.hpp" #include "../Input.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../OpenRCT2.h" #include "../ride/Ride.h" #include "../util/Util.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 1d85e937a1..0cb1d02e1e 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -19,9 +19,9 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" -#include "../localisation/string_ids.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" +#include "../localisation/StringIds.h" #include "../object/ObjectList.h" #include "../OpenRCT2.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/network/DiscordService.cpp b/src/openrct2/network/DiscordService.cpp index b8dffd15e3..545a4f0cbc 100644 --- a/src/openrct2/network/DiscordService.cpp +++ b/src/openrct2/network/DiscordService.cpp @@ -20,7 +20,7 @@ #include "../Context.h" #include "../core/Console.hpp" #include "../core/String.hpp" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../OpenRCT2.h" #include "../world/Park.h" #include "DiscordService.h" diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 2e8dc73a1c..5e8890f73d 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -59,8 +59,8 @@ static sint32 _pickup_peep_old_x = LOCATION_NULL; #include "../Game.h" #include "../interface/chat.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../Cheats.h" diff --git a/src/openrct2/network/NetworkAction.cpp b/src/openrct2/network/NetworkAction.cpp index 355cbd5aa1..63a0f559b0 100644 --- a/src/openrct2/network/NetworkAction.cpp +++ b/src/openrct2/network/NetworkAction.cpp @@ -20,7 +20,7 @@ #include "NetworkAction.h" #include "../Game.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" sint32 NetworkActions::FindCommand(sint32 command) { diff --git a/src/openrct2/network/NetworkConnection.cpp b/src/openrct2/network/NetworkConnection.cpp index e6cec3f80d..57eef2d4b7 100644 --- a/src/openrct2/network/NetworkConnection.cpp +++ b/src/openrct2/network/NetworkConnection.cpp @@ -20,7 +20,7 @@ #include "NetworkConnection.h" #include "../core/String.hpp" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../platform/platform.h" constexpr size_t NETWORK_DISCONNECT_REASON_BUFFER_SIZE = 256; diff --git a/src/openrct2/network/NetworkPlayer.cpp b/src/openrct2/network/NetworkPlayer.cpp index c27ac8ef54..d1d865c84c 100644 --- a/src/openrct2/network/NetworkPlayer.cpp +++ b/src/openrct2/network/NetworkPlayer.cpp @@ -20,7 +20,7 @@ #include "NetworkPlayer.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" void NetworkPlayer::SetName(const std::string &name) { diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 92b06c60d4..889a03e87c 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -24,7 +24,7 @@ #include "NetworkServerAdvertiser.h" #include "../config/Config.h" -#include "../localisation/date.h" +#include "../localisation/Date.h" #include "../management/Finance.h" #include "../peep/Peep.h" #include "../platform/platform.h" diff --git a/src/openrct2/network/Twitch.cpp b/src/openrct2/network/Twitch.cpp index 4cfaedc240..8fc2eaa8a0 100644 --- a/src/openrct2/network/Twitch.cpp +++ b/src/openrct2/network/Twitch.cpp @@ -35,7 +35,7 @@ #include "../drawing/Drawing.h" #include "../Game.h" #include "../interface/console.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../management/NewsItem.h" #include "../peep/Peep.h" #include "../platform/platform.h" diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index ecb0734af0..c852184a48 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -39,7 +39,7 @@ enum { #include "../common.h" #include "../Game.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../Version.h" #include "NetworkTypes.h" diff --git a/src/openrct2/object/BannerObject.cpp b/src/openrct2/object/BannerObject.cpp index cab5237fbb..788a911b6a 100644 --- a/src/openrct2/object/BannerObject.cpp +++ b/src/openrct2/object/BannerObject.cpp @@ -18,7 +18,7 @@ #include "BannerObject.h" #include "../drawing/Drawing.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../object/Object.h" #include "ObjectList.h" diff --git a/src/openrct2/object/EntranceObject.cpp b/src/openrct2/object/EntranceObject.cpp index b8ec240a65..1d31029372 100644 --- a/src/openrct2/object/EntranceObject.cpp +++ b/src/openrct2/object/EntranceObject.cpp @@ -19,7 +19,7 @@ #include "EntranceObject.h" #include "../drawing/Drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" void EntranceObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/FootpathItemObject.cpp b/src/openrct2/object/FootpathItemObject.cpp index fdddff4536..57b88b0f54 100644 --- a/src/openrct2/object/FootpathItemObject.cpp +++ b/src/openrct2/object/FootpathItemObject.cpp @@ -18,7 +18,7 @@ #include "FootpathItemObject.h" #include "../drawing/Drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../object/Object.h" #include "ObjectList.h" diff --git a/src/openrct2/object/FootpathObject.cpp b/src/openrct2/object/FootpathObject.cpp index af5b4c4796..8a34b66eb1 100644 --- a/src/openrct2/object/FootpathObject.cpp +++ b/src/openrct2/object/FootpathObject.cpp @@ -18,7 +18,7 @@ #include "FootpathObject.h" #include "../drawing/Drawing.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../world/footpath.h" void FootpathObject::ReadLegacy(IReadObjectContext * context, IStream * stream) diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp index 11496aa9c9..1a8fe8a466 100644 --- a/src/openrct2/object/LargeSceneryObject.cpp +++ b/src/openrct2/object/LargeSceneryObject.cpp @@ -19,7 +19,7 @@ #include "LargeSceneryObject.h" #include "../drawing/Drawing.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" LargeSceneryObject::~LargeSceneryObject() { diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 26ac4b28ac..9836b2d97b 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -16,8 +16,8 @@ #include "../core/Memory.hpp" #include "../core/String.hpp" -#include "../localisation/language.h" -#include "../localisation/string_ids.h" +#include "../localisation/Language.h" +#include "../localisation/StringIds.h" #include "Object.h" #include "ObjectLimits.h" diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 2c434f75a3..52102768e1 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -19,7 +19,7 @@ #include #include "../core/Console.hpp" #include "../core/Memory.hpp" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "FootpathItemObject.h" #include "LargeSceneryObject.h" #include "Object.h" diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index f706d129cb..76d93f5201 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -41,7 +41,7 @@ #include "StexObject.h" #include "../config/Config.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../object/Object.h" #include "ObjectList.h" #include "../platform/platform.h" diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 561ac650ca..2b8c1d8610 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -23,7 +23,7 @@ #include "../ride/RideGroupManager.h" #include "../drawing/Drawing.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../rct2.h" #include "../ride/Ride.h" #include "../ride/Track.h" diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp index a5c65881fc..0a9fe9741c 100644 --- a/src/openrct2/object/SceneryGroupObject.cpp +++ b/src/openrct2/object/SceneryGroupObject.cpp @@ -21,7 +21,7 @@ #include "SceneryGroupObject.h" #include "../drawing/Drawing.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" SceneryGroupObject::~SceneryGroupObject() { diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index 634d0c8163..3f91dac784 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -21,7 +21,7 @@ #include "SmallSceneryObject.h" #include "../drawing/Drawing.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../world/scenery.h" #include "../world/SmallScenery.h" diff --git a/src/openrct2/object/StexObject.cpp b/src/openrct2/object/StexObject.cpp index d70e1ad3d7..88137fb98f 100644 --- a/src/openrct2/object/StexObject.cpp +++ b/src/openrct2/object/StexObject.cpp @@ -17,7 +17,7 @@ #include "../core/IStream.hpp" #include "StexObject.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" void StexObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index 6884b72dae..3908022ca2 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -17,7 +17,7 @@ #include #include "../core/IStream.hpp" #include "../core/String.hpp" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../localisation/LanguagePack.h" #include "Object.h" #include "StringTable.h" diff --git a/src/openrct2/object/WallObject.cpp b/src/openrct2/object/WallObject.cpp index 80dd746cea..d6100b2d21 100644 --- a/src/openrct2/object/WallObject.cpp +++ b/src/openrct2/object/WallObject.cpp @@ -18,7 +18,7 @@ #include "WallObject.h" #include "../drawing/Drawing.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" void WallObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp index 66954ed817..e90e107c47 100644 --- a/src/openrct2/object/WaterObject.cpp +++ b/src/openrct2/object/WaterObject.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../core/IStream.hpp" -#include "../localisation/language.h" -#include "../localisation/string_ids.h" +#include "../localisation/Language.h" +#include "../localisation/StringIds.h" #include "../OpenRCT2.h" #include "WaterObject.h" diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 3158115410..54e081c13a 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -14,16 +14,15 @@ *****************************************************************************/ #pragma endregion -#include "Paint.h" -#include "../drawing/Drawing.h" -#include "../localisation/localisation.h" -#include "../config/Config.h" -#include "../interface/viewport.h" -#include "../core/Math.hpp" -#include "tile_element/TileElement.h" -#include "sprite/Sprite.h" - #include +#include "../config/Config.h" +#include "../core/Math.hpp" +#include "../drawing/Drawing.h" +#include "../interface/viewport.h" +#include "../localisation/Localisation.h" +#include "Paint.h" +#include "sprite/Sprite.h" +#include "tile_element/TileElement.h" // Global for paint clipping height uint8 gClipHeight = 128; // Default to middle value diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 2f81b4fdc0..6be112bcfb 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -26,8 +26,8 @@ #include "../interface/chat.h" #include "../interface/console.h" #include "../Intro.h" -#include "../localisation/language.h" -#include "../localisation/format_codes.h" +#include "../localisation/Language.h" +#include "../localisation/FormatCodes.h" using namespace OpenRCT2; using namespace OpenRCT2::Drawing; diff --git a/src/openrct2/paint/sprite/Misc.cpp b/src/openrct2/paint/sprite/Misc.cpp index f291e65bbb..126e832d19 100644 --- a/src/openrct2/paint/sprite/Misc.cpp +++ b/src/openrct2/paint/sprite/Misc.cpp @@ -19,7 +19,7 @@ #include "../../interface/viewport.h" #include "Sprite.h" #include "../Paint.h" -#include "../../localisation/string_ids.h" +#include "../../localisation/StringIds.h" /** rct2: 0x0097EDA4 */ static const sint8 money_wave[] = { diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Banner.cpp index 7bffd898fd..6ebc1e9517 100644 --- a/src/openrct2/paint/tile_element/Banner.cpp +++ b/src/openrct2/paint/tile_element/Banner.cpp @@ -18,7 +18,7 @@ #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/viewport.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "TileElement.h" #include "../../world/Banner.h" #include "../../world/scenery.h" diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Entrance.cpp index 54250b1177..eb1238832e 100644 --- a/src/openrct2/paint/tile_element/Entrance.cpp +++ b/src/openrct2/paint/tile_element/Entrance.cpp @@ -17,7 +17,7 @@ #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/viewport.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "../../ride/ride_data.h" #include "../../world/Entrance.h" #include "../../world/footpath.h" diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index a86735119b..2e7be17a95 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -18,7 +18,7 @@ #include "../../config/Config.h" #include "../../drawing/Drawing.h" #include "../../Game.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "../../interface/colour.h" #include "../../interface/viewport.h" #include "../../ride/Track.h" diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/LargeScenery.cpp index 423f4ade30..0a1523d1c8 100644 --- a/src/openrct2/paint/tile_element/LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/LargeScenery.cpp @@ -18,7 +18,7 @@ #include "../../core/Util.hpp" #include "../../Game.h" #include "../../interface/viewport.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "../../util/Util.h" #include "../../world/Map.h" #include "../../world/LargeScenery.h" diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Path.cpp index d31c3ba1ff..8a43c6f008 100644 --- a/src/openrct2/paint/tile_element/Path.cpp +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -17,7 +17,7 @@ #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/viewport.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "../../object/ObjectList.h" #include "../../peep/Staff.h" #include "../../ride/Track.h" diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/SmallScenery.cpp index 6cccd0ee00..0ea118b4d7 100644 --- a/src/openrct2/paint/tile_element/SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/SmallScenery.cpp @@ -18,7 +18,7 @@ #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/viewport.h" -#include "../../localisation/date.h" +#include "../../localisation/Date.h" #include "../Paint.h" #include "../Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index eb8474dbff..b6a830faca 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -19,7 +19,7 @@ #include "../../drawing/Drawing.h" #include "../../Game.h" #include "../../interface/viewport.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "../../ride/ride_data.h" #include "../../ride/TrackData.h" #include "../../ride/track_paint.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index c7c75b5ea6..c1120eec7f 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -27,7 +27,7 @@ #include "../Game.h" #include "../Input.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index f225da9c55..fbe7692dac 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -21,9 +21,9 @@ #include "../Game.h" #include "../Input.h" #include "../interface/viewport.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" -#include "../localisation/string_ids.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" +#include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../network/network.h" #include "../object/ObjectList.h" diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp index 96b4076772..1a67869a2e 100644 --- a/src/openrct2/platform/Crash.cpp +++ b/src/openrct2/platform/Crash.cpp @@ -30,7 +30,7 @@ extern "C" { - #include "../localisation/language.h" + #include "../localisation/Language.h" #include "../scenario/Scenario.h" #include "platform.h" } diff --git a/src/openrct2/platform/android.c b/src/openrct2/platform/android.c index f457b02d98..2954079bcd 100644 --- a/src/openrct2/platform/android.c +++ b/src/openrct2/platform/android.c @@ -18,7 +18,7 @@ #include "platform.h" #include "../config/Config.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../util/Util.h" #include #include diff --git a/src/openrct2/platform/linux.c b/src/openrct2/platform/linux.c index f7bd5bcb56..255345f4a3 100644 --- a/src/openrct2/platform/linux.c +++ b/src/openrct2/platform/linux.c @@ -37,8 +37,8 @@ #include #include "../config/Config.h" -#include "../localisation/language.h" -#include "../localisation/string_ids.h" +#include "../localisation/Language.h" +#include "../localisation/StringIds.h" #include "../util/Util.h" #include "platform.h" diff --git a/src/openrct2/platform/macos.m b/src/openrct2/platform/macos.m index e66dd3d78d..cb29c7ca9f 100644 --- a/src/openrct2/platform/macos.m +++ b/src/openrct2/platform/macos.m @@ -22,7 +22,7 @@ #include #include "platform.h" #include "../util/Util.h" -#include "../localisation/language.h" +#include "../localisation/Language.h" #include "../config/Config.h" void macos_disallow_automatic_window_tabbing() diff --git a/src/openrct2/platform/posix.c b/src/openrct2/platform/posix.c index 5e99414438..daccf73ce4 100644 --- a/src/openrct2/platform/posix.c +++ b/src/openrct2/platform/posix.c @@ -34,8 +34,8 @@ #include #include #include "../config/Config.h" -#include "../localisation/date.h" -#include "../localisation/language.h" +#include "../localisation/Date.h" +#include "../localisation/Language.h" #include "../OpenRCT2.h" #include "../util/Util.h" #include "platform.h" diff --git a/src/openrct2/platform/shared.c b/src/openrct2/platform/shared.c index 84d702f783..e9921aa000 100644 --- a/src/openrct2/platform/shared.c +++ b/src/openrct2/platform/shared.c @@ -31,8 +31,8 @@ #include "../drawing/Drawing.h" #include "../drawing/LightFX.h" #include "../Game.h" -#include "../localisation/currency.h" -#include "../localisation/localisation.h" +#include "../localisation/Currency.h" +#include "../localisation/Localisation.h" #include "../util/Util.h" #include "../world/Climate.h" #include "platform.h" diff --git a/src/openrct2/platform/windows.c b/src/openrct2/platform/windows.c index 2644ac4c2b..c240168fd2 100644 --- a/src/openrct2/platform/windows.c +++ b/src/openrct2/platform/windows.c @@ -31,8 +31,8 @@ #include #include "../config/Config.h" -#include "../localisation/date.h" -#include "../localisation/language.h" +#include "../localisation/Date.h" +#include "../localisation/Language.h" #include "../OpenRCT2.h" #include "../rct2.h" #include "../util/Util.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 08b2ca8f72..f8f950bf80 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -39,8 +39,8 @@ #include "../Editor.h" #include "../Game.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../management/Marketing.h" #include "../object/Object.h" diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 3be7f3eab9..530fb10e42 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -30,8 +30,8 @@ #include "../Game.h" #include "../interface/viewport.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 4c5aec5a5c..50f26c7033 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -32,8 +32,8 @@ #include "../config/Config.h" #include "../Game.h" #include "../interface/viewport.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index aebd7a3216..64742e4fe9 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -27,8 +27,8 @@ #include "../Game.h" #include "../Input.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" diff --git a/src/openrct2/ride/RideGroupManager.cpp b/src/openrct2/ride/RideGroupManager.cpp index 570bdf1fcb..de25bd7e98 100644 --- a/src/openrct2/ride/RideGroupManager.cpp +++ b/src/openrct2/ride/RideGroupManager.cpp @@ -20,7 +20,7 @@ #include "../config/Config.h" #include "../core/String.hpp" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../management/Research.h" #include "Ride.h" #include "ride_data.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 1b1e8a2ee8..6fee145fd9 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -19,7 +19,7 @@ #include "../config/Config.h" #include "../Game.h" #include "../interface/viewport.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../network/network.h" #include "../platform/platform.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 18458ed400..bfd12955b9 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -26,8 +26,8 @@ #include "../audio/audio.h" #include "../Cheats.h" #include "../Game.h" -#include "../localisation/localisation.h" -#include "../localisation/string_ids.h" +#include "../localisation/Localisation.h" +#include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../rct1.h" #include "../util/SawyerCoding.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index cf48aead4a..efebd04031 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -25,7 +25,7 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../interface/viewport.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../management/NewsItem.h" #include "../platform/platform.h" #include "../rct12.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index e5f9526c50..7c215b0396 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -18,7 +18,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../interface/window.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/ride_data.c b/src/openrct2/ride/ride_data.c index 14beaf3295..c5915a416e 100644 --- a/src/openrct2/ride/ride_data.c +++ b/src/openrct2/ride/ride_data.c @@ -24,7 +24,7 @@ * https://gist.github.com/kevinburke/eaeb1d8149a6eef0dcc1 */ -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "Ride.h" #include "ride_data.h" #include "Track.h" diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index d74a602646..bf77e01411 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -16,7 +16,7 @@ #include "../Cheats.h" #include "../interface/window.h" -#include "../localisation/date.h" +#include "../localisation/Date.h" #include "../OpenRCT2.h" #include "../world/footpath.h" #include "../world/Map.h" diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index ffaf059251..34ea62a89d 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -16,7 +16,7 @@ #include "../../core/Util.hpp" #include "../../interface/viewport.h" -#include "../../localisation/localisation.h" +#include "../../localisation/Localisation.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index 3f27257cb9..aa10eaff10 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -18,8 +18,8 @@ #include "../config/Config.h" #include "../Context.h" #include "../Game.h" -#include "../localisation/localisation.h" -#include "../localisation/string_ids.h" +#include "../localisation/Localisation.h" +#include "../localisation/StringIds.h" #include "../interface/viewport.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index c0a4c79bae..88b6496ecd 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -20,7 +20,7 @@ #include "../interface/viewport.h" #include "../paint/Paint.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../sprites.h" #include "../world/Map.h" #include "../world/sprite.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index dfe2767bbf..53fdfa3f74 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -20,8 +20,8 @@ #include "../FileClassifier.h" #include "../Game.h" #include "../interface/viewport.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../management/Award.h" #include "../management/Finance.h" #include "../management/Marketing.h" diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index eaa6dc4893..c37a22d1b1 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -32,7 +32,7 @@ #include "ScenarioSources.h" #include "../config/Config.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../platform/platform.h" #include "Scenario.h" diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index 0d3d9a34f1..4959059984 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -32,7 +32,7 @@ #include "../Input.h" #include "../interface/viewport.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" // TODO Remove when no longer required. static TitleScreen * _singleton = nullptr; diff --git a/src/openrct2/title/TitleSequence.h b/src/openrct2/title/TitleSequence.h index 5437c1db05..9e6aad6d22 100644 --- a/src/openrct2/title/TitleSequence.h +++ b/src/openrct2/title/TitleSequence.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #define TITLE_COMMAND_SCENARIO_LENGTH 64 diff --git a/src/openrct2/title/TitleSequenceManager.cpp b/src/openrct2/title/TitleSequenceManager.cpp index 96385ab718..521edf89fe 100644 --- a/src/openrct2/title/TitleSequenceManager.cpp +++ b/src/openrct2/title/TitleSequenceManager.cpp @@ -26,7 +26,7 @@ #include "TitleSequence.h" #include "TitleSequenceManager.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../platform/platform.h" namespace TitleSequenceManager diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index f41efc495c..bc0007dd68 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -20,7 +20,7 @@ #include "../core/Guard.hpp" #include "../core/Math.hpp" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../platform/platform.h" #include "../title/TitleScreen.h" #include "Util.h" diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index da2f9e160d..d6412e8ce9 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -28,7 +28,7 @@ #include "scenery.h" #include "../Game.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../ride/Ride.h" #include "../ride/Track.h" diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 4d8282e664..0edcef3c3f 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -25,7 +25,7 @@ #include "../drawing/Drawing.h" #include "../Game.h" #include "../interface/window.h" -#include "../localisation/date.h" +#include "../localisation/Date.h" #include "../scenario/Scenario.h" #include "../sprites.h" #include "../util/Util.h" diff --git a/src/openrct2/world/Duck.cpp b/src/openrct2/world/Duck.cpp index 4dd72f25e8..f14a61ccc6 100644 --- a/src/openrct2/world/Duck.cpp +++ b/src/openrct2/world/Duck.cpp @@ -20,7 +20,7 @@ #include "../audio/audio.h" #include "../Game.h" -#include "../localisation/date.h" +#include "../localisation/Date.h" #include "../scenario/Scenario.h" #include "sprite.h" diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 701d55f507..239747a510 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -23,7 +23,7 @@ #include "Park.h" #include "../Cheats.h" #include "../Game.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../ride/Track.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 44a28699fa..3fdd01773a 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -23,8 +23,8 @@ #include "../Game.h" #include "../interface/Cursors.h" #include "../interface/window.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../network/network.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 7675bcf609..93682fe7d3 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -25,7 +25,7 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../Imaging.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../object/Object.h" #include "../platform/platform.h" #include "../util/Util.h" diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp index a6d684f0b2..5f072be396 100644 --- a/src/openrct2/world/MoneyEffect.cpp +++ b/src/openrct2/world/MoneyEffect.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../interface/viewport.h" #include "../interface/window.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index ebde6fe958..93fd394954 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -22,7 +22,7 @@ #include "../Game.h" #include "../interface/colour.h" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../management/Award.h" #include "../management/Finance.h" #include "../management/Marketing.h" diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index 889554e3b5..f1135fd939 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -20,7 +20,7 @@ #include "../Cheats.h" #include "../Game.h" -#include "../localisation/string_ids.h" +#include "../localisation/StringIds.h" #include "../ride/Track.h" #include "../ride/TrackData.h" #include "LargeScenery.h" diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index 0b19fdac89..f787c014b8 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -16,7 +16,7 @@ #include "../Cheats.h" #include "../Game.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../network/network.h" #include "../object/ObjectList.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/scenery.c index 40ab950267..892fb69eb4 100644 --- a/src/openrct2/world/scenery.c +++ b/src/openrct2/world/scenery.c @@ -17,7 +17,7 @@ #include "../common.h" #include "../Cheats.h" #include "../Game.h" -#include "../localisation/localisation.h" +#include "../localisation/Localisation.h" #include "../network/network.h" #include "../object/ObjectList.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c index 3c5e779a67..f9508f4787 100644 --- a/src/openrct2/world/sprite.c +++ b/src/openrct2/world/sprite.c @@ -18,8 +18,8 @@ #include "../Cheats.h" #include "../Game.h" #include "../interface/viewport.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" +#include "../localisation/Date.h" +#include "../localisation/Localisation.h" #include "../OpenRCT2.h" #include "../scenario/Scenario.h" #include "Fountain.h" diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt index b876f12131..3adb854fe2 100644 --- a/test/tests/CMakeLists.txt +++ b/test/tests/CMakeLists.txt @@ -77,8 +77,8 @@ set(COMMON_TEST_SOURCES "${ROOT_DIR}/src/openrct2/core/Guard.cpp" "${ROOT_DIR}/src/openrct2/core/String.cpp" "${ROOT_DIR}/src/openrct2/Diagnostic.cpp" - "${ROOT_DIR}/src/openrct2/localisation/format_codes.c" - "${ROOT_DIR}/src/openrct2/localisation/utf8.c" + "${ROOT_DIR}/src/openrct2/localisation/FormatCodes.cpp" + "${ROOT_DIR}/src/openrct2/localisation/UTF8.cpp" "${ROOT_DIR}/src/openrct2/util/Util.cpp" "${ROOT_DIR}/src/openrct2/Version.cpp" ) diff --git a/test/tests/LanguagePackTest.cpp b/test/tests/LanguagePackTest.cpp index 91b82e0066..d60b4482b1 100644 --- a/test/tests/LanguagePackTest.cpp +++ b/test/tests/LanguagePackTest.cpp @@ -1,5 +1,5 @@ #include "openrct2/localisation/LanguagePack.h" -#include "openrct2/localisation/string_ids.h" +#include "openrct2/localisation/StringIds.h" #include class LanguagePackTest : public testing::Test