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

Codechange: use std::string instead of stredup/free for ScanProgressWindow

pull/10519/head
Rubidium 2023-04-29 20:39:09 +02:00 committed by rubidium42
parent aac95eeaf5
commit a931378c52
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/newgrf_gui.cpp
View File

@ -2184,21 +2184,15 @@ static WindowDesc _scan_progress_desc(
/** Window for showing the progress of NewGRF scanning. */ /** Window for showing the progress of NewGRF scanning. */
struct ScanProgressWindow : public Window { struct ScanProgressWindow : public Window {
char *last_name; ///< The name of the last 'seen' NewGRF. std::string last_name; ///< The name of the last 'seen' NewGRF.
int scanned; ///< The number of NewGRFs that we have seen. int scanned; ///< The number of NewGRFs that we have seen.
/** Create the window. */ /** Create the window. */
ScanProgressWindow() : Window(&_scan_progress_desc), last_name(nullptr), scanned(0) ScanProgressWindow() : Window(&_scan_progress_desc), scanned(0)
{ {
this->InitNested(1); this->InitNested(1);
} }
/** Free the last name buffer. */
~ScanProgressWindow()
{
free(last_name);
}
void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{ {
switch (widget) { switch (widget) {
@ -2241,7 +2235,7 @@ struct ScanProgressWindow : public Window {
SetDParam(1, _settings_client.gui.last_newgrf_count); SetDParam(1, _settings_client.gui.last_newgrf_count);
DrawString(r.left, r.right, r.top, STR_NEWGRF_SCAN_STATUS, TC_FROMSTRING, SA_HOR_CENTER); DrawString(r.left, r.right, r.top, STR_NEWGRF_SCAN_STATUS, TC_FROMSTRING, SA_HOR_CENTER);
DrawString(r.left, r.right, r.top + FONT_HEIGHT_NORMAL + WidgetDimensions::scaled.vsep_normal, this->last_name == nullptr ? "" : this->last_name, TC_BLACK, SA_HOR_CENTER); DrawString(r.left, r.right, r.top + FONT_HEIGHT_NORMAL + WidgetDimensions::scaled.vsep_normal, this->last_name, TC_BLACK, SA_HOR_CENTER);
break; break;
} }
} }
@ -2253,13 +2247,10 @@ struct ScanProgressWindow : public Window {
*/ */
void UpdateNewGRFScanStatus(uint num, const char *name) void UpdateNewGRFScanStatus(uint num, const char *name)
{ {
free(this->last_name);
if (name == nullptr) { if (name == nullptr) {
char buf[256]; this->last_name = GetString(STR_NEWGRF_SCAN_ARCHIVES);
GetString(buf, STR_NEWGRF_SCAN_ARCHIVES, lastof(buf));
this->last_name = stredup(buf);
} else { } else {
this->last_name = stredup(name); this->last_name = name;
} }
this->scanned = num; this->scanned = num;
if (num > _settings_client.gui.last_newgrf_count) _settings_client.gui.last_newgrf_count = num; if (num > _settings_client.gui.last_newgrf_count) _settings_client.gui.last_newgrf_count = num;