mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix naming conflicts

This commit is contained in:
Gymnasiast 2022-07-31 15:04:08 +02:00
parent d3fd31c611
commit 9841b4e9e0
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@ -159,7 +159,7 @@ private:
struct ShortcutStringPair
{
std::string ShortcutId;
StringId StringId = STR_NONE;
::StringId StringId = STR_NONE;
std::string CustomString;
std::string Binding;
};

4
src/openrct2/localisation/FormatCodes.cpp
View File

@ -37,7 +37,7 @@ static const EnumMap<FormatToken> FormatTokenMap = {
{ "UINT16", FormatToken::UInt16, },
{ "CURRENCY2DP", FormatToken::Currency2dp, },
{ "CURRENCY", FormatToken::Currency, },
{ "STRINGID", FormatToken::StringId, },
{ "STRINGID", FormatToken::StringById, },
{ "STRING", FormatToken::String, },
{ "MONTHYEAR", FormatToken::MonthYear, },
{ "MONTH", FormatToken::Month, },
@ -116,7 +116,7 @@ bool FormatTokenTakesArgument(FormatToken token)
case FormatToken::UInt16:
case FormatToken::Currency2dp:
case FormatToken::Currency:
case FormatToken::StringId:
case FormatToken::StringById:
case FormatToken::String:
case FormatToken::MonthYear:
case FormatToken::Month:

2
src/openrct2/localisation/FormatCodes.h
View File

@ -35,7 +35,7 @@ enum class FormatToken
UInt16,
Currency2dp,
Currency,
StringId,
StringById,
String,
MonthYear,
Month,

4
src/openrct2/localisation/Formatting.cpp
View File

@ -682,7 +682,7 @@ namespace OpenRCT2
{
for (const auto& token : fmt)
{
if (token.kind == FormatToken::StringId)
if (token.kind == FormatToken::StringById)
{
if (argIndex < args.size())
{
@ -782,7 +782,7 @@ namespace OpenRCT2
case FormatToken::Comma1dp16:
anyArgs.push_back(ReadFromArgs<int16_t>(args));
break;
case FormatToken::StringId:
case FormatToken::StringById:
{
auto stringId = ReadFromArgs<StringId>(args);
anyArgs.push_back(stringId);

2
src/openrct2/localisation/Formatting.h
View File

@ -233,7 +233,7 @@ namespace OpenRCT2
while (!it.eol())
{
auto token = *it++;
if (token.kind == FormatToken::StringId)
if (token.kind == FormatToken::StringById)
{
if constexpr (std::is_integral<TArg0>())
{

2
src/openrct2/title/TitleSequenceManager.cpp
View File

@ -32,7 +32,7 @@ namespace TitleSequenceManager
{
const utf8* ConfigId;
const utf8* Filename;
StringId StringId;
::StringId StringId;
};
static constexpr PredefinedSequence PredefinedSequences[] = {