From 4c69a495c948b1698a1634b506bf660bd49cdd76 Mon Sep 17 00:00:00 2001 From: Max Hilbrunner Date: Tue, 29 May 2018 11:47:52 +0200 Subject: Revert "RPCMode refactor, more sync modes" --- modules/gdscript/gdscript_function.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'modules/gdscript/gdscript_function.h') diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index 836325f0f..ea009dcd9 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -96,6 +96,14 @@ public: ADDR_TYPE_NIL = 9 }; + enum RPCMode { + RPC_DISABLED, + RPC_ENABLED, + RPC_SYNC, + RPC_SYNC_MASTER, + RPC_SYNC_SLAVE + }; + struct StackDebug { int line; @@ -127,7 +135,7 @@ private: int _call_size; int _initial_line; bool _static; - MultiplayerAPI::RPCMode rpc_mode; + ScriptInstance::RPCMode rpc_mode; GDScript *_script; @@ -222,7 +230,7 @@ public: Variant call(GDScriptInstance *p_instance, const Variant **p_args, int p_argcount, Variant::CallError &r_err, CallState *p_state = NULL); - _FORCE_INLINE_ MultiplayerAPI::RPCMode get_rpc_mode() const { return rpc_mode; } + _FORCE_INLINE_ ScriptInstance::RPCMode get_rpc_mode() const { return rpc_mode; } GDScriptFunction(); ~GDScriptFunction(); }; -- cgit v1.2.3-70-g09d2