Skip to content

MovableMan - fix usage of unordered_set::erase #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2025
+9 −9
Merged

MovableMan - fix usage of unordered_set::erase #226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Source/Managers/MovableMan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,8 +1484,6 @@ void MovableMan::Update() {
if (!(*aIt)->IsSetToDelete())
m_Actors.push_back(*aIt);
else {
m_ValidActors.erase(*aIt);

// Also remove actor from the roster
if ((*aIt)->GetTeam() >= 0) {
// m_ActorRoster[(*aIt)->GetTeam()].remove(*aIt);
Expand All @@ -1494,6 +1492,8 @@ void MovableMan::Update() {

(*aIt)->DestroyScriptState();
delete (*aIt);

m_ValidActors.erase(*aIt);
}
}
m_AddedActors.clear();
Expand All @@ -1504,9 +1504,9 @@ void MovableMan::Update() {
if (!(*iIt)->IsSetToDelete()) {
m_Items.push_back(*iIt);
} else {
m_ValidItems.erase(*iIt);
(*iIt)->DestroyScriptState();
delete (*iIt);
m_ValidItems.erase(*iIt);
}
}
m_AddedItems.clear();
Expand All @@ -1517,9 +1517,9 @@ void MovableMan::Update() {
if (!(*parIt)->IsSetToDelete()) {
m_Particles.push_back(*parIt);
} else {
m_ValidParticles.erase(*parIt);
(*parIt)->DestroyScriptState();
delete (*parIt);
m_ValidParticles.erase(*parIt);
}
}
m_AddedParticles.clear();
Expand Down Expand Up @@ -1571,8 +1571,8 @@ void MovableMan::Update() {
if ((*iIt)->GetRestThreshold() < 0) {
(*iIt)->SetRestThreshold(500);
}
m_ValidItems.erase(*iIt);
m_Particles.push_back(*iIt);
m_ValidItems.erase(*iIt);
iIt++;
}
m_Items.erase(imidIt, m_Items.end());
Expand Down Expand Up @@ -1600,9 +1600,9 @@ void MovableMan::Update() {
RemoveActorFromTeamRoster(*aIt);

// Delete
m_ValidActors.erase(*aIt);
(*aIt)->DestroyScriptState();
delete (*aIt);
m_ValidActors.erase(*aIt);
aIt++;
}
// Try to set the existing iterator to a safer value, erase can crash in debug mode otherwise?
Expand All @@ -1614,9 +1614,9 @@ void MovableMan::Update() {
imidIt = iIt;

while (iIt != m_Items.end()) {
m_ValidItems.erase(*iIt);
(*iIt)->DestroyScriptState();
delete (*iIt);
m_ValidItems.erase(*iIt);
iIt++;
}
m_Items.erase(imidIt, m_Items.end());
Expand All @@ -1626,9 +1626,9 @@ void MovableMan::Update() {
midIt = parIt;

while (parIt != m_Particles.end()) {
m_ValidParticles.erase(*parIt);
(*parIt)->DestroyScriptState();
delete (*parIt);
m_ValidParticles.erase(*parIt);
parIt++;
}
m_Particles.erase(midIt, m_Particles.end());
Expand Down Expand Up @@ -1658,9 +1658,9 @@ void MovableMan::Update() {
if ((*parIt)->GetDrawPriority() >= terrMat->GetPriority()) {
(*parIt)->DrawToTerrain(g_SceneMan.GetTerrain());
}
m_ValidParticles.erase(*parIt);
(*parIt)->DestroyScriptState();
delete (*parIt);
m_ValidParticles.erase(*parIt);
parIt++;
}
m_Particles.erase(midIt, m_Particles.end());
Expand Down
Loading