mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2025-02-19 05:15:41 +00:00
Added a --no-splash option for disableing the ES logo
fix indentation
This commit is contained in:
parent
d6b726cc34
commit
e974cd9d43
|
@ -55,6 +55,9 @@ bool parseArgs(int argc, char* argv[], unsigned int* width, unsigned int* height
|
||||||
}else if(strcmp(argv[i], "--no-exit") == 0)
|
}else if(strcmp(argv[i], "--no-exit") == 0)
|
||||||
{
|
{
|
||||||
Settings::getInstance()->setBool("ShowExit", false);
|
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)
|
}else if(strcmp(argv[i], "--debug") == 0)
|
||||||
{
|
{
|
||||||
Settings::getInstance()->setBool("Debug", true);
|
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"
|
"--ignore-gamelist ignore the gamelist (useful for troubleshooting)\n"
|
||||||
"--draw-framerate display the framerate\n"
|
"--draw-framerate display the framerate\n"
|
||||||
"--no-exit don't show the exit option in the menu\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"
|
"--debug more logging, show console on Windows\n"
|
||||||
"--scrape scrape using command line interface\n"
|
"--scrape scrape using command line interface\n"
|
||||||
"--windowed not fullscreen, should be used with --resolution\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);
|
std::string glExts = (const char*)glGetString(GL_EXTENSIONS);
|
||||||
LOG(LogInfo) << "Checking available OpenGL 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");
|
LOG(LogInfo) << " ARB_texture_non_power_of_two: " << (glExts.find("ARB_texture_non_power_of_two") != std::string::npos ? "ok" : "MISSING");
|
||||||
|
if(Settings::getInstance()->getBool("SplashScreen"))
|
||||||
window.renderLoadingScreen();
|
window.renderLoadingScreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* errorMsg = NULL;
|
const char* errorMsg = NULL;
|
||||||
|
|
|
@ -17,7 +17,8 @@ std::vector<const char*> settings_dont_save = boost::assign::list_of
|
||||||
("Windowed")
|
("Windowed")
|
||||||
("VSync")
|
("VSync")
|
||||||
("HideConsole")
|
("HideConsole")
|
||||||
("IgnoreGamelist");
|
("IgnoreGamelist")
|
||||||
|
("SplashScreen");
|
||||||
|
|
||||||
Settings::Settings()
|
Settings::Settings()
|
||||||
{
|
{
|
||||||
|
@ -43,6 +44,7 @@ void Settings::setDefaults()
|
||||||
mBoolMap["DrawFramerate"] = false;
|
mBoolMap["DrawFramerate"] = false;
|
||||||
mBoolMap["ShowExit"] = true;
|
mBoolMap["ShowExit"] = true;
|
||||||
mBoolMap["Windowed"] = false;
|
mBoolMap["Windowed"] = false;
|
||||||
|
mBoolMap["SplashScreen"] = true;
|
||||||
|
|
||||||
#ifdef _RPI_
|
#ifdef _RPI_
|
||||||
// don't enable VSync by default on the Pi, since it already
|
// don't enable VSync by default on the Pi, since it already
|
||||||
|
|
Loading…
Reference in a new issue