diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2021-07-17 10:55:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 10:55:11 +0200 |
| commit | 76b003082141317e6f511487a5c5137226af1f27 (patch) | |
| tree | fe661d78f009815c7ad7400841ca26f6058272a3 /modules/websocket/websocket_server.cpp | |
| parent | b079715563ac0248637c29e58ba11f2e8c2554be (diff) | |
| parent | 1475f617a30a2307db0973502a0599b872d4de0e (diff) | |
Merge pull request #39610 from Meriipu/master_resourcename
WebSocketServer: Expose the resource name the client used
Diffstat (limited to 'modules/websocket/websocket_server.cpp')
| -rw-r--r-- | modules/websocket/websocket_server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/websocket/websocket_server.cpp b/modules/websocket/websocket_server.cpp index b996852f28..79ca9e4667 100644 --- a/modules/websocket/websocket_server.cpp +++ b/modules/websocket/websocket_server.cpp @@ -71,7 +71,7 @@ void WebSocketServer::_bind_methods() { ADD_SIGNAL(MethodInfo("client_close_request", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::INT, "code"), PropertyInfo(Variant::STRING, "reason"))); ADD_SIGNAL(MethodInfo("client_disconnected", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::BOOL, "was_clean_close"))); - ADD_SIGNAL(MethodInfo("client_connected", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::STRING, "protocol"))); + ADD_SIGNAL(MethodInfo("client_connected", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::STRING, "protocol"), PropertyInfo(Variant::STRING, "resource_name"))); ADD_SIGNAL(MethodInfo("data_received", PropertyInfo(Variant::INT, "id"))); } @@ -141,13 +141,13 @@ void WebSocketServer::_on_peer_packet(int32_t p_peer_id) { } } -void WebSocketServer::_on_connect(int32_t p_peer_id, String p_protocol) { +void WebSocketServer::_on_connect(int32_t p_peer_id, String p_protocol, String p_resource_name) { if (_is_multiplayer) { // Send add to clients _send_add(p_peer_id); emit_signal("peer_connected", p_peer_id); } else { - emit_signal("client_connected", p_peer_id, p_protocol); + emit_signal("client_connected", p_peer_id, p_protocol, p_resource_name); } } |