From 942730ce7148cd54a30d4a606ce71a2654c8a2e0 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 5 Jun 2021 22:47:00 -0400 Subject: [PATCH] ppsspp: Remove upgrade code and gold support. Original patch from Leo Prikler. Rebased on master (commit 69fa20744958aef8da9ca052ba7675fdc1636e46) by Maxim Cournoyer. --- Core/Config.cpp | 11 ------ Core/Config.h | 2 -- Qt/QtMain.cpp | 6 ---- SDL/SDLMain.cpp | 6 ---- UI/DevScreens.cpp | 3 -- UI/GameSettingsScreen.cpp | 2 -- UI/MainScreen.cpp | 70 +------------------------------------ UI/MiscScreens.cpp | 31 ++-------------- UWP/PPSSPP_UWPMain.cpp | 6 ---- Windows/MainWindowMenu.cpp | 2 +- Windows/main.cpp | 6 ---- android/jni/app-android.cpp | 6 ---- ios/main.mm | 6 ---- 13 files changed, 5 insertions(+), 152 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 74be99d75..b14aa22c7 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -467,7 +467,6 @@ static ConfigSetting generalSettings[] = { ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), - ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true), ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... @@ -1323,16 +1322,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { upgradeMessage = ""; } - // Check for new version on every 10 runs. - // Sometimes the download may not be finished when the main screen shows (if the user dismisses the - // splash screen quickly), but then we'll just show the notification next time instead, we store the - // upgrade number in the ini. - if (iRunCount % 10 == 0 && bCheckForNewVersion) { - std::shared_ptr dl = g_DownloadManager.StartDownloadWithCallback( - "http://www.ppsspp.org/version.json", Path(), &DownloadCompletedCallback); - dl->SetHidden(true); - } - INFO_LOG(LOADER, "Loading controller config: %s", controllerIniFilename_.c_str()); bSaveSettings = true; diff --git a/Core/Config.h b/Core/Config.h index 79323eefc..d47bec0c7 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -103,7 +103,6 @@ struct Config { bool bFastMemory; int iCpuCore; - bool bCheckForNewVersion; bool bForceLagSync; bool bFuncReplacements; bool bHideSlowWarnings; @@ -542,4 +541,3 @@ std::string CreateRandMAC(); // TODO: Find a better place for this. extern http::Downloader g_DownloadManager; extern Config g_Config; - diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index b642f7442..a880d7c94 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -219,12 +219,6 @@ bool System_GetPropertyBool(SystemProperty prop) { case SYSPROP_HAS_FILE_BROWSER: case SYSPROP_HAS_FOLDER_BROWSER: return true; - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; -#else - return false; -#endif case SYSPROP_CAN_JIT: return true; default: diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index f0f74f979..f963f36e9 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -381,12 +381,6 @@ bool System_GetPropertyBool(SystemProperty prop) { switch (prop) { case SYSPROP_HAS_BACK_BUTTON: return true; - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; -#else - return false; -#endif case SYSPROP_CAN_JIT: return true; default: diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 29baf2f2e..926692363 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -635,9 +635,6 @@ void SystemInfoScreen::CreateViews() { #ifdef _M_SSE buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE))); #endif - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { - buildConfig->Add(new InfoItem("GOLD", "")); - } ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt"); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 393e33cd9..d07d00d45 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -922,8 +922,6 @@ void GameSettingsScreen::CreateViews() { } } #endif - systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); - systemSettings->Add(new Choice(sy->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings); systemSettings->Add(new CheckBox(&g_Config.bEnableStateUndo, sy->T("Savestate slot backups"))); static const char *autoLoadSaveStateChoices[] = { "Off", "Oldest Save", "Newest Save", "Slot 1", "Slot 2", "Slot 3", "Slot 4", "Slot 5" }; diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index f88509276..51b21b640 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1080,11 +1080,7 @@ void MainScreen::CreateViews() { sprintf(versionString, "%s", PPSSPP_GIT_VERSION); rightColumnItems->SetSpacing(0.0f); AnchorLayout *logos = new AnchorLayout(new AnchorLayoutParams(FILL_PARENT, 60.0f, false)); - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { - logos->Add(new ImageView(ImageID("I_ICONGOLD"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - } else { - logos->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - } + logos->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); logos->Add(new ImageView(ImageID("I_LOGO"), "PPSSPP", IS_DEFAULT, new AnchorLayoutParams(180, 64, 64, -5.0f, NONE, NONE, false))); #if !defined(MOBILE_DEVICE) @@ -1107,11 +1103,6 @@ void MainScreen::CreateViews() { rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); - if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { - Choice *gold = rightColumnItems->Add(new Choice(mm->T("Buy PPSSPP Gold"))); - gold->OnClick.Handle(this, &MainScreen::OnSupport); - gold->SetIcon(ImageID("I_ICONGOLD")); - } #if !PPSSPP_PLATFORM(UWP) // Having an exit button is against UWP guidelines. @@ -1136,32 +1127,6 @@ void MainScreen::CreateViews() { } else if (tabHolder_->GetVisibility() != V_GONE) { root_->SetDefaultFocusView(tabHolder_); } - - auto u = GetI18NCategory("Upgrade"); - - upgradeBar_ = 0; - if (!g_Config.upgradeMessage.empty()) { - upgradeBar_ = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); - - UI::Margins textMargins(10, 5); - UI::Margins buttonMargins(0, 0); - UI::Drawable solid(0xFFbd9939); - upgradeBar_->SetBG(solid); - upgradeBar_->Add(new TextView(u->T("New version of PPSSPP available") + std::string(": ") + g_Config.upgradeVersion, new LinearLayoutParams(1.0f, textMargins))); -#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(WINDOWS) - upgradeBar_->Add(new Button(u->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); -#else - upgradeBar_->Add(new Button(u->T("Details"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); -#endif - upgradeBar_->Add(new Button(u->T("Dismiss"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDismissUpgrade); - - // Slip in under root_ - LinearLayout *newRoot = new LinearLayout(ORIENT_VERTICAL); - newRoot->Add(root_); - newRoot->Add(upgradeBar_); - root_->ReplaceLayoutParams(new LinearLayoutParams(1.0)); - root_ = newRoot; - } } UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { @@ -1169,30 +1134,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { return UI::EVENT_DONE; } -UI::EventReturn MainScreen::OnDownloadUpgrade(UI::EventParams &e) { -#if PPSSPP_PLATFORM(ANDROID) - // Go to app store - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { - LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); - } else { - LaunchBrowser("market://details?id=org.ppsspp.ppsspp"); - } -#elif PPSSPP_PLATFORM(WINDOWS) - LaunchBrowser("https://www.ppsspp.org/downloads.html"); -#else - // Go directly to ppsspp.org and let the user sort it out - // (for details and in case downloads doesn't have their platform.) - LaunchBrowser("https://www.ppsspp.org/"); -#endif - return UI::EVENT_DONE; -} - -UI::EventReturn MainScreen::OnDismissUpgrade(UI::EventParams &e) { - g_Config.DismissUpgrade(); - upgradeBar_->SetVisibility(UI::V_GONE); - return UI::EVENT_DONE; -} - void MainScreen::sendMessage(const char *message, const char *value) { // Always call the base class method first to handle the most common messages. UIScreenWithBackground::sendMessage(message, value); @@ -1396,15 +1337,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { return UI::EVENT_DONE; } -UI::EventReturn MainScreen::OnSupport(UI::EventParams &e) { -#ifdef __ANDROID__ - LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); -#else - LaunchBrowser("https://central.ppsspp.org/buygold"); -#endif - return UI::EVENT_DONE; -} - UI::EventReturn MainScreen::OnPPSSPPOrg(UI::EventParams &e) { LaunchBrowser("https://www.ppsspp.org"); return UI::EVENT_DONE; diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 901a5fb09..9d067aee6 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -661,11 +661,7 @@ void LogoScreen::render() { char temp[256]; // Manually formatting UTF-8 is fun. \xXX doesn't work everywhere. snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5); - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { - dc.Draw()->DrawImage(ImageID("I_ICONGOLD"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); - } else { - dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); - } + dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER); //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", bounds.w / 2, bounds.h / 2 - 30, textColor, ALIGN_CENTER); dc.SetFontScale(1.0f, 1.0f); @@ -701,10 +697,6 @@ void CreditsScreen::CreateViews() { // Really need to redo this whole layout with some linear layouts... int rightYOffset = 0; - if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { - root_->Add(new Button(cr->T("Buy Gold"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnSupport); - rightYOffset = 74; - } root_->Add(new Button(cr->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); root_->Add(new Button(cr->T("Discord"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 232, false)))->OnClick.Handle(this, &CreditsScreen::OnDiscord); root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); @@ -713,20 +705,7 @@ void CreditsScreen::CreateViews() { #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare); #endif - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { - root_->Add(new ImageView(ImageID("I_ICONGOLD"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); - } else { - root_->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); - } -} - -UI::EventReturn CreditsScreen::OnSupport(UI::EventParams &e) { -#ifdef __ANDROID__ - LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); -#else - LaunchBrowser("https://central.ppsspp.org/buygold"); -#endif - return UI::EVENT_DONE; + root_->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); } UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) { @@ -916,11 +895,7 @@ void CreditsScreen::render() { // TODO: This is kinda ugly, done on every frame... char temp[256]; - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { - snprintf(temp, sizeof(temp), "PPSSPP Gold %s", PPSSPP_GIT_VERSION); - } else { - snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); - } + snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); credits[0] = (const char *)temp; UIContext &dc = *screenManager()->getUIContext(); diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 29afda806..b7028fc0c 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -426,12 +426,6 @@ bool System_GetPropertyBool(SystemProperty prop) { return false; case SYSPROP_HAS_BACK_BUTTON: return true; - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; -#else - return false; -#endif case SYSPROP_CAN_JIT: return true; default: diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index c0d790e06..e8de4f956 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -1395,7 +1395,7 @@ namespace MainWindow { { W32Util::CenterWindow(hDlg); HWND versionBox = GetDlgItem(hDlg, IDC_VERSION); - std::string windowText = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold " : "PPSSPP "; + std::string windowText = "PPSSPP "; windowText.append(PPSSPP_GIT_VERSION); SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str()); } diff --git a/Windows/main.cpp b/Windows/main.cpp index ecfe18fa4..3261151d2 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -304,12 +304,6 @@ bool System_GetPropertyBool(SystemProperty prop) { return true; case SYSPROP_HAS_BACK_BUTTON: return true; - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; -#else - return false; -#endif case SYSPROP_CAN_JIT: return true; default: diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 2fad16224..8ed6dd9cd 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -490,12 +490,6 @@ bool System_GetPropertyBool(SystemProperty prop) { case SYSPROP_HAS_FOLDER_BROWSER: // Uses OPEN_DOCUMENT_TREE to let you select a folder. return androidVersion >= 21; // when ACTION_OPEN_DOCUMENT_TREE was added - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; -#else - return false; -#endif case SYSPROP_CAN_JIT: return true; case SYSPROP_ANDROID_SCOPED_STORAGE: diff --git a/ios/main.mm b/ios/main.mm index e53b7c7ab..fe69647ed 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -148,12 +148,6 @@ bool System_GetPropertyBool(SystemProperty prop) { switch (prop) { case SYSPROP_HAS_BACK_BUTTON: return false; - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; -#else - return false; -#endif case SYSPROP_CAN_JIT: return g_jitAvailable; -- 2.31.1