preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-14 06:50:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Decouple save states from UI.

Browse Source 
It's the UI's job to decide how and what things are displayed, not Core's.
This also reduces reasons for linkage issues.
This commit is contained in:
Unknown W. Brackets committed 2016-05-27 21:25:05 -07:00
1 parent 2862253f12
commit 27d135d48a
7 files changed
+58 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/PauseScreen.cpp
+10 -3
View File
@@ -40,6 +40,7 @@
#include "UI/ReportScreen.h"
#include "UI/CwCheatScreen.h"
#include "UI/MainScreen.h"
#include "UI/OnScreenDisplay.h"
#include "UI/GameInfoCache.h"
void AsyncImageFileView::GetContentDimensions(const UIContext &dc, float &w, float &h) const {
@@ -224,9 +225,15 @@ void SaveSlotView::Draw(UIContext &dc) {
UI::LinearLayout::Draw(dc);
}
static void AfterSaveStateAction(bool status, const std::string &message, void *) {
if (!message.empty()) {
osm.Show(message, 2.0);
}
}
UI::EventReturn SaveSlotView::OnLoadState(UI::EventParams &e) {
g_Config.iCurrentStateSlot = slot_;
SaveState::LoadSlot(gamePath_, slot_, SaveState::Callback(), 0);
SaveState::LoadSlot(gamePath_, slot_, &AfterSaveStateAction);
UI::EventParams e2;
e2.v = this;
OnStateLoaded.Trigger(e2);
@@ -235,7 +242,7 @@ UI::EventReturn SaveSlotView::OnLoadState(UI::EventParams &e) {
UI::EventReturn SaveSlotView::OnSaveState(UI::EventParams &e) {
g_Config.iCurrentStateSlot = slot_;
SaveState::SaveSlot(gamePath_, slot_, SaveState::Callback(), 0);
SaveState::SaveSlot(gamePath_, slot_, &AfterSaveStateAction);
UI::EventParams e2;
e2.v = this;
OnStateSaved.Trigger(e2);
@@ -389,7 +396,7 @@ UI::EventReturn GamePauseScreen::OnReportFeedback(UI::EventParams &e) {
}
UI::EventReturn GamePauseScreen::OnRewind(UI::EventParams &e) {
SaveState::Rewind(SaveState::Callback(), 0);
SaveState::Rewind(&AfterSaveStateAction);
screenManager()->finishDialog(this, DR_CANCEL);
return UI::EVENT_DONE;