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

removed the entity_controller property from EntityData.

Browse Source
This commit is contained in:
Relintai 2020-10-19 11:53:57 +02:00
parent 83a688f9dc
commit 20811bb740
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
entities/data/entity_data.cpp
View File

@ -75,13 +75,6 @@ void EntityData::set_entity_flags(const int value) {
_entity_flags = value;
}
EntityEnums::EntityController EntityData::get_entity_controller() const {
return _entity_controller;
}
void EntityData::set_entity_controller(EntityEnums::EntityController value) {
_entity_controller = value;
}
int EntityData::get_money() const {
return _money;
}
@ -243,7 +236,6 @@ EntityData::EntityData() {
_interaction_type = EntityEnums::ENITIY_INTERACTION_TYPE_NORMAL;
_immunity_flags = 0;
_entity_flags = 0;
_entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE;
}
EntityData::~EntityData() {
_entity_class_data.unref();
@ -277,10 +269,6 @@ void EntityData::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_entity_interaction_type", "value"), &EntityData::set_entity_interaction_type);
ADD_PROPERTY(PropertyInfo(Variant::INT, "entity_interaction_type", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_INTERACTION_TYPE), "set_entity_interaction_type", "get_entity_interaction_type");
ClassDB::bind_method(D_METHOD("get_entity_controller"), &EntityData::get_entity_controller);
ClassDB::bind_method(D_METHOD("set_entity_controller", "value"), &EntityData::set_entity_controller);
ADD_PROPERTY(PropertyInfo(Variant::INT, "entity_controller", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_CONTOLLER), "set_entity_controller", "get_entity_controller");
ClassDB::bind_method(D_METHOD("get_is_playable"), &EntityData::get_is_playable);
ClassDB::bind_method(D_METHOD("set_is_playable", "value"), &EntityData::set_is_playable);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "is_playable"), "set_is_playable", "get_is_playable");

4
entities/data/entity_data.h
View File

@ -75,9 +75,6 @@ public:
int get_entity_flags() const;
void set_entity_flags(const int value);
EntityEnums::EntityController get_entity_controller() const;
void set_entity_controller(const EntityEnums::EntityController value);
int get_money() const;
void set_money(const int value);
@ -129,7 +126,6 @@ private:
int _immunity_flags;
int _entity_flags;
EntityEnums::EntityController _entity_controller;
String _text_description;

8
entities/entity.cpp
View File

@ -730,10 +730,10 @@ void Entity::_setup() {
sets_immunity_flags(_s_entity_data->get_immunity_flags());
sets_entity_flags(_s_entity_data->get_entity_flags());
if (_s_entity_controller == EntityEnums::ENITIY_CONTROLLER_NONE) {
sets_original_entity_controller(_s_entity_data->get_entity_controller());
sets_entity_controller(_s_entity_data->get_entity_controller());
}
//if (_s_entity_controller == EntityEnums::ENITIY_CONTROLLER_NONE) {
// sets_original_entity_controller(_s_entity_data->get_entity_controller());
// sets_entity_controller(_s_entity_data->get_entity_controller());
//}
//sets_entity_name(_s_entity_data->get_entity_name());
sets_money(_s_entity_data->get_money());