diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-07-29 12:40:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 12:40:04 +0200 |
commit | 1c68be9c8f8d045de0fae9c3fb8187cfa1fcccc0 (patch) | |
tree | e5162bc5bbccddba732f6880b192b3c367bffe20 /modules/websocket/websocket_multiplayer_peer.cpp | |
parent | 4cfa9bc0f1ef1d584705f36d70ee7f4d37a02b8c (diff) | |
parent | f39547b9bdb6a09917845e7bf8ee04d64f96c582 (diff) |
Merge pull request #50710 from Faless/enet/4.x_refactor
Diffstat (limited to 'modules/websocket/websocket_multiplayer_peer.cpp')
-rw-r--r-- | modules/websocket/websocket_multiplayer_peer.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/modules/websocket/websocket_multiplayer_peer.cpp b/modules/websocket/websocket_multiplayer_peer.cpp index 589bb8931a..52d9a602a1 100644 --- a/modules/websocket/websocket_multiplayer_peer.cpp +++ b/modules/websocket/websocket_multiplayer_peer.cpp @@ -39,26 +39,6 @@ WebSocketMultiplayerPeer::~WebSocketMultiplayerPeer() { _clear(); } -int WebSocketMultiplayerPeer::_gen_unique_id() const { - uint32_t hash = 0; - - while (hash == 0 || hash == 1) { - hash = hash_djb2_one_32( - (uint32_t)OS::get_singleton()->get_ticks_usec()); - hash = hash_djb2_one_32( - (uint32_t)OS::get_singleton()->get_unix_time(), hash); - hash = hash_djb2_one_32( - (uint32_t)OS::get_singleton()->get_data_path().hash64(), hash); - hash = hash_djb2_one_32( - (uint32_t)((uint64_t)this), hash); //rely on aslr heap - hash = hash_djb2_one_32( - (uint32_t)((uint64_t)&hash), hash); //rely on aslr stack - hash = hash & 0x7FFFFFFF; // make it compatible with unsigned, since negative id is used for exclusion - } - - return hash; -} - void WebSocketMultiplayerPeer::_clear() { _peer_map.clear(); if (_current_packet.data != nullptr) { |