aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornokoe <nokoe@mailbox.org>2024-06-27 13:35:46 +0200
committernokoe <nokoe@mailbox.org>2024-06-27 13:35:46 +0200
commitb0ec90392eac2c99b54e57e88e6b6cc8ecef890c (patch)
tree0c4d3f7140bcf61279010f0799626b575e610734
parent5f852f36b9137ac0429c6f936e36fe3c229addb9 (diff)
downloadhurrycurry-b0ec90392eac2c99b54e57e88e6b6cc8ecef890c.tar
hurrycurry-b0ec90392eac2c99b54e57e88e6b6cc8ecef890c.tar.bz2
hurrycurry-b0ec90392eac2c99b54e57e88e6b6cc8ecef890c.tar.zst
server path setting
-rw-r--r--client/player/controllable_player.gd2
-rw-r--r--client/server.gd5
2 files changed, 4 insertions, 3 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd
index 9e00e849..68684217 100644
--- a/client/player/controllable_player.gd
+++ b/client/player/controllable_player.gd
@@ -43,7 +43,7 @@ func _ready():
super()
bubble.submit_message.connect(submit_message)
-func _input(event):
+func _input(_event):
if Input.is_action_just_pressed("chat"):
if chat_open:
bubble.stop_edit()
diff --git a/client/server.gd b/client/server.gd
index 8eaaaecb..b0ab5188 100644
--- a/client/server.gd
+++ b/client/server.gd
@@ -67,6 +67,7 @@ func _server_exec():
args.push_back("--data-dir")
args.push_back(data_path)
thread_result = OS.create_process(get_server_path(), args, false)
+ print(get_server_path(), args)
if thread_result >= 0:
var ok = false
while not ok:
@@ -84,14 +85,14 @@ func _server_exec():
func get_server_path() -> String:
var path: String = Global.settings["server_binary"]["value"]
- if FileAccess.file_exists(path):
+ if path != "":
return path
else:
return "undercooked-server"
func get_server_data():
var path: String = Global.settings["server_data"]["value"]
- if FileAccess.file_exists(path):
+ if path != "":
return path
else:
return null