Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-04-19 21:33:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed small mistakes in player's serialization, and deserialization.

Browse Source
This commit is contained in:
Relintai 2019-10-04 22:55:46 +02:00
parent 7629584851
commit fa4749f28d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/data_manager.cpp
View File

@ -50,7 +50,8 @@ Vector<Ref<EntityData> > *DataManager::get_entity_datas() {
}
Ref<EntityData> DataManager::get_entity_data(int class_id) {
ERR_FAIL_COND_V(!_entity_data_map.has(class_id), Ref<EntityData>(NULL));
if (!_entity_data_map.has(class_id))
return Ref<EntityData>(NULL);
return _entity_data_map.get(class_id);
}

18
entities/entity.cpp
View File

@ -263,7 +263,7 @@ void Entity::_setup() {
if (_s_entity_controller == EntityEnums::ENITIY_CONTROLLER_NONE)
sets_entity_controller(_s_entity_data->get_entity_controller());
sets_entity_name(_s_entity_data->get_entity_name());
//sets_entity_name(_s_entity_data->get_entity_name());
sets_money(_s_entity_data->get_money());
}
@ -431,7 +431,7 @@ void Entity::_from_dict(const Dictionary &dict) {
for (int i = 0; i < Stat::STAT_ID_TOTAL_STATS; ++i) {
Ref<Stat> s = _stats[i];
s->from_dict(stats.get(i, Dictionary()));
s->from_dict(stats.get(String::num(i), Dictionary()));
}
//// Resources ////
@ -445,7 +445,7 @@ void Entity::_from_dict(const Dictionary &dict) {
Ref<EntityResource> r;
r.instance();
r->from_dict(rd.get(i, Dictionary()));
r->from_dict(rd.get(String::num(i), Dictionary()));
adds_resource(r);
}
@ -477,7 +477,7 @@ void Entity::_from_dict(const Dictionary &dict) {
Ref<AuraData> r;
r.instance();
r->from_dict(auras.get(i, Dictionary()));
r->from_dict(auras.get(String::num(i), Dictionary()));
_s_auras.push_back(r);
_c_auras.push_back(r);
@ -499,7 +499,7 @@ void Entity::_from_dict(const Dictionary &dict) {
Ref<Cooldown> cd;
cd.instance();
cd->from_dict(cds.get(i, Dictionary()));
cd->from_dict(cds.get(String::num(i), Dictionary()));
_s_cooldowns.push_back(cd);
_c_cooldowns.push_back(cd);
@ -511,7 +511,7 @@ void Entity::_from_dict(const Dictionary &dict) {
Ref<CategoryCooldown> ccd;
ccd.instance();
ccd->from_dict(ccds.get(i, Dictionary()));
ccd->from_dict(ccds.get(String::num(i), Dictionary()));
_s_category_cooldowns.push_back(ccd);
_c_category_cooldowns.push_back(ccd);
@ -549,7 +549,7 @@ void Entity::_from_dict(const Dictionary &dict) {
Ref<EntitySkill> r;
r.instance();
r->from_dict(skills.get(i, Dictionary()));
r->from_dict(skills.get(String::num(i), Dictionary()));
_s_skills.push_back(r);
_c_skills.push_back(r);
@ -569,6 +569,10 @@ void Entity::_from_dict(const Dictionary &dict) {
_s_bag->from_dict(bagd);
}
}
if (DataManager::get_instance() != NULL) {
sets_entity_data(DataManager::get_instance()->get_entity_data(gets_entity_data_id()));
}
}
Entity::Entity() {