Merge pull request #14966 from unknownbrackets/config-minor

Config: Correct cardboard setting ini load
This commit is contained in:
Henrik Rydgård 2021-10-05 06:45:50 +02:00 committed by GitHub
commit 45a3e0fa8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions

View file

@ -838,7 +838,7 @@ static ConfigSetting graphicsSettings[] = {
ConfigSetting("EnableCardboardVR", &g_Config.bEnableCardboardVR, false, true, true),
ConfigSetting("CardboardScreenSize", &g_Config.iCardboardScreenSize, 50, true, true),
ConfigSetting("CardboardXShift", &g_Config.iCardboardXShift, 0, true, true),
ConfigSetting("CardboardYShift", &g_Config.iCardboardXShift, 0, true, true),
ConfigSetting("CardboardYShift", &g_Config.iCardboardYShift, 0, true, true),
ConfigSetting("ShowFPSCounter", &g_Config.iShowFPSCounter, 0, true, true),
ReportedConfigSetting("GraphicsBackend", &g_Config.iGPUBackend, &DefaultGPUBackend, &GPUBackendTranslator::To, &GPUBackendTranslator::From, true, false),
ConfigSetting("FailedGraphicsBackends", &g_Config.sFailedGPUBackends, ""),
@ -1065,7 +1065,6 @@ static ConfigSetting networkSettings[] = {
ConfigSetting("proAdhocServer", &g_Config.proAdhocServer, "socom.cc", true, true),
ConfigSetting("PortOffset", &g_Config.iPortOffset, 10000, true, true),
ConfigSetting("MinTimeout", &g_Config.iMinTimeout, 0, true, true),
ConfigSetting("TCPNoDelay", &g_Config.bTCPNoDelay, true, true, true),
ConfigSetting("ForcedFirstConnect", &g_Config.bForcedFirstConnect, false, true, true),
ConfigSetting("EnableUPnP", &g_Config.bEnableUPnP, false, true, true),
ConfigSetting("UPnPUseOriginalPort", &g_Config.bUPnPUseOriginalPort, false, true, true),

View file

@ -445,7 +445,6 @@ public:
std::string proAdhocServer;
bool bEnableWlan;
bool bEnableAdhocServer;
bool bTCPNoDelay;
bool bEnableUPnP;
bool bUPnPUseOriginalPort;
bool bForcedFirstConnect;