diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 10:48:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 10:48:38 +0100 |
| commit | f505aae1d820f0d083ca0fdaa6fa2da7a3988db1 (patch) | |
| tree | 17b12b2f0461bb9134c25abf59b5a6af1a584f16 /core/io/multiplayer_api.cpp | |
| parent | f3f05dc89eca0284238db12a3d719ba991e3066f (diff) | |
| parent | 8d00a3a536a1fbfaf6e1b54fe9c77c8287ff5cb3 (diff) | |
Merge pull request #36144 from akien-mga/remove-deprecated-allow-decoding
Remove deprecated PacketPeer allow_object_decoding
Diffstat (limited to 'core/io/multiplayer_api.cpp')
| -rw-r--r-- | core/io/multiplayer_api.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/multiplayer_api.cpp b/core/io/multiplayer_api.cpp index f3ced093a6..3f66e00021 100644 --- a/core/io/multiplayer_api.cpp +++ b/core/io/multiplayer_api.cpp @@ -625,7 +625,7 @@ Error MultiplayerAPI::_encode_and_compress_variant(const Variant &p_variant, uin } break; default: // Any other case is not yet compressed. - Error err = encode_variant(p_variant, r_buffer, r_len, allow_object_decoding || network_peer->is_object_decoding_allowed()); + Error err = encode_variant(p_variant, r_buffer, r_len, allow_object_decoding); if (err != OK) return err; if (r_buffer) { @@ -691,7 +691,7 @@ Error MultiplayerAPI::_decode_and_decompress_variant(Variant &r_variant, const u } } break; default: - Error err = decode_variant(r_variant, p_buffer, p_len, r_len, allow_object_decoding || network_peer->is_object_decoding_allowed()); + Error err = decode_variant(r_variant, p_buffer, p_len, r_len, allow_object_decoding); if (err != OK) return err; } |