mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Add proper fullscreen and windowed launch arguments. Remove bFullScreenOnLaunch.
This commit is contained in:
parent
a537aa946d
commit
9dbf2b9d90
4 changed files with 16 additions and 14 deletions
|
@ -157,7 +157,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
|
|||
graphics->Get("VertexCache", &bVertexCache, true);
|
||||
#ifdef _WIN32
|
||||
graphics->Get("FullScreen", &bFullScreen, false);
|
||||
graphics->Get("FullScreenOnLaunch", &bFullScreenOnLaunch, false);
|
||||
#endif
|
||||
#ifdef BLACKBERRY
|
||||
graphics->Get("PartialStretch", &bPartialStretch, pixel_xres == pixel_yres);
|
||||
|
@ -316,7 +315,6 @@ void Config::Save() {
|
|||
graphics->Set("VertexCache", bVertexCache);
|
||||
#ifdef _WIN32
|
||||
graphics->Set("FullScreen", bFullScreen);
|
||||
graphics->Set("FullScreenOnLaunch", bFullScreenOnLaunch);
|
||||
#endif
|
||||
#ifdef BLACKBERRY
|
||||
graphics->Set("PartialStretch", bPartialStretch);
|
||||
|
|
|
@ -78,9 +78,6 @@ public:
|
|||
|
||||
bool bVertexCache;
|
||||
bool bFullScreen;
|
||||
#ifdef _WIN32
|
||||
bool bFullScreenOnLaunch;
|
||||
#endif
|
||||
int iInternalResolution; // 0 = Auto (native), 1 = 1x (480x272), 2 = 2x, 3 = 3x, 4 = 4x and so on.
|
||||
int iAnisotropyLevel; // 0 - 5, powers of 2: 0 = 1x = no aniso
|
||||
bool bTrueColor;
|
||||
|
|
|
@ -706,9 +706,7 @@ namespace MainWindow
|
|||
hideCursor = true;
|
||||
SetTimer(hwndMain, TIMER_CURSORUPDATE, CURSORUPDATE_INTERVAL_MS, 0);
|
||||
|
||||
// Update();
|
||||
|
||||
if(g_Config.bFullScreenOnLaunch)
|
||||
if(g_Config.bFullScreen)
|
||||
_ViewFullScreen(hwndMain);
|
||||
|
||||
ShowWindow(hwndMain, nCmdShow);
|
||||
|
|
|
@ -83,13 +83,16 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
|
|||
}
|
||||
SetCurrentDirectory(modulePath);
|
||||
// GetCurrentDirectory(MAX_PATH, modulePath); // for checking in the debugger
|
||||
|
||||
#ifndef _DEBUG
|
||||
bool hideLog = true;
|
||||
|
||||
#ifdef _DEBUG
|
||||
hideLog = false;
|
||||
#else
|
||||
bool hideLog = false;
|
||||
#endif
|
||||
|
||||
// Load config up here, because those changes below would be overwritten
|
||||
// if it's not loaded here first.
|
||||
g_Config.Load();
|
||||
|
||||
// The rest is handled in NativeInit().
|
||||
for (int i = 1; i < __argc; ++i)
|
||||
{
|
||||
|
@ -107,7 +110,15 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
|
|||
g_Config.bAutoRun = false;
|
||||
g_Config.bSaveSettings = false;
|
||||
break;
|
||||
case '-':
|
||||
break;
|
||||
}
|
||||
|
||||
if (!strncmp(__argv[i], "--fullscreen", strlen("--fullscreen")))
|
||||
g_Config.bFullScreen = true;
|
||||
|
||||
if (!strncmp(__argv[i], "--windowed", strlen("--windowed")))
|
||||
g_Config.bFullScreen = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -128,8 +139,6 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
|
|||
langRegion = "en_US";
|
||||
}
|
||||
|
||||
g_Config.Load();
|
||||
|
||||
LogManager::Init();
|
||||
LogManager::GetInstance()->GetConsoleListener()->Open(hideLog, 150, 120, "PPSSPP Debug Console");
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue