From 16aeb84cd35996a6b41f10cbc48a677eeccc911c Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@outlook.com>
Date: Sat, 2 Jan 2021 13:50:34 +0000
Subject: Fix potential destruction crashes (#5095)

* Fix potential destruction crashes

* Fix destructors accessing destroyted objects
* Fix cPlayer not destroying windows (Destroyed never called)
* Tentatively fixes #4608, fixes #3236, fixes #3262
- Remove cEntity::Destroyed() and replace with cEntity::OnRemoveFromWorld()

* Add missing call to OnRemoveFromWorld
---
 src/Entities/Player.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/Entities/Player.cpp')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index fb0cdf271..391a5ce71 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -280,10 +280,9 @@ cPlayer::~cPlayer(void)
 
 
 
-void cPlayer::Destroyed()
+void cPlayer::OnRemoveFromWorld(cWorld & a_World)
 {
 	CloseWindow(false);
-	Super::Destroyed();
 }
 
 
-- 
cgit v1.2.3