diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-04 16:47:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-04 16:47:44 +0100 |
| commit | c850e620cc6e4f8dd2410c4b885cccc4f3161214 (patch) | |
| tree | 9d7e492bde24edf74bf62e3255147a7e9c3b2a5e | |
| parent | d7d4bcbf4728fe2a34b59b06054fa903f9920017 (diff) | |
| parent | 29908d32bafc9b198deda633157e37063614efa5 (diff) | |
Merge pull request #7923 from WalasPrime/fix_7922_peer_present
Added a SceneTree.is_network_peer_present, closes #7922
| -rw-r--r-- | doc/base/classes.xml | 7 | ||||
| -rw-r--r-- | scene/main/scene_main_loop.cpp | 5 | ||||
| -rw-r--r-- | scene/main/scene_main_loop.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 4e4fb3cd23..17f45c64a2 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -35451,6 +35451,13 @@ Returns true if this SceneTree's [NetworkedMultiplayerPeer] is in server mode (listening for connections). </description> </method> + <method name="has_network_peer" qualifiers="const"> + <return type="bool"> + </return> + <description> + Returns true if there is a [NetworkedMultiplayerPeer] set (with [method SceneTree.set_network_peer]). + </description> + </method> <method name="is_paused" qualifiers="const"> <return type="bool"> </return> diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index 418eb92ee2..093359ab16 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -1803,6 +1803,10 @@ bool SceneTree::is_network_server() const { } +bool SceneTree::has_network_peer() const { + return network_peer.is_valid(); +} + int SceneTree::get_network_unique_id() const { ERR_FAIL_COND_V(!network_peer.is_valid(),0); @@ -2310,6 +2314,7 @@ void SceneTree::_bind_methods() { ClassDB::bind_method(D_METHOD("set_network_peer","peer:NetworkedMultiplayerPeer"),&SceneTree::set_network_peer); ClassDB::bind_method(D_METHOD("is_network_server"),&SceneTree::is_network_server); + ClassDB::bind_method(D_METHOD("has_network_peer"),&SceneTree::has_network_peer); ClassDB::bind_method(D_METHOD("get_network_unique_id"),&SceneTree::get_network_unique_id); ClassDB::bind_method(D_METHOD("set_refuse_new_network_connections","refuse"),&SceneTree::set_refuse_new_network_connections); ClassDB::bind_method(D_METHOD("is_refusing_new_network_connections"),&SceneTree::is_refusing_new_network_connections); diff --git a/scene/main/scene_main_loop.h b/scene/main/scene_main_loop.h index fec8534b40..7f69f5eef7 100644 --- a/scene/main/scene_main_loop.h +++ b/scene/main/scene_main_loop.h @@ -447,6 +447,7 @@ public: void set_network_peer(const Ref<NetworkedMultiplayerPeer>& p_network_peer); bool is_network_server() const; + bool has_network_peer() const; int get_network_unique_id() const; void set_refuse_new_network_connections(bool p_refuse); |