diff options
| -rw-r--r-- | scripts/gitlab-ci/windows/sbinit.config | 8 | ||||
| -rw-r--r-- | scripts/windows/sbinit.config | 6 | ||||
| -rw-r--r-- | source/game/StarRootLoader.cpp | 11 |
3 files changed, 12 insertions, 13 deletions
diff --git a/scripts/gitlab-ci/windows/sbinit.config b/scripts/gitlab-ci/windows/sbinit.config index b200df4..73ccc4b 100644 --- a/scripts/gitlab-ci/windows/sbinit.config +++ b/scripts/gitlab-ci/windows/sbinit.config @@ -4,11 +4,5 @@ "..\\mods\\" ], - "storageDirectory" : "..\\storage\\", - - "defaultConfiguration" : { - "gameServerBind" : "*", - "queryServerBind" : "*", - "rconServerBind" : "*" - } + "storageDirectory" : "..\\storage\\" } diff --git a/scripts/windows/sbinit.config b/scripts/windows/sbinit.config index 03c55d6..c83e981 100644 --- a/scripts/windows/sbinit.config +++ b/scripts/windows/sbinit.config @@ -15,10 +15,6 @@ "defaultConfiguration" : { "allowAdminCommandsFromAnyone" : true, - "anonymousConnectionsAreAdmin" : true, - - "gameServerBind" : "*", - "queryServerBind" : "*", - "rconServerBind" : "*" + "anonymousConnectionsAreAdmin" : true } } diff --git a/source/game/StarRootLoader.cpp b/source/game/StarRootLoader.cpp index 5c90eb7..9ede365 100644 --- a/source/game/StarRootLoader.cpp +++ b/source/game/StarRootLoader.cpp @@ -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", {}) ); |