diff options
Diffstat (limited to 'client/service')
| -rw-r--r-- | client/service/discover.gd | 2 | ||||
| -rw-r--r-- | client/service/editor.gd | 2 | ||||
| -rw-r--r-- | client/service/server.gd | 28 |
3 files changed, 16 insertions, 16 deletions
diff --git a/client/service/discover.gd b/client/service/discover.gd index 9aba0ce6..8ebd52da 100644 --- a/client/service/discover.gd +++ b/client/service/discover.gd @@ -23,7 +23,7 @@ func arguments(): return [] func exe_path() -> String: - var path: String = Global.get_setting("online.discover_binary") + var path: String = Settings.read("online.discover_binary") if path != "": return path else: return "hurrycurry-discover" diff --git a/client/service/editor.gd b/client/service/editor.gd index 262f6fca..2197a5e1 100644 --- a/client/service/editor.gd +++ b/client/service/editor.gd @@ -23,7 +23,7 @@ func arguments(): return [] func exe_path() -> String: - var path: String = Global.get_setting("server.editor_binary_path") + var path: String = Settings.read("server.editor_binary_path") if path != "": return path else: return "hurrycurry-editor" diff --git a/client/service/server.gd b/client/service/server.gd index ad9d5c68..9a314aca 100644 --- a/client/service/server.gd +++ b/client/service/server.gd @@ -21,37 +21,37 @@ func name(): func arguments(): var args = [] - if Global.get_setting("server.data_path") != "": + if Settings.read("server.data_path") != "": args.push_back("--data-dir") - args.push_back(Global.get_setting("server.data_path")) - if Global.get_setting("server.name") != "": + args.push_back(Settings.read("server.data_path")) + if Settings.read("server.name") != "": args.push_back("--server-name") - args.push_back(Global.get_setting("server.name")) - if Global.get_setting("server.mdns"): + args.push_back(Settings.read("server.name")) + if Settings.read("server.mdns"): args.push_back("--mdns") - if Global.get_setting("server.upnp"): + if Settings.read("server.upnp"): args.push_back("--upnp") - if Global.get_setting("server.register"): + if Settings.read("server.register"): args.push_back("--register") args.push_back("--listen") - args.push_back("%s:%d" % [bind_address(), Global.get_setting("server.bind_port")]) + args.push_back("%s:%d" % [bind_address(), Settings.read("server.bind_port")]) return args func exe_path() -> String: - var path: String = Global.get_setting("server.binary_path") + var path: String = Settings.read("server.binary_path") if path != "": return path else: return "hurrycurry-server" func test_port(): - return Global.get_setting("server.bind_port") + return Settings.read("server.bind_port") func test_host(): - return "::1" if Global.get_setting("server.enable_ipv6") else "127.0.0.1" + return "::1" if Settings.read("server.enable_ipv6") else "127.0.0.1" static func bind_address() -> String: - if Global.get_setting("server.allow_external_connections"): - return "[::]" if Global.get_setting("server.enable_ipv6") else "0.0.0.0" + if Settings.read("server.allow_external_connections"): + return "[::]" if Settings.read("server.enable_ipv6") else "0.0.0.0" else: return connect_address() static func connect_address() -> String: - return "[::1]" if Global.get_setting("server.enable_ipv6") else "127.0.0.1" + return "[::1]" if Settings.read("server.enable_ipv6") else "127.0.0.1" |