[Net] Implement RPC channels in MultiplayerAPI.

2 files changed, 33 insertions, 18 deletions

diff --git a/modules/enet/enet_multiplayer_peer.cpp b/modules/enet/enet_multiplayer_peer.cpp
index 28b6bb035a..aa0e09bcde 100644
--- a/modules/enet/enet_multiplayer_peer.cpp
+++ b/modules/enet/enet_multiplayer_peer.cpp
@@ -33,6 +33,14 @@
 #include "core/io/marshalls.h"
 #include "core/os/os.h"
 
+void ENetMultiplayerPeer::set_transfer_channel(int p_channel) {
+	transfer_channel = p_channel;
+}
+
+int ENetMultiplayerPeer::get_transfer_channel() const {
+	return transfer_channel;
+}
+
 void ENetMultiplayerPeer::set_transfer_mode(TransferMode p_mode) {
 	transfer_mode = p_mode;
 }
@@ -441,20 +449,23 @@ Error ENetMultiplayerPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size
 
 	int packet_flags = 0;
 	int channel = SYSCH_RELIABLE;
-
-	switch (transfer_mode) {
-		case TRANSFER_MODE_UNRELIABLE: {
-			packet_flags = ENET_PACKET_FLAG_UNSEQUENCED;
-			channel = SYSCH_UNRELIABLE;
-		} break;
-		case TRANSFER_MODE_UNRELIABLE_ORDERED: {
-			packet_flags = 0;
-			channel = SYSCH_UNRELIABLE;
-		} break;
-		case TRANSFER_MODE_RELIABLE: {
-			packet_flags = ENET_PACKET_FLAG_RELIABLE;
-			channel = SYSCH_RELIABLE;
-		} break;
+	if (transfer_channel > 0) {
+		channel = SYSCH_MAX + transfer_channel - 1;
+	} else {
+		switch (transfer_mode) {
+			case TRANSFER_MODE_UNRELIABLE: {
+				packet_flags = ENET_PACKET_FLAG_UNSEQUENCED;
+				channel = SYSCH_UNRELIABLE;
+			} break;
+			case TRANSFER_MODE_UNRELIABLE_ORDERED: {
+				packet_flags = 0;
+				channel = SYSCH_UNRELIABLE;
+			} break;
+			case TRANSFER_MODE_RELIABLE: {
+				packet_flags = ENET_PACKET_FLAG_RELIABLE;
+				channel = SYSCH_RELIABLE;
+			} break;
+		}
 	}
 
 	ENetPacket *packet = enet_packet_create(nullptr, p_buffer_size + 8, packet_flags);
diff --git a/modules/enet/enet_multiplayer_peer.h b/modules/enet/enet_multiplayer_peer.h
index 703396d0cb..78e280db7c 100644
--- a/modules/enet/enet_multiplayer_peer.h
+++ b/modules/enet/enet_multiplayer_peer.h
@@ -47,10 +47,10 @@ private:
 	};
 
 	enum {
-		SYSCH_CONFIG,
-		SYSCH_RELIABLE,
-		SYSCH_UNRELIABLE,
-		SYSCH_MAX
+		SYSCH_CONFIG = 0,
+		SYSCH_RELIABLE = 1,
+		SYSCH_UNRELIABLE = 2,
+		SYSCH_MAX = 3
 	};
 
 	enum Mode {
@@ -65,6 +65,7 @@ private:
 	uint32_t unique_id = 0;
 
 	int target_peer = 0;
+	int transfer_channel = 0;
 	TransferMode transfer_mode = TRANSFER_MODE_RELIABLE;
 
 	bool refuse_connections = false;
@@ -100,6 +101,9 @@ protected:
 	static void _bind_methods();
 
 public:
+	virtual void set_transfer_channel(int p_channel) override;
+	virtual int get_transfer_channel() const override;
+
 	virtual void set_transfer_mode(TransferMode p_mode) override;
 	virtual TransferMode get_transfer_mode() const override;
 	virtual void set_target_peer(int p_peer) override;