mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use std::initializer_list and range-for for credits window. (#12431) 

Replaces C-style array, indexed looping, and char * strings.
pull/12439/head
Peter Nelson 2024-04-06 19:30:23 +01:00 committed by GitHub
parent a4c2f0778a
commit fbdf26800b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/misc_gui.cpp
View File

@ -404,7 +404,7 @@ static WindowDesc _about_desc(
std::begin(_nested_about_widgets), std::end(_nested_about_widgets) std::begin(_nested_about_widgets), std::end(_nested_about_widgets)
); );
static const char * const _credits[] = { static const std::initializer_list<const std::string_view> _credits = {
"Original design by Chris Sawyer", "Original design by Chris Sawyer",
"Original graphics by Simon Foster", "Original graphics by Simon Foster",
"", "",
@ -499,8 +499,8 @@ struct AboutWindow : public Window {
d.height = this->line_height * num_visible_lines; d.height = this->line_height * num_visible_lines;
d.width = 0; d.width = 0;
for (uint i = 0; i < lengthof(_credits); i++) { for (const auto &str : _credits) {
d.width = std::max(d.width, GetStringBoundingBox(_credits[i]).width); d.width = std::max(d.width, GetStringBoundingBox(str).width);
} }
*size = maxdim(*size, d); *size = maxdim(*size, d);
} }
@ -512,9 +512,9 @@ struct AboutWindow : public Window {
int y = this->text_position; int y = this->text_position;
/* Show all scrolling _credits */ /* Show all scrolling _credits */
for (uint i = 0; i < lengthof(_credits); i++) { for (const auto &str : _credits) {
if (y >= r.top + 7 && y < r.bottom - this->line_height) { if (y >= r.top + 7 && y < r.bottom - this->line_height) {
DrawString(r.left, r.right, y, _credits[i], TC_BLACK, SA_LEFT | SA_FORCE); DrawString(r.left, r.right, y, str, TC_BLACK, SA_LEFT | SA_FORCE);
} }
y += this->line_height; y += this->line_height;
} }
@ -528,7 +528,7 @@ struct AboutWindow : public Window {
IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(2100) / GetCharacterHeight(FS_NORMAL), [this](uint count) { IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(2100) / GetCharacterHeight(FS_NORMAL), [this](uint count) {
this->text_position -= count; this->text_position -= count;
/* If the last text has scrolled start a new from the start */ /* If the last text has scrolled start a new from the start */
if (this->text_position < (int)(this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y - lengthof(_credits) * this->line_height)) { if (this->text_position < (int)(this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y - std::size(_credits) * this->line_height)) {
this->text_position = this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y + this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->current_y; this->text_position = this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y + this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->current_y;
} }
this->SetWidgetDirty(WID_A_SCROLLING_TEXT); this->SetWidgetDirty(WID_A_SCROLLING_TEXT);