diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/editor/properties.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/editor/properties.h b/src/editor/properties.h index d4fc3bb..5481e60 100644 --- a/src/editor/properties.h +++ b/src/editor/properties.h @@ -87,6 +87,7 @@ struct EPROP_ENTRY { }; // editor map object +#pragma pack(push, 4) struct EOBJECT { LIST<EPROP_ENTRY> eprops{}; }; @@ -187,14 +188,14 @@ struct EDITOR_PROP { U64 dataoff; U64 parentoff; - U8 type; STR displayname; F64 min{ -INFINITY }; F64 max{ INFINITY }; F32 step; - U8 readonly; FNV1A hash; U32 size; + U8 readonly; + U8 type; template <typename T> struct __eprop_type { static const U8 type = EPROP_INVALID; @@ -222,6 +223,7 @@ struct EDITOR_PROP { template <> struct __eprop_type<struct MAP_VERTEX> { static const U8 type = EPROP_VERTEX; }; template <> struct __eprop_type<LIST<struct MAP_VERTEX>> { static const U8 type = EPROP_VERTEX_LIST; }; }; +#pragma pack(pop) inline EDITOR_PROP* eprop_from_ref( EOBJECT* obj, EPROP_ENTRY e ) { return (EDITOR_PROP*)( (U64)obj + e.offset ); |