From 9e976eaebf80007b2b9112bb118421f243cd2d33 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 15 Oct 2019 22:21:14 +0200 Subject: [PATCH] Small fixes. --- entities/entity.cpp | 7 +------ entities/stats/stat.cpp | 2 +- entities/stats/stat_data_entry.cpp | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/entities/entity.cpp b/entities/entity.cpp index d4dec18..92cc167 100644 --- a/entities/entity.cpp +++ b/entities/entity.cpp @@ -1217,12 +1217,7 @@ void Entity::set_stat_int(int index, Ref entry) { } Ref Entity::get_stat_enum(Stat::StatId stat_id) { - //ERR_FAIL_COND_V(stat_id == Stat::STAT_ID_NONE); - - if (stat_id == Stat::STAT_ID_NONE) { - print_error("Add fail cond here, stat has STAT_ID_NONE!"); - return _stats[0]; - } + ERR_FAIL_INDEX_V(stat_id, Stat::STAT_ID_TOTAL_STATS, Ref()); return _stats[stat_id]; } diff --git a/entities/stats/stat.cpp b/entities/stats/stat.cpp index e644f93..7a1246d 100644 --- a/entities/stats/stat.cpp +++ b/entities/stats/stat.cpp @@ -305,7 +305,7 @@ void Stat::remove_modifier_index(int index) { } void Stat::apply_modifiers() { - ERR_FAIL_COND(_owner == NULL); + ERR_FAIL_COND(!ObjectDB::instance_validate(_owner)); ERR_FAIL_COND(!_stat_data_entry.is_valid()); reset_values(); diff --git a/entities/stats/stat_data_entry.cpp b/entities/stats/stat_data_entry.cpp index bedbcfd..a660ed3 100644 --- a/entities/stats/stat_data_entry.cpp +++ b/entities/stats/stat_data_entry.cpp @@ -111,6 +111,7 @@ StatDataEntry::StatDataEntry() { _modifier_apply_type = Stat::MODIFIER_APPLY_TYPE_STANDARD; for (int i = 0; i < MAX_MOD_STATS; ++i) { + _mod_stats[i].stat_id = Stat::STAT_ID_HEALTH; _mod_stats[i].max_value = 1000; } }