summaryrefslogtreecommitdiff
path: root/src/level-types.hpp
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2024-11-14 14:46:23 -0500
committerJonathan Bradley <jcb@pikum.xyz>2024-11-14 14:46:23 -0500
commitb2548ba4ce295fcd94a50123fb543fac2ef2bc33 (patch)
tree444a32abb4a094c4fa2f7bc9a95aa86963ad4110 /src/level-types.hpp
parentb1d926361b9d613ad712ad161f9a8b7ccab4551d (diff)
add pk.h and major pkmem refactor
Completely replaces the memory module with pkmem pkmem is a newer implementation of the same bucket memory structure. Also includes replacing pkstr.h with pk.h's pkstr
Diffstat (limited to 'src/level-types.hpp')
-rw-r--r--src/level-types.hpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/level-types.hpp b/src/level-types.hpp
index 42c169b..a70282f 100644
--- a/src/level-types.hpp
+++ b/src/level-types.hpp
@@ -2,17 +2,16 @@
#define PKE_LEVEL_TYPES_HPP
#include "array.hpp"
-#include "macros.hpp"
-#include "memory-type-defs.hpp"
+#include "vendor/pk.h"
#include "camera.hpp"
#include "components.hpp"
-TypeSafeInt_Const_Expr(LevelHandle, uint16_t, 0xFFFF);
+TypeSafeInt_constexpr(LevelHandle, uint16_t, 0xFFFF);
struct LvlCamArr : public PkeArray<CameraHandle> { };
struct PkeLevel : public Entity_Base {
- MemBucket *bkt = nullptr;
+ struct pk_membucket *bkt = nullptr;
char name[16] = {'\0'};
LevelHandle levelHandle = LevelHandle_MAX;
LvlCamArr cameras;