diff options
| author | nokoe <nokoe@mailbox.org> | 2024-10-01 17:15:08 +0200 |
|---|---|---|
| committer | nokoe <nokoe@mailbox.org> | 2024-10-01 17:16:13 +0200 |
| commit | 15a6673898a4f1a9ce40096ec66e303749bb63fa (patch) | |
| tree | 4d64c61d803cc77fe9e4d5a2b5f49bb395e167d6 | |
| parent | 9761f01bbbf5f493a4d303924c296764549425a5 (diff) | |
| download | hurrycurry-15a6673898a4f1a9ce40096ec66e303749bb63fa.tar hurrycurry-15a6673898a4f1a9ce40096ec66e303749bb63fa.tar.bz2 hurrycurry-15a6673898a4f1a9ce40096ec66e303749bb63fa.tar.zst | |
use floats as player_id; resync now working
(this feels wrong)
| -rw-r--r-- | client/game.gd | 4 | ||||
| -rw-r--r-- | client/multiplayer.gd | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/client/game.gd b/client/game.gd index fe1e9ba6..caacbc8c 100644 --- a/client/game.gd +++ b/client/game.gd @@ -22,7 +22,7 @@ signal update_players(players: Dictionary) signal data_updated() signal in_lobby_updated(in_lobby: bool) signal join_state_updated(state: JoinState) -signal text_message(player: int, text: String, timeout_initial: float, timeout_remaining: float) +signal text_message(player, text: String, timeout_initial: float, timeout_remaining: float) signal update_tutorial_running(running: bool) enum SpectatingMode { @@ -36,7 +36,7 @@ enum JoinState { JOINED, } -var player_id: int = -1 +var player_id: float = -1 var item_names: Array = [] var item_index_by_name: Dictionary = {} var tile_names: Array = [] diff --git a/client/multiplayer.gd b/client/multiplayer.gd index d70dbaed..20c50efd 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -95,7 +95,7 @@ func send_join(player_name: String, character: int): "character": character }) -func send_movement(player: int, pos: Vector2, direction: Vector2, boost: bool): +func send_movement(player, pos: Vector2, direction: Vector2, boost: bool): send_packet({ "type": "movement", "player": player, @@ -104,7 +104,7 @@ func send_movement(player: int, pos: Vector2, direction: Vector2, boost: bool): "boost": boost }) -func send_tile_interact(player: int, pos: Vector2i, edge: bool): +func send_tile_interact(player, pos: Vector2i, edge: bool): @warning_ignore("incompatible_ternary") send_packet({ "type": "interact", @@ -112,10 +112,10 @@ func send_tile_interact(player: int, pos: Vector2i, edge: bool): "pos": [pos.x, pos.y] if edge else null, }) -func send_player_interact(_player: int, _edge: bool): +func send_player_interact(_player, _edge: bool): push_error("not yet implemented") -func send_chat(player: int, message: String): +func send_chat(player, message: String): send_packet({ "type": "communicate", "player": player, @@ -131,7 +131,7 @@ func send_replay_tick(dt: float): "dt": dt }) -func send_leave(player: int): +func send_leave(player): send_packet({ "type": "leave", "player": player, |