Redesign the ability to load state at boot #6271
Conversation
Source/Core/Core/Core.cpp
Outdated
| }); | ||
| } | ||
| if (savestate_path) | ||
| QueueHostJob([savestate_path] { ::State::LoadAs(*savestate_path); }); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| @@ -535,15 +516,20 @@ static void EmuThread(std::unique_ptr<BootParameters> boot) | |||
| Keyboard::LoadConfig(); | |||
| } | |||
|
|
|||
| const std::optional<std::string> savestate_path = boot->savestate_path; | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| @@ -474,7 +482,12 @@ void MainWindow::ScreenShot() | |||
|
|
|||
| void MainWindow::StartGame(const QString& path) | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
Can an option to do this for netplay be added? Assuming it's deterministic (it wasn't before.) I know it may not be 100% related, but, considering this is a very requested feature, it seems like this may be the best time to ask. |
|
@JMC47 It would be possible to add it, but I haven't tested if it's deterministic, and there's enough UI design involved that it should be in a separate PR. |
JosJuice
force-pushed
the
load-state-at-boot
branch
2 times, most recently
from
21c720e to
cdbac1a
Compare
Source/Core/DolphinWX/Frame.cpp
Outdated
| @@ -130,8 +131,9 @@ void CRenderFrame::OnDropFiles(wxDropFilesEvent& event) | |||
| main_frame->GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(true); | |||
| } | |||
|
|
|||
| if (Movie::PlayInput(filepath)) | |||
| main_frame->BootGame(""); | |||
| std::optional<std::string> savestate_path = {}; | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
Source/Core/DolphinWX/FrameTools.cpp
Outdated
| @@ -513,8 +514,9 @@ void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED(event)) | |||
| GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(); | |||
| } | |||
|
|
|||
| if (Movie::PlayInput(WxStrToStr(path))) | |||
| BootGame(""); | |||
| std::optional<std::string> savestate_path = {}; | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
JosJuice
force-pushed
the
load-state-at-boot
branch
from
cdbac1a to
9868870
Compare
BootParameters can now contain the path of a savestate to load at boot. Movie has been made to use this instead of poking at Core.cpp's state.
JosJuice
force-pushed
the
load-state-at-boot
branch
from
9868870 to
9dd88d7
Compare
| }); | ||
| } | ||
| if (savestate_path) | ||
| QueueHostJob([&savestate_path] { ::State::LoadAs(*savestate_path); }); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
BootParameters can now contain the path of a savestate to load at boot. Movie has been made to use this instead of poking at Core.cpp's state.
I made this change so that PR #6270 could use it, but I think this change is useful enough on its own, so I'm submitting it as a separate PR.