From bf9aae09ba5eccde7ec355dac96b6a2088fb1a3f Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Fri, 3 Sep 2021 19:40:47 +0200
Subject: [Net] Move multiplayer to core subdir, split RPCManager.

Move multiplayer classes to "core/multiplayer" subdir.

Move the RPCConfig and enums (TransferMode, RPCMode) to a separate
file (multiplayer.h), and bind them to the global namespace.

Move the RPC handling code to its own class (RPCManager).

Renames "get_rpc_sender_id" to "get_remote_sender_id".
---
 modules/gdnative/nativescript/godot_nativescript.cpp | 4 ++--
 modules/gdnative/nativescript/nativescript.cpp       | 6 +++---
 modules/gdnative/nativescript/nativescript.h         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/gdnative/nativescript')

diff --git a/modules/gdnative/nativescript/godot_nativescript.cpp b/modules/gdnative/nativescript/godot_nativescript.cpp
index 70b14836bf..dadd1a9d10 100644
--- a/modules/gdnative/nativescript/godot_nativescript.cpp
+++ b/modules/gdnative/nativescript/godot_nativescript.cpp
@@ -127,9 +127,9 @@ void GDAPI godot_nativescript_register_method(void *p_gdnative_handle, const cha
 	E->get().methods.insert(p_function_name, method);
 
 	if (p_attr.rpc_type != GODOT_METHOD_RPC_MODE_DISABLED) {
-		MultiplayerAPI::RPCConfig nd;
+		Multiplayer::RPCConfig nd;
 		nd.name = String(p_name);
-		nd.rpc_mode = MultiplayerAPI::RPCMode(p_attr.rpc_type);
+		nd.rpc_mode = Multiplayer::RPCMode(p_attr.rpc_type);
 		E->get().rpc_methods.push_back(nd);
 	}
 }
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp
index 26d3aed702..92ba9bd452 100644
--- a/modules/gdnative/nativescript/nativescript.cpp
+++ b/modules/gdnative/nativescript/nativescript.cpp
@@ -431,9 +431,9 @@ void NativeScript::get_script_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
-const Vector<MultiplayerAPI::RPCConfig> NativeScript::get_rpc_methods() const {
+const Vector<Multiplayer::RPCConfig> NativeScript::get_rpc_methods() const {
 	NativeScriptDesc *script_data = get_script_desc();
-	ERR_FAIL_COND_V(!script_data, Vector<MultiplayerAPI::RPCConfig>());
+	ERR_FAIL_COND_V(!script_data, Vector<Multiplayer::RPCConfig>());
 
 	return script_data->rpc_methods;
 }
@@ -828,7 +828,7 @@ Ref<Script> NativeScriptInstance::get_script() const {
 	return script;
 }
 
-const Vector<MultiplayerAPI::RPCConfig> NativeScriptInstance::get_rpc_methods() const {
+const Vector<Multiplayer::RPCConfig> NativeScriptInstance::get_rpc_methods() const {
 	return script->get_rpc_methods();
 }
 
diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h
index 777a878660..a7647e8c59 100644
--- a/modules/gdnative/nativescript/nativescript.h
+++ b/modules/gdnative/nativescript/nativescript.h
@@ -71,7 +71,7 @@ struct NativeScriptDesc {
 	};
 
 	Map<StringName, Method> methods;
-	Vector<MultiplayerAPI::RPCConfig> rpc_methods;
+	Vector<Multiplayer::RPCConfig> rpc_methods;
 	OrderedHashMap<StringName, Property> properties;
 	Map<StringName, Signal> signals_; // QtCreator doesn't like the name signals
 	StringName base;
@@ -175,7 +175,7 @@ public:
 	virtual void get_script_method_list(List<MethodInfo> *p_list) const override;
 	virtual void get_script_property_list(List<PropertyInfo> *p_list) const override;
 
-	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const override;
+	virtual const Vector<Multiplayer::RPCConfig> get_rpc_methods() const override;
 
 	String get_class_documentation() const;
 	String get_method_documentation(const StringName &p_method) const;
@@ -213,7 +213,7 @@ public:
 	String to_string(bool *r_valid);
 	virtual Ref<Script> get_script() const;
 
-	virtual const Vector<MultiplayerAPI::RPCConfig> get_rpc_methods() const;
+	virtual const Vector<Multiplayer::RPCConfig> get_rpc_methods() const;
 
 	virtual ScriptLanguage *get_language();
 
-- 
cgit v1.2.3