Skip to content

Commit b9685cb

Browse files
authored
Merge pull request #645 from Calinou/use-remotesync-keyword
Use `remotesync` instead of the deprecated `sync` in networking demos
2 parents 11a7241 + d1f25ca commit b9685cb

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

networking/multiplayer_bomber/player.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ puppet var puppet_motion = Vector2()
88
export var stunned = false
99

1010
# Use sync because it will be called everywhere
11-
sync func setup_bomb(bomb_name, pos, by_who):
11+
remotesync func setup_bomb(bomb_name, pos, by_who):
1212
var bomb = preload("res://bomb.tscn").instance()
1313
bomb.set_name(bomb_name) # Ensure unique name for the bomb
1414
bomb.position = pos

networking/multiplayer_bomber/score.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func _process(_delta):
1616
$"../Winner".show()
1717

1818

19-
sync func increase_score(for_who):
19+
remotesync func increase_score(for_who):
2020
assert(for_who in player_labels)
2121
var pl = player_labels[for_who]
2222
pl.score += 1

networking/multiplayer_pong/logic/ball.gd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func _process(delta):
4141
rpc("_reset_ball", true)
4242

4343

44-
sync func bounce(left, random):
44+
remotesync func bounce(left, random):
4545
# Using sync because both players can make it bounce.
4646
if left:
4747
direction.x = abs(direction.x)
@@ -53,11 +53,11 @@ sync func bounce(left, random):
5353
direction = direction.normalized()
5454

5555

56-
sync func stop():
56+
remotesync func stop():
5757
stopped = true
5858

5959

60-
sync func _reset_ball(for_left):
60+
remotesync func _reset_ball(for_left):
6161
position = _screen_size / 2
6262
if for_left:
6363
direction = Vector2.LEFT

networking/multiplayer_pong/logic/pong.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func _ready():
2727
print("Unique id: ", get_tree().get_network_unique_id())
2828

2929

30-
sync func update_score(add_to_left):
30+
remotesync func update_score(add_to_left):
3131
if add_to_left:
3232
score_left += 1
3333
score_left_node.set_text(str(score_left))

networking/websocket_multiplayer/script/game.gd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ master func set_player_name(name):
1313
rpc("update_player_name", sender, name)
1414

1515

16-
sync func update_player_name(player, name):
16+
remotesync func update_player_name(player, name):
1717
var pos = _players.find(player)
1818
if pos != -1:
1919
_list.set_item_text(pos, name)
@@ -28,13 +28,13 @@ master func request_action(action):
2828
next_turn()
2929

3030

31-
sync func do_action(action):
31+
remotesync func do_action(action):
3232
var name = _list.get_item_text(_turn)
3333
var val = randi() % 100
3434
rpc("_log", "%s: %ss %d" % [name, action, val])
3535

3636

37-
sync func set_turn(turn):
37+
remotesync func set_turn(turn):
3838
_turn = turn
3939
if turn >= _players.size():
4040
return
@@ -46,7 +46,7 @@ sync func set_turn(turn):
4646
_action.disabled = _players[turn] != get_tree().get_network_unique_id()
4747

4848

49-
sync func del_player(id):
49+
remotesync func del_player(id):
5050
var pos = _players.find(id)
5151
if pos == -1:
5252
return
@@ -58,7 +58,7 @@ sync func del_player(id):
5858
rpc("set_turn", _turn)
5959

6060

61-
sync func add_player(id, name=""):
61+
remotesync func add_player(id, name=""):
6262
_players.append(id)
6363
if name == "":
6464
_list.add_item("... connecting ...", null, false)
@@ -106,7 +106,7 @@ func on_peer_del(id):
106106
rpc("del_player", id)
107107

108108

109-
sync func _log(what):
109+
remotesync func _log(what):
110110
$HBoxContainer/RichTextLabel.add_text(what + "\n")
111111

112112

0 commit comments

Comments
 (0)