This commit is contained in:
aozhiwei 2023-05-06 11:55:20 +08:00
parent d176d048ae
commit 0020a8fcf6
2 changed files with 8 additions and 2 deletions

View File

@ -158,6 +158,10 @@ void Room::UnInit()
delete pair.second;
}
team_hash_.clear();
for (auto& pair : discard_team_hash_) {
delete pair.second;
}
discard_team_hash_.clear();
A8_SAFE_DELETE(frame_event_data);
PerfMonitor::Instance()->alive_count -= alive_count_;
}
@ -1881,8 +1885,9 @@ void Room::RandRemoveAndroid()
}
}
if (hum) {
if (hum->team_id != 0) {
team_hash_.erase(hum->team_id);
if (hum->GetTeam()) {
team_hash_.erase(hum->GetTeam()->GetTeamId());
discard_team_hash_[hum->GetTeam()->GetTeamId()] = hum->GetTeam();
}
if (hum->born_point) {
DecBornPointHumanNum(hum->born_point, hum);

View File

@ -363,6 +363,7 @@ private:
std::set<int> refreshed_robot_set_;
std::map<int, Team*> team_hash_;
std::map<int, Team*> combineable_team_hash_;
std::map<int, Team*> discard_team_hash_;
std::map<std::string, Player*> accountid_hash_;
std::map<int, MoveableEntity*> moveable_hash_;
std::map<int, Entity*> uniid_hash_;