Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-02-22 17:18:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworked how c_is_controlled works. Now Entities just sync sentity_controller to the client and getc_is_controlled just determines from the available data whether the Entity is controlled on that particular client.

Browse Source
This commit is contained in:
Relintai 2021-08-30 20:14:37 +02:00
parent 3ed59d11ec
commit 71dc15650a
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
entities/entity.cpp
View File

@ -915,18 +915,28 @@ EntityEnums::EntityController Entity::gets_entity_controller() {
void Entity::sets_entity_controller(EntityEnums::EntityController value) { void Entity::sets_entity_controller(EntityEnums::EntityController value) {
_s_entity_controller = value; _s_entity_controller = value;
if (is_inside_tree()) { ORPC(setc_entity_controller, value);
ORPC(setc_is_controlled, value == EntityEnums::ENITIY_CONTROLLER_PLAYER); }
EntityEnums::EntityController Entity::getc_entity_controller() {
return _s_entity_controller;
}
void Entity::setc_entity_controller(EntityEnums::EntityController value) {
if (_c_entity_controller == value) {
return;
} }
_c_entity_controller = value;
emit_signal("onc_entity_controller_changed");
} }
bool Entity::getc_is_controlled() { bool Entity::getc_is_controlled() {
return _c_is_controlled; if (is_inside_tree() && get_tree()->has_network_peer()) {
} return (_c_entity_controller == EntityEnums::ENITIY_CONTROLLER_PLAYER) && (get_network_master() == get_tree()->get_network_unique_id());
void Entity::setc_is_controlled(bool value) { } else {
_c_is_controlled = value; return _c_entity_controller == EntityEnums::ENITIY_CONTROLLER_PLAYER;
}
emit_signal("isc_controlled_changed", value);
} }
Ref<EntityAI> Entity::gets_ai() { Ref<EntityAI> Entity::gets_ai() {
@ -5954,7 +5964,7 @@ Entity::Entity() {
_s_original_entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE; _s_original_entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE;
_s_entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE; _s_entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE;
_c_is_controlled = false; _c_entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE;
_s_pet_owner = NULL; _s_pet_owner = NULL;
_c_pet_owner = NULL; _c_pet_owner = NULL;
@ -7776,11 +7786,13 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("sets_entity_controller", "value"), &Entity::sets_entity_controller); ClassDB::bind_method(D_METHOD("sets_entity_controller", "value"), &Entity::sets_entity_controller);
ADD_PROPERTY(PropertyInfo(Variant::INT, "sentity_controller", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_CONTOLLER), "sets_entity_controller", "gets_entity_controller"); ADD_PROPERTY(PropertyInfo(Variant::INT, "sentity_controller", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_CONTOLLER), "sets_entity_controller", "gets_entity_controller");
ADD_SIGNAL(MethodInfo("isc_controlled_changed", PropertyInfo(Variant::BOOL, "value"))); ClassDB::bind_method(D_METHOD("getc_entity_controller"), &Entity::getc_entity_controller);
ClassDB::bind_method(D_METHOD("setc_entity_controller", "value"), &Entity::setc_entity_controller);
ADD_PROPERTY(PropertyInfo(Variant::INT, "centity_controller", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_CONTOLLER), "setc_entity_controller", "getc_entity_controller");
ADD_SIGNAL(MethodInfo("onc_entity_controller_changed"));
ClassDB::bind_method(D_METHOD("getc_is_controlled"), &Entity::getc_is_controlled); ClassDB::bind_method(D_METHOD("getc_is_controlled"), &Entity::getc_is_controlled);
ClassDB::bind_method(D_METHOD("setc_is_controlled", "value"), &Entity::setc_is_controlled);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "c_is_controlled", PROPERTY_HINT_NONE, "", 0), "setc_is_controlled", "getc_is_controlled");
ClassDB::bind_method(D_METHOD("gets_ai"), &Entity::gets_ai); ClassDB::bind_method(D_METHOD("gets_ai"), &Entity::gets_ai);
ClassDB::bind_method(D_METHOD("sets_ai", "value"), &Entity::sets_ai); ClassDB::bind_method(D_METHOD("sets_ai", "value"), &Entity::sets_ai);

5
entities/entity.h
View File

@ -1024,8 +1024,10 @@ public:
EntityEnums::EntityController gets_entity_controller(); EntityEnums::EntityController gets_entity_controller();
void sets_entity_controller(EntityEnums::EntityController value); void sets_entity_controller(EntityEnums::EntityController value);
EntityEnums::EntityController getc_entity_controller();
void setc_entity_controller(EntityEnums::EntityController value);
bool getc_is_controlled(); bool getc_is_controlled();
void setc_is_controlled(bool value);
Ref<EntityAI> gets_ai(); Ref<EntityAI> gets_ai();
void sets_ai(Ref<EntityAI> value); void sets_ai(Ref<EntityAI> value);
@ -1323,6 +1325,7 @@ private:
EntityEnums::EntityController _s_original_entity_controller; EntityEnums::EntityController _s_original_entity_controller;
EntityEnums::EntityController _s_entity_controller; EntityEnums::EntityController _s_entity_controller;
EntityEnums::EntityController _c_entity_controller;
bool _c_is_controlled; bool _c_is_controlled;
Ref<EntityAI> _s_ai; Ref<EntityAI> _s_ai;