Port stadium blocks and facilities without periphery construction (by Codex)
This commit is contained in:
1 parent
0f36b507d4
commit
349c416f3a
21 files changed
+1185
-12
No files matched your search
+20
-2
@@ -16,6 +16,7 @@
|
||||
#include "modern/ui/demo_transfer.hpp"
|
||||
#include "modern/ui/demo_career_reports.hpp"
|
||||
#include "modern/ui/demo_rankings.hpp"
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include "modern/ui/desktop.hpp"
|
||||
#include "modern/ui/gui_assets.hpp"
|
||||
#include "modern/ui/model.hpp"
|
||||
@@ -369,6 +370,10 @@ class App final : public Rml::EventListener {
|
||||
uint64_t transfer_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> transfer_world_;
|
||||
Json career_view_ = Json::object(), rankings_view_ = Json::object();
|
||||
Json stadium_view_ = Json::object();
|
||||
uint64_t stadium_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> stadium_world_;
|
||||
const DataSource *stadium_source_ = nullptr;
|
||||
float device_ratio_ = 1.f;
|
||||
Json desktop_ = Json::object(), saved_desktop_ = Json::object(),
|
||||
options_ = Json::object();
|
||||
@@ -588,6 +593,8 @@ class App final : public Rml::EventListener {
|
||||
transfer_dialog_.clear(); transfer_picker_.clear(); transfer_notice_.clear(); transfer_return_focus_.clear();
|
||||
transfer_poach_league_.clear(); transfer_poach_club_.clear(); transfer_world_.reset(); transfer_revision_ = 0;
|
||||
career_view_ = Json::object(); rankings_view_ = Json::object();
|
||||
stadium_view_ = Json::object(); stadium_revision_ = 0;
|
||||
stadium_world_.reset(); stadium_source_ = nullptr;
|
||||
advertising_selected_ = -1; advertising_offer_ = 0; advertising_revision_ = 0; advertising_world_.reset();
|
||||
toto_column_ = 0; toto_dialog_.clear();
|
||||
for (auto &focus : toto_focus_) focus = {0, 1};
|
||||
@@ -758,6 +765,11 @@ class App final : public Rml::EventListener {
|
||||
bool rankings_event(Rml::Event &);
|
||||
void rankings_remember_scroll();
|
||||
void rankings_restore_scroll();
|
||||
std::string render_stadium();
|
||||
std::string render_stadium_dialog();
|
||||
void sync_stadium_draft();
|
||||
bool stadium_action(const std::string &, Rml::Element *);
|
||||
bool stadium_event(Rml::Event &);
|
||||
std::string render_almanac();
|
||||
bool almanac_action(const std::string &, Rml::Element *);
|
||||
std::string render_indoor();
|
||||
@@ -833,6 +845,10 @@ class App final : public Rml::EventListener {
|
||||
if (menu_ != last_rendered_menu_) {
|
||||
planning_dialog_.clear();
|
||||
career_view_["dialog"] = ""; career_view_["return_focus"] = "";
|
||||
stadium_view_["dialog"] = ""; stadium_view_["draft"] = Json();
|
||||
stadium_view_["return_focus"] = ""; stadium_revision_ = 0;
|
||||
stadium_view_["ticket_return_focus"] = "";
|
||||
stadium_world_.reset(); stadium_source_ = nullptr;
|
||||
lineup_drag_ = Json(); lineup_drag_world_.reset(); lineup_ignore_click_ = false;
|
||||
transfer_dialog_.clear(); transfer_draft_ = transfer_search_draft_ = Json(); transfer_picker_.clear();
|
||||
transfer_world_.reset(); transfer_revision_ = 0; transfer_return_focus_.clear();
|
||||
@@ -886,10 +902,10 @@ class App final : public Rml::EventListener {
|
||||
setting_menu_markup_ = true;
|
||||
element("canvas")->SetInnerRML(markup);
|
||||
setting_menu_markup_ = false;
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty()) {
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty() || !stadium_view_.value("dialog", "").empty()) {
|
||||
Rml::ElementList behind;
|
||||
doc_->QuerySelectorAll(behind,
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,.window .titlebar button");
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,#stadium-underlay button,#stadium-underlay input,#stadium-underlay select,.window .titlebar button");
|
||||
for (auto *node : behind)
|
||||
node->SetProperty("pointer-events", "none");
|
||||
}
|
||||
@@ -1316,6 +1332,8 @@ public:
|
||||
#include "modern/ui/career_report_controls.inc"
|
||||
#include "modern/ui/rankings_screens.inc"
|
||||
#include "modern/ui/rankings_controls.inc"
|
||||
#include "modern/ui/stadium_screens.inc"
|
||||
#include "modern/ui/stadium_controls.inc"
|
||||
} // namespace
|
||||
bool is_modern_world(const fs::path &file) {
|
||||
try {
|
||||
|
||||
Reference in new issue
Block a user