mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Code Issues Releases Wiki Activity

Use range-based for loops in libopenrct2

Browse Source
This commit is contained in:
Hielke Morsink
2017-12-20 02:50:18 +01:00
committed by Michael Steenbeek
parent 3c2aaefc85
commit 628039dd8a
23 changed files with 194 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/Game.cpp
View File

@@ -1134,14 +1134,12 @@ void game_convert_strings_to_utf8()
rct2_to_utf8_self(gScenarioDetails, 256);
// User strings
for (sint32 i = 0; i < MAX_USER_STRINGS; i++)
for (auto * string : gUserStrings)
{
utf8 * userString = gUserStrings[i];
if (!str_is_null_or_empty(userString))
if (!str_is_null_or_empty(string))
{
rct2_to_utf8_self(userString, RCT12_USER_STRING_MAX_LENGTH);
utf8_remove_formatting(userString, true);
rct2_to_utf8_self(string, RCT12_USER_STRING_MAX_LENGTH);
utf8_remove_formatting(string, true);
}
}
@@ -1174,10 +1172,8 @@ void game_convert_strings_to_rct2(rct_s6_data * s6)
utf8_to_rct2_self(s6->scenario_description, sizeof(s6->scenario_description));
// User strings
for (sint32 i = 0; i < MAX_USER_STRINGS; i++)
for (auto * userString : s6->custom_strings)
{
char * userString = s6->custom_strings[i];
if (!str_is_null_or_empty(userString))
{
utf8_to_rct2_self(userString, RCT12_USER_STRING_MAX_LENGTH);
@@ -1185,13 +1181,11 @@ void game_convert_strings_to_rct2(rct_s6_data * s6)
}
// News items
for (sint32 i = 0; i < MAX_NEWS_ITEMS; i++)
for (auto &newsItem : s6->news_items)
{
rct12_news_item * newsItem = &s6->news_items[i];
if (!str_is_null_or_empty(newsItem->Text))
if (!str_is_null_or_empty(newsItem.Text))
{
utf8_to_rct2_self(newsItem->Text, sizeof(newsItem->Text));
utf8_to_rct2_self(newsItem.Text, sizeof(newsItem.Text));
}
}
}