v4games
/
eco2d
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zpl-c/eco2d

efd/v1
DavoSK 2023-02-02 16:21:12 +01:00
parent 755f7e7a86 e8934ac2f3
commit f6d5c76d1b
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/foundation/src/models/components.h
View File

@ -143,8 +143,16 @@ typedef struct {
} Item;
typedef struct {
int spritesheet;
int frame;
union {
struct {
uint32_t spritesheet;
uint32_t frame;
};
struct {
uint32_t sprite_id;
uint32_t sprite_data;
};
};
} Sprite;
typedef struct {

1
code/foundation/src/world/entity_view.c
View File

@ -47,7 +47,6 @@ pkt_desc pkt_entity_view_desc[] = {
{ PKT_HALF(entity_view, progress_value) },
{ PKT_KEEP_IF(entity_view, kind, EKIND_SPRITE, 2) },
{ PKT_UINT(entity_view, spritesheet) },
{ PKT_UINT(entity_view, frame) },

12
code/foundation/src/world/entity_view.h
View File

@ -82,8 +82,16 @@ typedef struct entity_view {
float progress_value;
// sprite index
int spritesheet;
int frame;
union {
struct {
uint32_t spritesheet;
uint32_t frame;
};
struct {
uint32_t sprite_id;
uint32_t sprite_data;
};
};
// NOTE(zaklaus): inventory
uint8_t has_items;