dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change window close/deallocation to match upstream

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-09-15 23:56:33 +01:00
parent 79cfc3e8bd
commit f5d1b1d8f8
50 changed files with 352 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/script/script_gui.cpp
View File

@@ -201,7 +201,7 @@ struct ScriptListWindow : public Window {
this->SetDirty();
if (click_count > 1) {
this->ChangeScript();
delete this;
this->Close();
}
}
break;
@@ -209,12 +209,12 @@ struct ScriptListWindow : public Window {
case WID_SCRL_ACCEPT: {
this->ChangeScript();
delete this;
this->Close();
break;
}
case WID_SCRL_CANCEL:
delete this;
this->Close();
break;
}
}
@@ -232,7 +232,7 @@ struct ScriptListWindow : public Window {
void OnInvalidateData(int data = 0, bool gui_scope = true) override
{
if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot)) {
delete this;
this->Close();
return;
}
@@ -325,9 +325,10 @@ struct ScriptSettingsWindow : public Window {
this->RebuildVisibleSettings();
}
~ScriptSettingsWindow()
void Close() override
{
HideDropDownMenu(this);
this->Window::Close();
}
/**
@@ -520,7 +521,7 @@ struct ScriptSettingsWindow : public Window {
}
case WID_SCRS_ACCEPT:
delete this;
this->Close();
break;
case WID_SCRS_RESET:
@@ -660,7 +661,7 @@ struct ScriptTextfileWindow : public TextfileWindow {
{
const char *textfile = GetConfig(slot)->GetTextfile(file_type, slot);
if (textfile == nullptr) {
delete this;
this->Close();
} else {
this->LoadTextfile(textfile, (slot == OWNER_DEITY) ? GAME_DIR : AI_DIR);
}