Remove DM player in destructor rather than in a manual function call

This commit is contained in:
smallmodel 2025-01-16 22:17:03 +01:00
parent ab80045329
commit a6d9369204
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512

View file

@ -2209,6 +2209,12 @@ Player::~Player()
// when the player is deleted
RemoveFromVehiclesAndTurrets();
// Added in OPM
// Remove the player at destructor
if (g_gametype->integer != GT_SINGLE_PLAYER && dmManager.PlayerCount()) {
dmManager.RemovePlayer(this);
}
entflags &= ~ECF_PLAYER;
}
@ -9704,9 +9710,9 @@ void Player::Disconnect(void)
ev->AddListener(this);
scriptedEvents[SE_DISCONNECTED].Trigger(ev);
if (g_gametype->integer != GT_SINGLE_PLAYER) {
dmManager.RemovePlayer(this);
}
// if (g_gametype->integer != GT_SINGLE_PLAYER) {
// dmManager.RemovePlayer(this);
// }
}
void Player::CallVote(Event *ev)