switch to entity list

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index 7143a4130aaccadaa905fa55eaceebf664785f6a..05294f3b58809d3c800f7af03623d849370487c8 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -26,6 +26,7 @@ typedef struct ent_camera ent_camera;
 typedef struct ent_swspreview ent_swspreview;
 typedef struct ent_worldinfo ent_worldinfo;
 typedef struct ent_ccmd ent_ccmd;
+typedef struct ent_challenge ent_challenge;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -45,7 +46,9 @@ enum entity_alias{
    k_ent_swspreview  = 14,
    k_ent_menuitem    = 15,
    k_ent_worldinfo   = 16,
-   k_ent_ccmd        = 17
+   k_ent_ccmd        = 17,
+   k_ent_challenge   = 18,
+   k_ent_relay       = 19
 };
 
 static u32 mdl_entity_id_type( u32 entity_id ){
@@ -169,7 +172,7 @@ struct ent_audio_clip{
    union{
       mdl_file file;
       audio_clip clip;
-   };
+   }_;
 
    float probability;
 };
@@ -182,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;
@@ -378,6 +380,15 @@ struct ent_ccmd{
    u32 pstr_command;
 };
 
+struct ent_challenge{
+   mdl_transform transform;
+   u32 submesh_start,
+       submesh_count,
+       id_next,
+       filter;
+   f32 time_limit;
+};
+
 typedef struct ent_call ent_call;
 struct ent_call{
    u32 id, function;