Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2021-08-16 01:58:47 +03:00
699 changed files with 41188 additions and 22618 deletions

View File

@@ -130,7 +130,7 @@ struct EnginePreviewWindow : Window {
DoCommandP(0, this->window_number, 0, CMD_WANT_ENGINE_PREVIEW);
FALLTHROUGH;
case WID_EP_NO:
if (!citymania::_estimate_mod) delete this;
if (!citymania::_estimate_mod) this->Close();
break;
}
}
@@ -140,7 +140,7 @@ struct EnginePreviewWindow : Window {
if (!gui_scope) return;
EngineID engine = this->window_number;
if (Engine::Get(engine)->preview_company != _local_company) delete this;
if (Engine::Get(engine)->preview_company != _local_company) this->Close();
}
};