diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-29 09:44:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 09:44:03 +0200 |
| commit | d0b62ce1558766134ea2fc6bcf912e837d0ae40b (patch) | |
| tree | a0ce8cb1d18ff5000d30bc854102cd7681ff474d /modules/gdscript/gdscript_function.h | |
| parent | e2bf28e80599d5bbe362410f2261a1abf495afa5 (diff) | |
| parent | a5e8a3be5e0ed2e7c6b1a9cc5803d96391b180f3 (diff) | |
| download | redot-engine-d0b62ce1558766134ea2fc6bcf912e837d0ae40b.tar.gz | |
Merge pull request #19021 from Faless/rpc_sync_fix
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, 2 insertions, 10 deletions
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index ea009dcd96..836325f0fe 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -96,14 +96,6 @@ public: ADDR_TYPE_NIL = 9 }; - enum RPCMode { - RPC_DISABLED, - RPC_ENABLED, - RPC_SYNC, - RPC_SYNC_MASTER, - RPC_SYNC_SLAVE - }; - struct StackDebug { int line; @@ -135,7 +127,7 @@ private: int _call_size; int _initial_line; bool _static; - ScriptInstance::RPCMode rpc_mode; + MultiplayerAPI::RPCMode rpc_mode; GDScript *_script; @@ -230,7 +222,7 @@ public: Variant call(GDScriptInstance *p_instance, const Variant **p_args, int p_argcount, Variant::CallError &r_err, CallState *p_state = NULL); - _FORCE_INLINE_ ScriptInstance::RPCMode get_rpc_mode() const { return rpc_mode; } + _FORCE_INLINE_ MultiplayerAPI::RPCMode get_rpc_mode() const { return rpc_mode; } GDScriptFunction(); ~GDScriptFunction(); }; |