diff options
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 1ffecb3..9a8b4e1 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -2,6 +2,7 @@ #include "entities.hpp" #include "bucketed-array.hpp" +#include "dynamic-array.hpp" #include "ecs.hpp" #include "game-settings.hpp" #include "math-helpers.hpp" @@ -1243,8 +1244,8 @@ void EntityType_Unload(EntityType &et, CompGrBinds *grBindsArr[1]) { void EntityType_Tick(double delta) { (void)delta; - const auto count = EntitiesToBeRemoved.Count(); - for (long i = 0; i < count; ++i) { + const uint32_t count = EntitiesToBeRemoved.next; + for (uint32_t i = 0; i < count; ++i) { auto *entTypePtr = EntityType_FindByEntityHandle(EntitiesToBeRemoved[i]->handle); if (entTypePtr != nullptr) { auto &entType = *entTypePtr; @@ -1260,8 +1261,8 @@ void EntityType_Tick(double delta) { void EntityType_Tick_Late(double delta) { (void)delta; - while (EntitiesWithExcessInstances.Count() != 0) { - auto *entity = EntitiesWithExcessInstances.Pop(); + while (EntitiesWithExcessInstances.next != 0) { + auto *entity = EntitiesWithExcessInstances[EntitiesWithExcessInstances.next-1]; auto *etPtr = EntityType_FindByEntityHandle(entity->handle); assert(etPtr != nullptr); auto &et = *etPtr; |