diff options
Diffstat (limited to 'client/server.gd')
| -rw-r--r-- | client/server.gd | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/client/server.gd b/client/server.gd index b236fa2a..4378c02d 100644 --- a/client/server.gd +++ b/client/server.gd @@ -62,11 +62,7 @@ func _test_server(): sem.post() func _server_exec(): - var args = [] - var data_path = get_server_data() - if data_path != null: - args.push_back("--data-dir") - args.push_back(data_path) + var args = prepare_args() thread_result = OS.create_process(get_server_path(), args, false) if thread_result >= 0: var ok = false @@ -83,18 +79,29 @@ func _server_exec(): break sem.post() +func prepare_args(): + var args = [] + if Global.get_setting("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("--server-name") + args.push_back(Global.get_setting("server.name")) + if Global.get_setting("server.mdns"): + args.push_back("--mdns") + if Global.get_setting("server.upnp"): + args.push_back("--upnp") + if Global.get_setting("server.register"): + args.push_back("--register") + return args + func get_server_path() -> String: - var path: String = Global.get_setting("other.server_binary") + var path: String = Global.get_setting("server.binary_path") if path != "": return path else: return "hurrycurry-server" -func get_server_data(): - var path: String = Global.get_setting("other.server_data") - if path != "": return path - else: return null - func _process(_delta): match state: State.TESTING: |