From b2548ba4ce295fcd94a50123fb543fac2ef2bc33 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 14 Nov 2024 14:46:23 -0500 Subject: 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 --- src/level-types.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/level-types.hpp') 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 { }; struct PkeLevel : public Entity_Base { - MemBucket *bkt = nullptr; + struct pk_membucket *bkt = nullptr; char name[16] = {'\0'}; LevelHandle levelHandle = LevelHandle_MAX; LvlCamArr cameras; -- cgit v1.2.3