From cbf16c9968dbed6fd2fa9404fad5d8e8cd6d4ae0 Mon Sep 17 00:00:00 2001 From: unfa Date: Sat, 4 Sep 2021 23:58:47 +0200 Subject: [PATCH] Fixed networking signals and weapon.gd rpc settings --- Game/Assets/Weapons/Weapon.gd | 4 ++-- Game/Main.gd | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Game/Assets/Weapons/Weapon.gd b/Game/Assets/Weapons/Weapon.gd index 6d23bc3..bcbc76a 100644 --- a/Game/Assets/Weapons/Weapon.gd +++ b/Game/Assets/Weapons/Weapon.gd @@ -17,7 +17,7 @@ var impact_player = preload("res://Assets/Effects/ImpactPlayer.tscn") #enum Trigger {TRIGGER_PRIMARY, TRIGGER_SECONDARY} -@rpc func shoot(): +@rpc(sync) func shoot(): #print("SHOOT from PID ", get_tree().multiplayer.get_network_unique_id(), " controlled by ", player.get_network_authority()) var space_state = get_world_3d().direct_space_state @@ -54,7 +54,7 @@ var impact_player = preload("res://Assets/Effects/ImpactPlayer.tscn") #print(ray) -@rpc func trigger(index: int, active: bool) -> void: +@rpc(sync, auth) func trigger(index: int, active: bool) -> void: #print("Weapon " + str(name) + ", Trigger " + str(index) + ", active: " + str(active)) if index == 0 and active and $Handgun/AnimationPlayer.is_playing() == false: diff --git a/Game/Main.gd b/Game/Main.gd index d54fe0d..47073f4 100644 --- a/Game/Main.gd +++ b/Game/Main.gd @@ -303,11 +303,11 @@ func _ready() -> void: #peer.compression_mode = NetworkedMultiplayerENet.COMPRESS_ZSTD print("Commandline arguments: ", OS.get_cmdline_args()) - get_tree().connect("network_peer_connected", self._player_connected) - get_tree().connect("network_peer_disconnected", self._player_disconnected) - get_tree().connect("connected_to_server", self._connected_ok) - get_tree().connect("connection_failed", self._connected_fail) - get_tree().connect("server_disconnected", self._server_disconnected) + get_tree().multiplayer.connect("network_peer_connected", self._player_connected) + get_tree().multiplayer.connect("network_peer_disconnected", self._player_disconnected) + get_tree().multiplayer.connect("connected_to_server", self._connected_ok) + get_tree().multiplayer.connect("connection_failed", self._connected_fail) + get_tree().multiplayer.connect("server_disconnected", self._server_disconnected) if OS.get_cmdline_args().has("dedicated_server"): start_dedicated_server()