seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #80293 from Faless/mp/fix_enet_flags_with_channels

Browse Source 
[ENet] Properly set transfer flags when using custom channels
This commit is contained in:
Rémi Verschelde
2023-08-07 14:53:34 +02:00
parent 40363a88bd b96d247ba2
commit e43ae7c039
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/enet/enet_multiplayer_peer.cpp
View File

@ -343,9 +343,6 @@ Error ENetMultiplayerPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size
int packet_flags = 0; int packet_flags = 0;
int channel = SYSCH_RELIABLE; int channel = SYSCH_RELIABLE;
int tr_channel = get_transfer_channel(); int tr_channel = get_transfer_channel();
if (tr_channel > 0) {
channel = SYSCH_MAX + tr_channel - 1;
} else {
switch (get_transfer_mode()) { switch (get_transfer_mode()) {
case TRANSFER_MODE_UNRELIABLE: { case TRANSFER_MODE_UNRELIABLE: {
packet_flags = ENET_PACKET_FLAG_UNSEQUENCED | ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT; packet_flags = ENET_PACKET_FLAG_UNSEQUENCED | ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT;
@ -360,6 +357,8 @@ Error ENetMultiplayerPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size
channel = SYSCH_RELIABLE; channel = SYSCH_RELIABLE;
} break; } break;
} }
if (tr_channel > 0) {
channel = SYSCH_MAX + tr_channel - 1;
} }
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED