Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-05-13 22:52:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed the inherits property from EntityData (wasn't exposed to gdscript).

Browse Source
This commit is contained in:
Relintai 2020-10-18 15:55:14 +02:00
parent e992462683
commit 743dca09ec
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
entities/data/entity_data.cpp
View File

@ -48,13 +48,6 @@ void EntityData::set_text_description(String value) {
_text_description = value; _text_description = value;
} }
Ref<EntityData> EntityData::get_inherits() const {
return _inherits;
}
void EntityData::set_inherits(const Ref<EntityData> &value) {
_inherits = value;
}
int EntityData::get_entity_type() const { int EntityData::get_entity_type() const {
return _entity_type; return _entity_type;
} }
@ -113,10 +106,6 @@ void EntityData::set_bag_size(const int value) {
} }
Ref<StatData> EntityData::get_stat_data() { Ref<StatData> EntityData::get_stat_data() {
if (!_stat_data.is_valid() && _inherits.is_valid()) {
return _inherits->get_stat_data();
}
return _stat_data; return _stat_data;
} }
@ -185,10 +174,6 @@ void EntityData::set_loot_db(const Ref<LootDataBase> &lootdb) {
} }
Ref<VendorItemData> EntityData::get_vendor_item_data() const { Ref<VendorItemData> 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; return _vendor_item_data;
} }
void EntityData::set_vendor_item_data(const Ref<VendorItemData> &data) { void EntityData::set_vendor_item_data(const Ref<VendorItemData> &data) {
@ -196,10 +181,6 @@ void EntityData::set_vendor_item_data(const Ref<VendorItemData> &data) {
} }
Ref<VendorItemData> EntityData::get_spell_train_data() const { Ref<VendorItemData> 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; return _spell_train_data;
} }
void EntityData::set_spell_train_data(const Ref<VendorItemData> &data) { void EntityData::set_spell_train_data(const Ref<VendorItemData> &data) {
@ -207,10 +188,6 @@ void EntityData::set_spell_train_data(const Ref<VendorItemData> &data) {
} }
Ref<ItemContainerData> EntityData::get_item_container_data() const { Ref<ItemContainerData> 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; return _item_container_data;
} }
void EntityData::set_item_container_data(const Ref<ItemContainerData> &data) { void EntityData::set_item_container_data(const Ref<ItemContainerData> &data) {
@ -343,8 +320,6 @@ EntityData::EntityData() {
_entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE; _entity_controller = EntityEnums::ENITIY_CONTROLLER_NONE;
} }
EntityData::~EntityData() { EntityData::~EntityData() {
_inherits.unref();
_entity_class_data.unref(); _entity_class_data.unref();
_entity_species_data.unref(); _entity_species_data.unref();
_equipment_data.unref(); _equipment_data.unref();

5
entities/data/entity_data.h
View File

@ -67,9 +67,6 @@ public:
String get_text_description() const; String get_text_description() const;
void set_text_description(const String value); void set_text_description(const String value);
Ref<EntityData> get_inherits() const;
void set_inherits(const Ref<EntityData> &value);
int get_entity_type() const; int get_entity_type() const;
void set_entity_type(const int value); void set_entity_type(const int value);
@ -157,8 +154,6 @@ protected:
private: private:
int _id; int _id;
Ref<EntityData> _inherits;
int _entity_type; int _entity_type;
EntityEnums::EntityInteractionType _interaction_type; EntityEnums::EntityInteractionType _interaction_type;