Complete Modern season preparation with persistent draw progress (by Codex)
This commit is contained in:
1 parent
967520190d
commit
e81ecf95f2
27 files changed
+1432
-208
No files matched your search
@@ -81,7 +81,7 @@ void App::entry_begin() {
|
||||
? "desktop"
|
||||
: "main";
|
||||
entry_catalog_ = std::move(next);
|
||||
renderer_.world(entry_catalog_);
|
||||
bind_world(entry_catalog_);
|
||||
start_options_ = {{"duration", 5}, {"difficulty", 3}, {"players", 1},
|
||||
{"mode", 3}, {"league", true}, {"world", true}};
|
||||
adding_manager_ = false;
|
||||
@@ -100,7 +100,7 @@ void App::entry_add() {
|
||||
if (!source_)
|
||||
return;
|
||||
entry_catalog_.reset();
|
||||
renderer_.world(world_);
|
||||
bind_world(world_);
|
||||
entry_source_ = source_.get();
|
||||
entry_revision_ = snap().revision;
|
||||
managers_draft_ = snap().state.at("managers");
|
||||
@@ -125,7 +125,7 @@ void App::entry_add() {
|
||||
}
|
||||
void App::entry_cancel() {
|
||||
entry_catalog_.reset();
|
||||
renderer_.world(world_);
|
||||
bind_world(world_);
|
||||
manager_confirm_ = manager_success_ = manager_picker_ = false;
|
||||
club_search_.clear();
|
||||
scene_ = adding_manager_ ? "desktop" : entry_return_scene_;
|
||||
@@ -200,6 +200,7 @@ void App::entry_confirm() {
|
||||
result.error);
|
||||
return;
|
||||
}
|
||||
opening_write(*catalog, demo->snapshot().state, valid_desktop(desktop_) ? desktop_ : default_desktop());
|
||||
publish_world(catalog, std::move(demo));
|
||||
saved_desktop_ = Json::object();
|
||||
undo_.clear();
|
||||
@@ -208,9 +209,8 @@ void App::entry_confirm() {
|
||||
manager_confirm_ = false;
|
||||
entry_catalog_.reset();
|
||||
scene_ = start_options_.value("league", true) ? "opening" : "desktop";
|
||||
opening_page_ = draw_revealed_ = 0;
|
||||
draw_playing_ = true;
|
||||
draw_at_ = 0;
|
||||
opening_due_ = 0;
|
||||
opening_io_blocked_ = false;
|
||||
focus_after_render_.clear();
|
||||
}
|
||||
refresh();
|
||||
|
||||
Reference in new issue
Block a user