hs

commit a6af23aa4467758aae01ec5e341e93e63a37f7b9
parent 62d48b5e3f366c629bc055f517ec9224c1fc41ea
Author: Samdal <samdal@protonmail.com>
Date:   Tue,  5 Oct 2021 13:17:17 +0200

more entity stuff

Diffstat:
M
hs_graphics.h
 | 
18
++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/hs_graphics.h b/hs_graphics.h
@@ -114,11 +114,11 @@ typedef struct {
 
 typedef struct {
         vec2 pos, half_size, frame_velocity;
-        uint32_t flags;
+        uint64_t flags;
+        hs_shader_program_tex sp;
 } entity2_hot;
 
 typedef struct {
-        hs_shader_program_tex* sp;
         vec2 external_velocity;
         float base_mov_speed, mov_speed_mul, fire_rate_mul, invisframe_mul;
         uint16_t max_hp, hp, armour;
@@ -134,11 +134,12 @@ enum entity2_flags {
         AABB_STATIC = 1 << 0,
         AABB_RIGID = 1 << 1,
         AABB_CHARACTHER = 1 << 2,
-        player = 1 << 3,
-        preblink = 1 << 4,
-        invisiframe = 1 << 5,
-        confusion = 1 << 6,
-        stunned = 1 << 7,
+        PLAYER = 1 << 3,
+        PREBLINK = 1 << 4,
+        INVISFRAME = 1 << 5,
+        CONFUSION = 1 << 6,
+        STUNNED = 1 << 7,
+        DISABLED = 1 << 8,
 };
 
 enum hs_key_state {
@@ -1264,7 +1265,8 @@ inline void
 hs_vobj_free(hs_vobj* vobj)
 {
         glDeleteVertexArrays(vobj->count, &vobj->vao);
-        glDeleteBuffers(vobj->count, &vobj->ebo);
+        if (vobj->ebo)
+                glDeleteBuffers(vobj->count, &vobj->ebo);
         glDeleteBuffers(vobj->count, &vobj->vbo);
         free(vobj);
 }