Merge pull request #242 from SleepProgger/remove_component_fix

Ensure the entities component_id for removed components is set to -1
kivy · Aug 8, 2017 · c48a134 · c48a134
2 parents af0994c + 6c8c87e
commit c48a134
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/modules/core/kivent_core/entity.pyx b/modules/core/kivent_core/entity.pyx
@@ -53,9 +53,9 @@ cdef class Entity(MemComponent):
         system = system_manager[name]
         cdef unsigned int* pointer = <unsigned int*>self.pointer
         cdef unsigned int component_index = pointer[system_index+1]
-        if component_index == -1:
+        if component_index == <unsigned int>-1:
             raise NoComponentActiveError(
-                'Entity {ent_id} have no component'
+                'Entity {ent_id} has no component '
                 'active for {system_name}'.format(ent_id=str(self._id),
                     system_name=name))
         return system.components[component_index]

diff --git a/modules/core/kivent_core/systems/gamesystem.pyx b/modules/core/kivent_core/systems/gamesystem.pyx
@@ -281,7 +281,11 @@ cdef class GameSystem(CWidget):
         Args:
             component_index (unsigned int): the component_id to be removed.
         '''
+        entity = self.py_components[component_index]
+        cdef unsigned int entity_id = entity.entity_id
         self.clear_component(component_index)
+        cdef EntityManager entity_manager = self.gameworld.entity_manager
+        entity_manager.set_component(entity_id, -1, self.system_index)
         self.py_components[component_index] = None
         self.free_indices.append(component_index)
 

diff --git a/modules/core/kivent_core/systems/staticmemgamesystem.pyx b/modules/core/kivent_core/systems/staticmemgamesystem.pyx
@@ -16,7 +16,7 @@ from gamesystem cimport GameSystem
 from kivent_core.managers.system_manager cimport SystemManager
 from cpython cimport bool
 from kivent_core.memory_handlers.utils import memrange
-
+from kivent_core.managers.entity_manager cimport EntityManager
 
 
 cdef class MemComponent:
@@ -223,8 +223,13 @@ cdef class StaticMemGameSystem(GameSystem):
         Overrides the default behavior of GameSystem, passing data handling
         duties to the IndexedMemoryZone. **clear_component** will be called
         prior to calling **free_slot** on the MemoryZone.'''
-        self.clear_component(component_index)
         cdef MemoryZone memory_zone = self.imz_components.memory_zone
+        cdef EntityManager entity_manager = self.gameworld.entity_manager
+        cdef unsigned int *pointer = <unsigned int*>memory_zone.get_pointer(
+            component_index)
+        cdef unsigned int entity_id = pointer[0]
+        self.clear_component(component_index)
+        entity_manager.set_component(entity_id, -1, self.system_index)
         memory_zone.free_slot(component_index)
 
     def init_component(self, unsigned int component_index,