diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 27ee9156a0..d839e58850 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -218,7 +218,7 @@ struct AIConfigWindow : public Window { if (widget >= WID_AIC_TEXTFILE && widget < WID_AIC_TEXTFILE + TFT_CONTENT_END) { if (this->selected_slot == CompanyID::Invalid() || AIConfig::GetConfig(this->selected_slot) == nullptr) return; - ShowScriptTextfileWindow(this, (TextfileType)(widget - WID_AIC_TEXTFILE), this->selected_slot); + ShowScriptTextfileWindow(this, static_cast(widget - WID_AIC_TEXTFILE), this->selected_slot); return; } @@ -250,23 +250,23 @@ struct AIConfigWindow : public Window { } case WID_AIC_LIST: { // Select a slot - this->selected_slot = (CompanyID)this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget); + this->selected_slot = static_cast(this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget)); this->InvalidateData(); - if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed); + if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed); break; } case WID_AIC_MOVE_UP: - if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot - 1))) { + if (IsEditable(this->selected_slot) && IsEditable(static_cast(this->selected_slot - 1))) { std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot - 1]); - this->selected_slot = CompanyID(this->selected_slot - 1); + this->selected_slot = static_cast(this->selected_slot - 1); this->vscroll->ScrollTowards(this->selected_slot.base()); this->InvalidateData(); } break; case WID_AIC_MOVE_DOWN: - if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot + 1))) { + if (IsEditable(this->selected_slot) && IsEditable(static_cast(this->selected_slot + 1))) { std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot + 1]); ++this->selected_slot; this->vscroll->ScrollTowards(this->selected_slot.base()); @@ -282,11 +282,11 @@ struct AIConfigWindow : public Window { } case WID_AIC_CHANGE: // choose other AI - if (IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed); + if (IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed); break; case WID_AIC_CONFIGURE: // change the settings for an AI - ShowScriptSettingsWindow((CompanyID)this->selected_slot); + ShowScriptSettingsWindow(this->selected_slot); break; case WID_AIC_CONTENT_DOWNLOAD: @@ -320,8 +320,8 @@ struct AIConfigWindow : public Window { this->SetWidgetDisabledState(WID_AIC_INCREASE_INTERVAL, GetGameSettings().difficulty.competitors_interval == MAX_COMPETITORS_INTERVAL); this->SetWidgetDisabledState(WID_AIC_CHANGE, !IsEditable(this->selected_slot)); this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == CompanyID::Invalid() || config->GetConfigList()->empty()); - this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot - 1))); - this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot + 1))); + this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable(static_cast(this->selected_slot - 1))); + this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable(static_cast(this->selected_slot + 1))); this->SetWidgetDisabledState(WID_AIC_OPEN_URL, this->selected_slot == CompanyID::Invalid() || config->GetInfo() == nullptr || config->GetInfo()->GetURL().empty()); for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) { diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp index 670f4d42c7..207a4c7daf 100644 --- a/src/game/game_gui.cpp +++ b/src/game/game_gui.cpp @@ -123,12 +123,12 @@ struct GSConfigWindow : public Window { */ void RebuildVisibleSettings() { - visible_settings.clear(); + this->visible_settings.clear(); for (const auto &item : *this->gs_config->GetConfigList()) { bool no_hide = !item.flags.Test(ScriptConfigFlag::Developer); if (no_hide || _settings_client.gui.ai_developer_tools) { - visible_settings.push_back(&item); + this->visible_settings.push_back(&item); } } @@ -200,7 +200,7 @@ struct GSConfigWindow : public Window { } else { int i = static_cast(std::distance(std::begin(this->visible_settings), it)); if (config_item.complete_labels) { - DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && clicked_dropdown, editable); + DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && this->clicked_dropdown, editable); } else { DrawArrowButtons(br.left, y + button_y_offset, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value); } @@ -228,19 +228,19 @@ struct GSConfigWindow : public Window { if (widget >= WID_GSC_TEXTFILE && widget < WID_GSC_TEXTFILE + TFT_CONTENT_END) { if (GameConfig::GetConfig() == nullptr) return; - ShowScriptTextfileWindow(this, (TextfileType)(widget - WID_GSC_TEXTFILE), (CompanyID)OWNER_DEITY); + ShowScriptTextfileWindow(this, static_cast(widget - WID_GSC_TEXTFILE), OWNER_DEITY); return; } switch (widget) { case WID_GSC_GSLIST: { this->InvalidateData(); - if (click_count > 1 && _game_mode != GM_NORMAL) ShowScriptListWindow((CompanyID)OWNER_DEITY, _ctrl_pressed); + if (click_count > 1 && _game_mode != GM_NORMAL) ShowScriptListWindow(OWNER_DEITY, _ctrl_pressed); break; } case WID_GSC_CHANGE: // choose other Game Script - ShowScriptListWindow((CompanyID)OWNER_DEITY, _ctrl_pressed); + ShowScriptListWindow(OWNER_DEITY, _ctrl_pressed); break; case WID_GSC_CONTENT_DOWNLOAD: @@ -350,14 +350,14 @@ struct GSConfigWindow : public Window { if (!str.has_value()) return; auto value = ParseInteger(*str, 10, true); if (!value.has_value()) return; - SetValue(*value); + this->SetValue(*value); } void OnDropdownSelect(WidgetID widget, int index, int) override { if (widget != WID_GSC_SETTING_DROPDOWN) return; assert(this->clicked_dropdown); - SetValue(index); + this->SetValue(index); } void OnDropdownClose(Point, WidgetID widget, int, int, bool) override @@ -397,7 +397,7 @@ struct GSConfigWindow : public Window { const GameConfig *config = GameConfig::GetConfig(); this->SetWidgetDisabledState(WID_GSC_OPEN_URL, config->GetInfo() == nullptr || config->GetInfo()->GetURL().empty()); for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) { - this->SetWidgetDisabledState(WID_GSC_TEXTFILE + tft, !config->GetTextfile(tft, (CompanyID)OWNER_DEITY).has_value()); + this->SetWidgetDisabledState(WID_GSC_TEXTFILE + tft, !config->GetTextfile(tft, OWNER_DEITY).has_value()); } this->RebuildVisibleSettings(); this->CloseChildWindows(WC_DROPDOWN_MENU); diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp index d9799c5a61..d2ef7819a9 100644 --- a/src/script/script_gui.cpp +++ b/src/script/script_gui.cpp @@ -71,7 +71,7 @@ struct ScriptListWindow : public Window { ScriptListWindow(WindowDesc &desc, CompanyID slot, bool show_all) : Window(desc), slot(slot), show_all(show_all) { - if (slot == OWNER_DEITY) { + if (this->slot == OWNER_DEITY) { this->info_list = this->show_all ? Game::GetInfoList() : Game::GetUniqueInfoList(); } else { this->info_list = this->show_all ? AI::GetInfoList() : AI::GetUniqueInfoList(); @@ -84,8 +84,8 @@ struct ScriptListWindow : public Window { this->vscroll->SetCount(this->info_list->size() + 1); /* Try if we can find the currently selected AI */ - if (GetConfig(slot)->HasScript()) { - ScriptInfo *info = GetConfig(slot)->GetInfo(); + if (GetConfig(this->slot)->HasScript()) { + ScriptInfo *info = GetConfig(this->slot)->GetInfo(); int i = 0; for (const auto &item : *this->info_list) { if (item.second == info) { @@ -168,25 +168,25 @@ struct ScriptListWindow : public Window { void ChangeScript() { if (this->selected == -1) { - GetConfig(slot)->Change(std::nullopt); + GetConfig(this->slot)->Change(std::nullopt); } else { ScriptInfoList::const_iterator it = this->info_list->cbegin(); std::advance(it, this->selected); - GetConfig(slot)->Change(it->second->GetName(), it->second->GetVersion()); + GetConfig(this->slot)->Change(it->second->GetName(), it->second->GetVersion()); } if (_game_mode == GM_EDITOR) { - if (slot == OWNER_DEITY) { + if (this->slot == OWNER_DEITY) { if (Game::GetInstance() != nullptr) Game::ResetInstance(); Game::StartNew(); } else { - Company *c = Company::GetIfValid(slot); + Company *c = Company::GetIfValid(this->slot); if (c != nullptr && c->ai_instance != nullptr) { c->ai_instance.reset(); - AI::StartNew(slot); + AI::StartNew(this->slot); } } } - InvalidateWindowData(WC_GAME_OPTIONS, slot == OWNER_DEITY ? WN_GAME_OPTIONS_GS : WN_GAME_OPTIONS_AI); + InvalidateWindowData(WC_GAME_OPTIONS, this->slot == OWNER_DEITY ? WN_GAME_OPTIONS_GS : WN_GAME_OPTIONS_AI); InvalidateWindowClassesData(WC_SCRIPT_SETTINGS); InvalidateWindowClassesData(WC_SCRIPT_DEBUG, -1); CloseWindowByClass(WC_QUERY_STRING); @@ -198,7 +198,7 @@ struct ScriptListWindow : public Window { switch (widget) { case WID_SCRL_LIST: { // Select one of the Scripts int sel = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_SCRL_LIST) - 1; - if (sel < (int)this->info_list->size()) { + if (sel < static_cast(this->info_list->size())) { this->selected = sel; this->SetDirty(); if (click_count > 1) { @@ -307,7 +307,7 @@ struct ScriptSettingsWindow : public Window { { this->CreateNestedTree(); this->vscroll = this->GetScrollbar(WID_SCRS_SCROLLBAR); - this->FinishInitNested(slot); // Initializes 'this->line_height' as side effect. + this->FinishInitNested(this->slot); // Initializes 'this->line_height' as side effect. this->OnInvalidateData(); } @@ -319,12 +319,12 @@ struct ScriptSettingsWindow : public Window { */ void RebuildVisibleSettings() { - visible_settings.clear(); + this->visible_settings.clear(); for (const auto &item : *this->script_config->GetConfigList()) { bool no_hide = !item.flags.Test(ScriptConfigFlag::Developer); if (no_hide || _settings_client.gui.ai_developer_tools) { - visible_settings.push_back(&item); + this->visible_settings.push_back(&item); } } @@ -373,7 +373,7 @@ struct ScriptSettingsWindow : public Window { } else { int i = static_cast(std::distance(std::begin(this->visible_settings), it)); if (config_item.complete_labels) { - DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && clicked_dropdown, editable); + DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && this->clicked_dropdown, editable); } else { DrawArrowButtons(br.left, y + button_y_offset, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value); } @@ -488,14 +488,14 @@ struct ScriptSettingsWindow : public Window { if (!str.has_value()) return; auto value = ParseInteger(*str, 10, true); if (!value.has_value()) return; - SetValue(*value); + this->SetValue(*value); } void OnDropdownSelect(WidgetID widget, int index, int) override { if (widget != WID_SCRS_SETTING_DROPDOWN) return; assert(this->clicked_dropdown); - SetValue(index); + this->SetValue(index); } void OnDropdownClose(Point, WidgetID widget, int, int, bool) override @@ -606,7 +606,7 @@ struct ScriptTextfileWindow : public TextfileWindow { std::string GetWidgetString(WidgetID widget, StringID stringid) const override { if (widget == WID_TF_CAPTION) { - return GetString(stringid, (slot == OWNER_DEITY) ? STR_CONTENT_TYPE_GAME_SCRIPT : STR_CONTENT_TYPE_AI, GetConfig(slot)->GetInfo()->GetName()); + return GetString(stringid, (this->slot == OWNER_DEITY) ? STR_CONTENT_TYPE_GAME_SCRIPT : STR_CONTENT_TYPE_AI, GetConfig(this->slot)->GetInfo()->GetName()); } return this->Window::GetWidgetString(widget, stringid); @@ -614,11 +614,11 @@ struct ScriptTextfileWindow : public TextfileWindow { void OnInvalidateData([[maybe_unused]] int data = 0, [[maybe_unused]] bool gui_scope = true) override { - auto textfile = GetConfig(slot)->GetTextfile(file_type, slot); + auto textfile = GetConfig(this->slot)->GetTextfile(file_type, this->slot); if (!textfile.has_value()) { this->Close(); } else { - this->LoadTextfile(textfile.value(), (slot == OWNER_DEITY) ? GAME_DIR : AI_DIR); + this->LoadTextfile(textfile.value(), (this->slot == OWNER_DEITY) ? GAME_DIR : AI_DIR); } } }; @@ -732,13 +732,13 @@ struct ScriptDebugWindow : public Window { for (const Company *c : Company::Iterate()) { if (c->is_ai) { - ChangeToScript(c->index); + this->ChangeToScript(c->index); return; } } /* If no AI is available, see if there is a game script. */ - if (Game::GetInstance() != nullptr) ChangeToScript(OWNER_DEITY); + if (Game::GetInstance() != nullptr) this->ChangeToScript(OWNER_DEITY); } /** @@ -844,7 +844,7 @@ struct ScriptDebugWindow : public Window { void DrawWidgetCompanyButton(const Rect &r, WidgetID widget, int start) const { if (this->IsWidgetDisabled(widget)) return; - CompanyID cid = (CompanyID)(widget - start); + CompanyID cid = static_cast(widget - start); Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON); DrawCompanyIcon(cid, CentreBounds(r.left, r.right, sprite_size.width), CentreBounds(r.top, r.bottom, sprite_size.height)); } @@ -909,7 +909,7 @@ struct ScriptDebugWindow : public Window { ScriptLogTypes::LogData &log = this->GetLogData(); - int scroll_count = (int)log.size(); + int scroll_count = static_cast(log.size()); if (this->vscroll->GetCount() != scroll_count) { this->vscroll->SetCount(scroll_count); @@ -921,10 +921,10 @@ struct ScriptDebugWindow : public Window { /* Detect when the user scrolls the window. Enable autoscroll when the bottom-most line becomes visible. */ if (this->last_vscroll_pos != this->vscroll->GetPosition()) { - this->autoscroll = this->vscroll->GetPosition() + this->vscroll->GetCapacity() >= (int)log.size(); + this->autoscroll = this->vscroll->GetPosition() + this->vscroll->GetCapacity() >= static_cast(log.size()); } - if (this->autoscroll && this->vscroll->SetPosition((int)log.size())) { + if (this->autoscroll && this->vscroll->SetPosition(static_cast(log.size()))) { /* We need a repaint */ this->SetWidgetDirty(WID_SCRD_VSCROLLBAR); this->SetWidgetDirty(WID_SCRD_LOG_PANEL); @@ -1003,12 +1003,12 @@ struct ScriptDebugWindow : public Window { /* Check which button is clicked */ if (IsInsideMM(widget, WID_SCRD_COMPANY_BUTTON_START, WID_SCRD_COMPANY_BUTTON_END + 1)) { - ChangeToScript((CompanyID)(widget - WID_SCRD_COMPANY_BUTTON_START), _ctrl_pressed); + this->ChangeToScript(static_cast(widget - WID_SCRD_COMPANY_BUTTON_START), _ctrl_pressed); } switch (widget) { case WID_SCRD_SCRIPT_GAME: - ChangeToScript(OWNER_DEITY, _ctrl_pressed); + this->ChangeToScript(OWNER_DEITY, _ctrl_pressed); break; case WID_SCRD_RELOAD_TOGGLE: @@ -1111,7 +1111,7 @@ struct ScriptDebugWindow : public Window { } /* Highlight row that matched */ - this->highlight_row = (int)(log.size() - 1); + this->highlight_row = static_cast(log.size() - 1); } } }