From cee3c00f97d4ee8621d516cc8f5678269376d692 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Tue, 11 Jun 2019 15:20:05 +0200
Subject: [PATCH] Added macros for the multiplayer.

---
 config.pyc          | Bin 433 -> 433 bytes
 entities/entity.h   |  27 +++++++++++++++++++++++++++
 entity_spell_system |   1 +
 3 files changed, 28 insertions(+)
 create mode 120000 entity_spell_system

diff --git a/config.pyc b/config.pyc
index abb9385a3880fe50daa1781657d28de9b7d097e1..69767a2ae39e729be133d5ebe72853155c52c79a 100644
GIT binary patch
delta 16
XcmdnUypfrm`7<w9Yuf*f?5h|7FA4?9

delta 16
YcmdnUypfrm`7<w9|Ab2$*;g?F0559=(EtDd

diff --git a/entities/entity.h b/entities/entity.h
index 172454b..60b1e1b 100644
--- a/entities/entity.h
+++ b/entities/entity.h
@@ -1,6 +1,8 @@
 #ifndef ENTITY_H
 #define ENTITY_H
 
+#include "core/io/networked_multiplayer_peer.h"
+
 #ifdef ENTITIES_2D
 #include "scene/2d/physics_body_2d.h"
 #else
@@ -70,6 +72,31 @@ enum PlayerSendFlags {
 	SEND_FLAG_AURAS,
 };
 
+#define SET_RPC_OFF(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_DISABLED);
+#define SET_RPC_REMOTE(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_REMOTE);
+#define SET_RPC_MASTER(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_MASTER);
+#define SET_RPC_PUPPET(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_PUPPET);
+#define SET_RPC_REMOTESYNC(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_REMOTESYNC);
+#define SET_RPC_MASTERSYNC(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_MASTERSYNC);
+#define SET_RPC_PUPPETSYNC(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_PUPPETSYNC);
+
+// f.e.   SEND_RPC(rpc("method", arg), method(arg))
+#define SEND_RPC(rpc_func, normal_func) \
+    if (is_inside_tree() && get_tree()->has_network_peer() && get_tree()->get_network_peer()->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_CONNECTED) { \
+        rpc_func;\
+    } else {\
+        normal_func;\
+    }
+
+// f.e. SEND_RSET(rset("property", "value"), property, value)
+#define SEND_RSET(rset_func, variable, value) \
+    if (is_inside_tree() && get_tree()->has_network_peer() && get_tree()->get_network_peer()->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_CONNECTED) { \
+        rset_func;\
+    } else {\
+        variable = value;\
+    }
+
+    
 #ifdef ENTITIES_2D
 class Entity : public KinematicBody2D {
 	GDCLASS(Entity, KinematicBody2D);
diff --git a/entity_spell_system b/entity_spell_system
new file mode 120000
index 0000000..942b6b7
--- /dev/null
+++ b/entity_spell_system
@@ -0,0 +1 @@
+../../modules/entity_spell_system
\ No newline at end of file