mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-13 01:29:41 +01:00
Move out two more functions from Core.cpp. Clean up Windows includes
This commit is contained in:
1 parent
83af54950f
commit
080798b5dd
20 files changed
+33
-35
No files matched your search
+13
-3
@@ -70,6 +70,7 @@ using namespace std::placeholders;
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/HLE/sceCtrl.h"
|
||||
#include "Core/HLE/sceSas.h"
|
||||
#include "Core/HLE/sceNetAdhoc.h"
|
||||
#include "Core/Debugger/SymbolMap.h"
|
||||
#include "Core/RetroAchievements.h"
|
||||
#include "Core/SaveState.h"
|
||||
@@ -1380,11 +1381,11 @@ bool EmuScreen::checkPowerDown() {
|
||||
ScreenRenderRole EmuScreen::renderRole(bool isTop) const {
|
||||
auto CanBeBackground = [&]() -> bool {
|
||||
if (g_Config.bSkipBufferEffects) {
|
||||
return isTop || (g_Config.bTransparentBackground && Core_ShouldRunBehind());
|
||||
return isTop || (g_Config.bTransparentBackground && ShouldRunBehind());
|
||||
}
|
||||
|
||||
if (!g_Config.bTransparentBackground && !isTop) {
|
||||
if (Core_ShouldRunBehind() || screenManager()->topScreen()->wantBrightBackground())
|
||||
if (ShouldRunBehind() || screenManager()->topScreen()->wantBrightBackground())
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@@ -1462,7 +1463,7 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) {
|
||||
|
||||
if (mode & ScreenRenderMode::TOP) {
|
||||
System_Notify(SystemNotification::KEEP_SCREEN_AWAKE);
|
||||
} else if (!Core_ShouldRunBehind() && strcmp(screenManager()->topScreen()->tag(), "DevMenu") != 0) {
|
||||
} else if (!ShouldRunBehind() && strcmp(screenManager()->topScreen()->tag(), "DevMenu") != 0) {
|
||||
// NOTE: The strcmp is != 0 - so all popped-over screens EXCEPT DevMenu
|
||||
// Just to make sure.
|
||||
if (PSP_IsInited() && !skipBufferEffects) {
|
||||
@@ -1814,3 +1815,12 @@ void EmuScreen::autoLoad() {
|
||||
void EmuScreen::resized() {
|
||||
RecreateViews();
|
||||
}
|
||||
|
||||
bool MustRunBehind() {
|
||||
return __NetAdhocConnected();
|
||||
}
|
||||
|
||||
bool ShouldRunBehind() {
|
||||
// Enforce run-behind if ad-hoc connected
|
||||
return g_Config.bRunBehindPauseMenu || MustRunBehind();
|
||||
}
|
||||
Reference in new issue
Block a user