simplify necessary sbinit fields on Windows
This commit is contained in:
parent
5815a873a7
commit
74985240fc
@ -4,11 +4,5 @@
|
||||
"..\\mods\\"
|
||||
],
|
||||
|
||||
"storageDirectory" : "..\\storage\\",
|
||||
|
||||
"defaultConfiguration" : {
|
||||
"gameServerBind" : "*",
|
||||
"queryServerBind" : "*",
|
||||
"rconServerBind" : "*"
|
||||
}
|
||||
"storageDirectory" : "..\\storage\\"
|
||||
}
|
||||
|
@ -15,10 +15,6 @@
|
||||
|
||||
"defaultConfiguration" : {
|
||||
"allowAdminCommandsFromAnyone" : true,
|
||||
"anonymousConnectionsAreAdmin" : true,
|
||||
|
||||
"gameServerBind" : "*",
|
||||
"queryServerBind" : "*",
|
||||
"rconServerBind" : "*"
|
||||
"anonymousConnectionsAreAdmin" : true
|
||||
}
|
||||
}
|
||||
|
@ -154,8 +154,17 @@ Root::Settings RootLoader::rootSettingsForOptions(Options const& options) const
|
||||
|
||||
rootSettings.assetDirectories = jsonToStringList(bootConfig.get("assetDirectories"));
|
||||
|
||||
#ifdef STAR_SYSTEM_WINDOWS
|
||||
rootSettings.defaultConfiguration = BaseDefaultConfiguration
|
||||
.set("gameServerBind", "*")
|
||||
.set("queryServerBind", "*")
|
||||
.set("rconServerBind", "*");
|
||||
#else
|
||||
rootSettings.defaultConfiguration = BaseDefaultConfiguration;
|
||||
#endif
|
||||
|
||||
rootSettings.defaultConfiguration = jsonMerge(
|
||||
BaseDefaultConfiguration,
|
||||
rootSettings.defaultConfiguration,
|
||||
m_defaults.additionalDefaultConfiguration,
|
||||
bootConfig.get("defaultConfiguration", {})
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user