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

Small fixes.

Browse Source
This commit is contained in:
Relintai 2019-10-15 22:21:14 +02:00
parent 18afb79b58
commit 9e976eaebf
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
entities/entity.cpp
View File

@ -1217,12 +1217,7 @@ void Entity::set_stat_int(int index, Ref<Stat> entry) {
} }
Ref<Stat> Entity::get_stat_enum(Stat::StatId stat_id) { Ref<Stat> Entity::get_stat_enum(Stat::StatId stat_id) {
//ERR_FAIL_COND_V(stat_id == Stat::STAT_ID_NONE); ERR_FAIL_INDEX_V(stat_id, Stat::STAT_ID_TOTAL_STATS, Ref<Stat>());
if (stat_id == Stat::STAT_ID_NONE) {
print_error("Add fail cond here, stat has STAT_ID_NONE!");
return _stats[0];
}
return _stats[stat_id]; return _stats[stat_id];
} }

2
entities/stats/stat.cpp
View File

@ -305,7 +305,7 @@ void Stat::remove_modifier_index(int index) {
} }
void Stat::apply_modifiers() { void Stat::apply_modifiers() {
ERR_FAIL_COND(_owner == NULL); ERR_FAIL_COND(!ObjectDB::instance_validate(_owner));
ERR_FAIL_COND(!_stat_data_entry.is_valid()); ERR_FAIL_COND(!_stat_data_entry.is_valid());
reset_values(); reset_values();

1
entities/stats/stat_data_entry.cpp
View File

@ -111,6 +111,7 @@ StatDataEntry::StatDataEntry() {
_modifier_apply_type = Stat::MODIFIER_APPLY_TYPE_STANDARD; _modifier_apply_type = Stat::MODIFIER_APPLY_TYPE_STANDARD;
for (int i = 0; i < MAX_MOD_STATS; ++i) { for (int i = 0; i < MAX_MOD_STATS; ++i) {
_mod_stats[i].stat_id = Stat::STAT_ID_HEALTH;
_mod_stats[i].max_value = 1000; _mod_stats[i].max_value = 1000;
} }
} }