From fe9242f412dc66d30ed506021228c792fda99793 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 3 Jul 2019 20:10:20 +0200
Subject: HDB: Implement safe version of removeEntity(). The previous one
 crashed

---
 engines/hdb/ai-funcs.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index 56239c80e0..761f74d4f4 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -669,7 +669,11 @@ int AI::checkForTouchplate(int x, int y) {
 }
 
 void AI::removeEntity(AIEntity *e) {
-	_ents->erase(&e);
+	for (int i = 0; i < _ents->size(); i++)
+		if (_ents->operator[](i) == e) {
+			_ents->remove_at(i);
+			return;
+		}
 }
 
 void AI::setEntityGoal(AIEntity *e, int x, int y) {
-- 
cgit v1.2.3