X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=entity.h;h=05294f3b58809d3c800f7af03623d849370487c8;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=487c4d390042104ca7fa133922fd7419c9840ee7;hpb=a1b878e2cdbf145b59d611b5060d3c1a1a80d017;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 487c4d3..05294f3 100644
--- a/entity.h
+++ b/entity.h
@@ -47,7 +47,8 @@ enum entity_alias{
    k_ent_menuitem    = 15,
    k_ent_worldinfo   = 16,
    k_ent_ccmd        = 17,
-   k_ent_challenge   = 18
+   k_ent_challenge   = 18,
+   k_ent_relay       = 19
 };
 
 static u32 mdl_entity_id_type( u32 entity_id ){
@@ -171,7 +172,7 @@ struct ent_audio_clip{
    union{
       mdl_file file;
       audio_clip clip;
-   };
+   }_;
 
    float probability;
 };
@@ -184,18 +185,17 @@ struct volume_trigger{
    u32 event, blank;
 };
 
-enum volume_subtype{
-   k_volume_subtype_trigger,
-   k_volume_subtype_particle
+enum ent_volume_flag {
+   k_ent_volume_flag_particles = 0x1,
+   k_ent_volume_flag_disabled  = 0x2
 };
 
 struct ent_volume{
    mdl_transform transform;
    m4x3f to_world, to_local;
-   u32 type;
+   u32 flags;
 
    u32 target;
-
    union{
       volume_trigger trigger;
       volume_particles particles;
@@ -386,6 +386,7 @@ struct ent_challenge{
        submesh_count,
        id_next,
        filter;
+   f32 time_limit;
 };
 
 typedef struct ent_call ent_call;