gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-11-02 09:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #38105 from AndreaCatania/AndreaCatania-patch-2

Browse source 
Removed noisy ERR check from Multiplayer API.
This commit is contained in:
Fabio Alessandrelli 2020-05-01 13:53:55 +02:00 committed by GitHub
commit d883b90988
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/gdscript/gdscript.cpp
View file

@ -638,12 +638,12 @@ uint16_t GDScript::get_rpc_method_id(const StringName &p_method) const {
} }
StringName GDScript::get_rpc_method(const uint16_t p_rpc_method_id) const { StringName GDScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), StringName()); if (p_rpc_method_id >= rpc_functions.size()) return StringName();
return rpc_functions[p_rpc_method_id].name; return rpc_functions[p_rpc_method_id].name;
} }
MultiplayerAPI::RPCMode GDScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const { MultiplayerAPI::RPCMode GDScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), MultiplayerAPI::RPC_MODE_DISABLED); if (p_rpc_method_id >= rpc_functions.size()) return MultiplayerAPI::RPC_MODE_DISABLED;
return rpc_functions[p_rpc_method_id].mode; return rpc_functions[p_rpc_method_id].mode;
} }
@ -665,12 +665,12 @@ uint16_t GDScript::get_rset_property_id(const StringName &p_variable) const {
} }
StringName GDScript::get_rset_property(const uint16_t p_rset_member_id) const { StringName GDScript::get_rset_property(const uint16_t p_rset_member_id) const {
ERR_FAIL_COND_V(p_rset_member_id >= rpc_variables.size(), StringName()); if (p_rset_member_id >= rpc_variables.size()) return StringName();
return rpc_variables[p_rset_member_id].name; return rpc_variables[p_rset_member_id].name;
} }
MultiplayerAPI::RPCMode GDScript::get_rset_mode_by_id(const uint16_t p_rset_member_id) const { MultiplayerAPI::RPCMode GDScript::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
ERR_FAIL_COND_V(p_rset_member_id >= rpc_variables.size(), MultiplayerAPI::RPC_MODE_DISABLED); if (p_rset_member_id >= rpc_variables.size()) return MultiplayerAPI::RPC_MODE_DISABLED;
return rpc_variables[p_rset_member_id].mode; return rpc_variables[p_rset_member_id].mode;
} }