Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-30 03:55:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added a --no-splash option for disableing the ES logo

Browse source 
fix indentation
This commit is contained in:
John Rassa 2017-01-12 19:17:53 +00:00
parent d6b726cc34
commit e974cd9d43
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
es-app/src/main.cpp
View file

@ -55,6 +55,9 @@ bool parseArgs(int argc, char* argv[], unsigned int* width, unsigned int* height
}else if(strcmp(argv[i], "--no-exit") == 0)
{
Settings::getInstance()->setBool("ShowExit", false);
}else if(strcmp(argv[i], "--no-splash") == 0)
{
Settings::getInstance()->setBool("SplashScreen", false);
}else if(strcmp(argv[i], "--debug") == 0)
{
Settings::getInstance()->setBool("Debug", true);
@ -91,6 +94,7 @@ bool parseArgs(int argc, char* argv[], unsigned int* width, unsigned int* height
"--ignore-gamelist ignore the gamelist (useful for troubleshooting)\n"
"--draw-framerate display the framerate\n"
"--no-exit don't show the exit option in the menu\n"
"--no-splash don't show the splash screen\n"
"--debug more logging, show console on Windows\n"
"--scrape scrape using command line interface\n"
"--windowed not fullscreen, should be used with --resolution\n"
@ -225,8 +229,8 @@ int main(int argc, char* argv[])
std::string glExts = (const char*)glGetString(GL_EXTENSIONS);
LOG(LogInfo) << "Checking available OpenGL extensions...";
LOG(LogInfo) << " ARB_texture_non_power_of_two: " << (glExts.find("ARB_texture_non_power_of_two") != std::string::npos ? "ok" : "MISSING");
window.renderLoadingScreen();
if(Settings::getInstance()->getBool("SplashScreen"))
window.renderLoadingScreen();
}
const char* errorMsg = NULL;

4
es-core/src/Settings.cpp
View file

@ -17,7 +17,8 @@ std::vector<const char*> settings_dont_save = boost::assign::list_of
("Windowed")
("VSync")
("HideConsole")
("IgnoreGamelist");
("IgnoreGamelist")
("SplashScreen");
Settings::Settings()
{
@ -43,6 +44,7 @@ void Settings::setDefaults()
mBoolMap["DrawFramerate"] = false;
mBoolMap["ShowExit"] = true;
mBoolMap["Windowed"] = false;
mBoolMap["SplashScreen"] = true;
#ifdef _RPI_
// don't enable VSync by default on the Pi, since it already