diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-29 11:49:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 11:49:37 +0200 |
| commit | 37146897673f66f51736bd7022a6682285d87f47 (patch) | |
| tree | 76f810cefb7542fc4e3040d52810899a5e4ea40c /modules/gdscript/gdscript_function.h | |
| parent | d0b62ce1558766134ea2fc6bcf912e837d0ae40b (diff) | |
| parent | 4c69a495c948b1698a1634b506bf660bd49cdd76 (diff) | |
| download | redot-engine-37146897673f66f51736bd7022a6682285d87f47.tar.gz | |
Merge pull request #19243 from godotengine/revert-19021-rpc_sync_fix
Revert "RPCMode refactor, more sync modes"
Diffstat (limited to 'modules/gdscript/gdscript_function.h')
| -rw-r--r-- | modules/gdscript/gdscript_function.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index 836325f0fe..ea009dcd96 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(); }; |