summaryrefslogtreecommitdiff
path: root/src/level.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/level.cpp')
-rw-r--r--src/level.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/level.cpp b/src/level.cpp
index b7d42ec..047363b 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -3,6 +3,7 @@
#include "camera.hpp"
#include "ecs.hpp"
+#include "pk.h"
LevelHandle nextHandle = LevelHandle{0};
long levelCount = 0;
@@ -21,7 +22,7 @@ PkeLevel *PkeLevel_Get_Inner(LevelHandle handle) {
void PkeLevel_Init() {
for (long i = 0; i < MAX_LEVEL_COUNT; ++i) {
new (&LEVELS[i]) PkeLevel{};
- PkeArray_HardReset<CameraHandle>(&LEVELS[i].cameras);
+ pk_arr_reset(&LEVELS[i].cameras);
}
}
@@ -69,7 +70,7 @@ void PkeLevel_RegisterCamera(LevelHandle levelHandle, CameraHandle cameraHandle)
assert(cameraHandle != CameraHandle_MAX);
PkeLevel *lvl = PkeLevel_Get_Inner(levelHandle);
assert(lvl != nullptr && "Failed to find level by requested LevelHandle");
- PkeArray_Add(&lvl->cameras, cameraHandle);
+ pk_arr_append(&lvl->cameras, &cameraHandle);
}
void PkeLevel_Remove(LevelHandle handle) {
@@ -78,9 +79,9 @@ void PkeLevel_Remove(LevelHandle handle) {
levelCount -= 1;
ECS_MarkForRemoval(lvl);
for (long i = 0; i < lvl->cameras.next; ++i) {
- PkeCamera_Destroy(lvl->cameras.data[i]);
+ PkeCamera_Destroy(lvl->cameras[i]);
}
- PkeArray_HardReset<CameraHandle>(&lvl->cameras);
+ pk_arr_reset(&lvl->cameras);
pk_bucket_reset(lvl->bkt);
lvl->levelHandle = LevelHandle_MAX;
}