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

Bit more work on fixing the crash. Haven't yet found the culprit. Fortunately it's only crashing sometimes.

Browse Source
This commit is contained in:
Relintai 2020-06-18 20:47:02 +02:00
parent 4405178f06
commit f2d35f8b2c
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
entities/entity.cpp
View File

@ -180,15 +180,15 @@ void Entity::set_body(Node *body) {
_body_3d = Object::cast_to<Spatial>(body);
}
void Entity::instance_body() {
void Entity::instance_body(const Ref<EntityData> &data, const int model_index) {
if (is_queued_for_deletion())
return;
if (get_body() == NULL && _c_entity_data.is_valid() && _c_entity_data->get_entity_species_data().is_valid() &&
_c_entity_data->get_entity_species_data()->get_model_data_count() > _c_model_index &&
_c_entity_data->get_entity_species_data()->get_model_data(_c_model_index).is_valid() &&
_c_entity_data->get_entity_species_data()->get_model_data(_c_model_index)->get_body().is_valid()) {
Node *node = _c_entity_data->get_entity_species_data()->get_model_data(_c_model_index)->get_body()->instance();
if (get_body() == NULL && data.is_valid() && data->get_entity_species_data().is_valid() &&
data->get_entity_species_data()->get_model_data_count() > model_index &&
data->get_entity_species_data()->get_model_data(model_index).is_valid() &&
data->get_entity_species_data()->get_model_data(model_index)->get_body().is_valid()) {
Node *node = data->get_entity_species_data()->get_model_data(model_index)->get_body()->instance();
add_child(node);
set_body(node);
@ -559,16 +559,7 @@ void Entity::sets_entity_data(Ref<EntityData> value) {
//setup();
if (get_body() == NULL && value.is_valid() && value->get_entity_species_data().is_valid() &&
value->get_entity_species_data()->get_model_data_count() > _s_model_index &&
value->get_entity_species_data()->get_model_data(_s_model_index).is_valid() &&
value->get_entity_species_data()->get_model_data(_s_model_index)->get_body().is_valid()) {
Node *node = value->get_entity_species_data()->get_model_data(_s_model_index)->get_body()->instance();
add_child(node);
set_body(node);
}
instance_body(value, _s_model_index);
emit_signal("sentity_data_changed", value);
@ -582,7 +573,7 @@ Ref<EntityData> Entity::getc_entity_data() {
void Entity::setc_entity_data(Ref<EntityData> value) {
_c_entity_data = value;
call_deferred("instance_body");
instance_body(value, _c_model_index);
emit_signal("centity_data_changed", value);
}

2
entities/entity.h
View File

@ -235,7 +235,7 @@ public:
Node2D *get_body_2d();
void set_body(Node *body);
void instance_body();
void instance_body(const Ref<EntityData> &data, const int model_index);
NodePath get_character_skeleton_path();
void set_character_skeleton_path(NodePath value);