diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-30 14:59:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 14:59:08 +0200 |
| commit | fc7f931d26900f70ec19f91837d1715e1a301834 (patch) | |
| tree | c5bcc314b6d62437d9eae4f768d69491e91e1d54 /core/script_language.h | |
| parent | 3d9dffdef7d436cda779ee4a659476fa94c62a35 (diff) | |
| parent | 8e35d937a96399c7fc9dcc3b9cd7344a6a38cfd8 (diff) | |
Merge pull request #19255 from Faless/rpc_sync_mmore
RPCMode refactor, more sync modes (2)
Diffstat (limited to 'core/script_language.h')
| -rw-r--r-- | core/script_language.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/core/script_language.h b/core/script_language.h index b4c55cac9e..ad66fc5528 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -31,6 +31,7 @@ #ifndef SCRIPT_LANGUAGE_H #define SCRIPT_LANGUAGE_H +#include "io/multiplayer_api.h" #include "map.h" #include "pair.h" #include "resource.h" @@ -157,16 +158,8 @@ public: virtual bool is_placeholder() const { return false; } - enum RPCMode { - RPC_MODE_DISABLED, - RPC_MODE_REMOTE, - RPC_MODE_SYNC, - RPC_MODE_MASTER, - RPC_MODE_SLAVE, - }; - - virtual RPCMode get_rpc_mode(const StringName &p_method) const = 0; - virtual RPCMode get_rset_mode(const StringName &p_variable) const = 0; + virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const = 0; + virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const = 0; virtual ScriptLanguage *get_language() = 0; virtual ~ScriptInstance(); @@ -332,8 +325,8 @@ public: virtual bool is_placeholder() const { return true; } - virtual RPCMode get_rpc_mode(const StringName &p_method) const { return RPC_MODE_DISABLED; } - virtual RPCMode get_rset_mode(const StringName &p_variable) const { return RPC_MODE_DISABLED; } + virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const { return MultiplayerAPI::RPC_MODE_DISABLED; } + virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const { return MultiplayerAPI::RPC_MODE_DISABLED; } PlaceHolderScriptInstance(ScriptLanguage *p_language, Ref<Script> p_script, Object *p_owner); ~PlaceHolderScriptInstance(); |