From 1f8444bc0bb597030b57a0c0e5a7ab8393306020 Mon Sep 17 00:00:00 2001
From: adastram <caudron.kerrian@gmail.com>
Date: Thu, 11 Jan 2024 10:29:43 +0100
Subject: [PATCH] Edited .pause() function to lock all unlocked entity instead
 of blocking update function, and .resume() to unlock only non-locked entity
 before pause

---
 src/engine/entity_manager.py | 44 ++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/engine/entity_manager.py b/src/engine/entity_manager.py
index 45fa572..b4016dc 100644
--- a/src/engine/entity_manager.py
+++ b/src/engine/entity_manager.py
@@ -8,6 +8,7 @@ class EntityManager:
         self.entities: dict[str:Entity] = {}
         self.player_entity_name = ""
         self.map_manager = map_manager
+        self.locked_before_pause: list[Entity] = []
         self.paused = False
 
     def register_entity(self, name: str) -> Entity:
@@ -27,22 +28,21 @@ class EntityManager:
 
     def update(self, delta: float):
         """Met à jour toutes les entités enregistrées."""
-        if not self.paused:
-            for entity_name in list(self.entities.keys()):
-                entity = self.entities[entity_name]
-                entity.update(delta)
-                if entity.life_points == 0:
-                    self.entities.pop(entity_name)
+        for entity_name in list(self.entities.keys()):
+            entity = self.entities[entity_name]
+            entity.update(delta)
+            if entity.life_points == 0:
+                self.entities.pop(entity_name)
 
-                if entity.brain is not None:
-                    entity.brain.update(delta)
+            if entity.brain is not None:
+                entity.brain.update(delta)
 
-            if self.player_entity_name:
-                player: Entity = self.get_by_name(self.player_entity_name)
-                if player.mouvements[0] != 0. or player.mouvements[1] != 0.:
-                    player.link_animation("player_walking")
-                else:
-                    player.link_animation("player_none")
+        if self.player_entity_name:
+            player: Entity = self.get_by_name(self.player_entity_name)
+            if player.mouvements[0] != 0. or player.mouvements[1] != 0.:
+                player.link_animation("player_walking")
+            else:
+                player.link_animation("player_none")
 
     def get_all_entities(self) -> list[Entity]:
         """Donne la liste de toutes les entités enregistrées."""
@@ -53,14 +53,18 @@ class EntityManager:
         return self.entities[name]
 
     def pause(self):
+        for e in self.get_all_entities():
+            if e.locked:
+                self.locked_before_pause.append(e)
+            else:
+                e.lock()
         self.paused = True
-        player: Entity = self.get_by_name(self.player_entity_name)
-        if not player.locked:
-            player.lock()
 
     
     def resume(self):
+        for e in self.get_all_entities():
+            if not e in self.locked_before_pause:
+                e.unlock()
+        
         self.paused = False
-        player: Entity = self.get_by_name(self.player_entity_name)
-        if player.locked:
-            player.unlock()
\ No newline at end of file
+        self.locked_before_pause = []
\ No newline at end of file