diff --git a/entities/data/entity_data.cpp b/entities/data/entity_data.cpp index 90afeef..51f9293 100644 --- a/entities/data/entity_data.cpp +++ b/entities/data/entity_data.cpp @@ -48,13 +48,6 @@ void EntityData::set_text_description(String value) { _text_description = value; } -Ref EntityData::get_inherits() const { - return _inherits; -} -void EntityData::set_inherits(const Ref &value) { - _inherits = value; -} - int EntityData::get_entity_type() const { return _entity_type; } @@ -113,10 +106,6 @@ void EntityData::set_bag_size(const int value) { } Ref EntityData::get_stat_data() { - if (!_stat_data.is_valid() && _inherits.is_valid()) { - return _inherits->get_stat_data(); - } - return _stat_data; } @@ -185,10 +174,6 @@ void EntityData::set_loot_db(const Ref &lootdb) { } Ref EntityData::get_vendor_item_data() const { - if (!_vendor_item_data.is_valid() && _inherits.is_valid()) { - return _inherits->get_vendor_item_data(); - } - return _vendor_item_data; } void EntityData::set_vendor_item_data(const Ref &data) { @@ -196,10 +181,6 @@ void EntityData::set_vendor_item_data(const Ref &data) { } Ref EntityData::get_spell_train_data() const { - if (!_spell_train_data.is_valid() && _inherits.is_valid()) { - return _inherits->get_spell_train_data(); - } - return _spell_train_data; } void EntityData::set_spell_train_data(const Ref &data) { @@ -207,10 +188,6 @@ void EntityData::set_spell_train_data(const Ref &data) { } Ref EntityData::get_item_container_data() const { - if (!_vendor_item_data.is_valid() && _inherits.is_valid()) { - return _inherits->get_item_container_data(); - } - return _item_container_data; } void EntityData::set_item_container_data(const Ref &data) { @@ -343,8 +320,6 @@ EntityData::EntityData() { _entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE; } EntityData::~EntityData() { - _inherits.unref(); - _entity_class_data.unref(); _entity_species_data.unref(); _equipment_data.unref(); diff --git a/entities/data/entity_data.h b/entities/data/entity_data.h index 421a0de..28df428 100644 --- a/entities/data/entity_data.h +++ b/entities/data/entity_data.h @@ -67,9 +67,6 @@ public: String get_text_description() const; void set_text_description(const String value); - Ref get_inherits() const; - void set_inherits(const Ref &value); - int get_entity_type() const; void set_entity_type(const int value); @@ -157,8 +154,6 @@ protected: private: int _id; - Ref _inherits; - int _entity_type; EntityEnums::EntityInteractionType _interaction_type;