This commit is contained in:
aozhiwei 2020-06-03 16:53:39 +08:00
parent 4ce77a7e08
commit a39bab2e4b

View File

@ -1796,34 +1796,38 @@ void Human::ClearFrameData()
new_objects.clear();
}
if (!del_objects.empty()) {
for (auto& itr : del_objects) {
Entity* entity = room->GetEntityByUniId(itr);
if (entity) {
RemovePartObjects(entity);
if (entity->IsEntityType(ET_Player)) {
Human* hum = (Human*)entity;
hum->RemovePartObjects(this);
}
if (!a8::HasBitFlag(status, HS_Disable)) {
for (auto& itr : del_objects) {
Entity* entity = room->GetEntityByUniId(itr);
if (entity) {
RemovePartObjects(entity);
if (entity->IsEntityType(ET_Player)) {
Human* hum = (Human*)entity;
hum->RemovePartObjects(this);
}
#ifdef DEBUG
room->CheckPartObjects();
room->CheckPartObjects();
#endif
}
}
}
del_objects.clear();
}
if (!out_objects.empty()) {
for (auto& itr : out_objects) {
Entity* entity = room->GetEntityByUniId(itr);
if (entity) {
RemovePartObjects(entity);
if (entity->IsEntityType(ET_Player)) {
Human* hum = (Human*)entity;
hum->RemovePartObjects(this);
if (!a8::HasBitFlag(status, HS_Disable)) {
for (auto& itr : out_objects) {
Entity* entity = room->GetEntityByUniId(itr);
if (entity) {
RemovePartObjects(entity);
if (entity->IsEntityType(ET_Player)) {
Human* hum = (Human*)entity;
hum->RemovePartObjects(this);
}
}
}
#ifdef DEBUG
room->CheckPartObjects();
room->CheckPartObjects();
#endif
}
}
out_objects.clear();
}