From c21aae65b6bd85cecfa0efa484016787fc82f799 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 14 Aug 2016 13:29:25 -0300 Subject: -Added an ENet implementation for NetworkedMultiplayerPeer for "a bit higher level" networking. --- core/io/networked_multiplayer_peer.cpp | 6 ++---- core/io/networked_multiplayer_peer.h | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'core') diff --git a/core/io/networked_multiplayer_peer.cpp b/core/io/networked_multiplayer_peer.cpp index 79f3e129e1..f172fef570 100644 --- a/core/io/networked_multiplayer_peer.cpp +++ b/core/io/networked_multiplayer_peer.cpp @@ -13,14 +13,12 @@ void NetworkedMultiplayerPeer::_bind_methods() { ObjectTypeDB::bind_method(_MD("poll"), &NetworkedMultiplayerPeer::poll ); - BIND_CONSTANT( TARGET_ALL_PEERS ); - BIND_CONSTANT( TRANSFER_MODE_UNRELIABLE ); BIND_CONSTANT( TRANSFER_MODE_RELIABLE ); BIND_CONSTANT( TRANSFER_MODE_ORDERED ); - ADD_SIGNAL( MethodInfo("peer_connected",PropertyInfo(Variant::INT,"id"))); - ADD_SIGNAL( MethodInfo("peer_disconnected",PropertyInfo(Variant::INT,"id"))); + ADD_SIGNAL( MethodInfo("peer_connected",PropertyInfo(Variant::STRING,"id"))); + ADD_SIGNAL( MethodInfo("peer_disconnected",PropertyInfo(Variant::STRING,"id"))); } NetworkedMultiplayerPeer::NetworkedMultiplayerPeer() { diff --git a/core/io/networked_multiplayer_peer.h b/core/io/networked_multiplayer_peer.h index f140b57b8b..535f20f199 100644 --- a/core/io/networked_multiplayer_peer.h +++ b/core/io/networked_multiplayer_peer.h @@ -11,22 +11,19 @@ protected: static void _bind_methods(); public: - enum { - TARGET_ALL_PEERS=0xFFFFFF // send to this for all peers - }; - enum TransferMode { TRANSFER_MODE_UNRELIABLE, TRANSFER_MODE_RELIABLE, TRANSFER_MODE_ORDERED }; + virtual void set_transfer_mode(TransferMode p_mode)=0; - virtual void set_target_peer(int p_peer)=0; + virtual void set_target_peer(const StringName& p_peer_id)=0; virtual void set_channel(int p_channel)=0; - virtual int get_packet_peer() const=0; + virtual StringName get_packet_peer() const=0; virtual int get_packet_channel() const=0; -- cgit v1.2.3