X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=da2341e5618149e1788acb63febdbb821607adf3;hb=6ab4435fb19beb6af6c52691793d5ca17a120f69;hp=1de6f7026b62379c7f80092ecc6550849e5723c7;hpb=342fcbf6fda017bdd38d56ce0fa7c9e59e589f3b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 1de6f70..da2341e 100644
--- a/entity.h
+++ b/entity.h
@@ -25,6 +25,8 @@ typedef struct ent_skateshop ent_skateshop;
 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,
@@ -43,21 +45,21 @@ enum entity_alias{
    k_ent_camera      = 13,
    k_ent_swspreview  = 14,
    k_ent_menuitem    = 15,
-   k_ent_worldinfo   = 16
+   k_ent_worldinfo   = 16,
+   k_ent_ccmd        = 17,
+   k_ent_challenge   = 18,
+   k_ent_relay       = 19
 };
 
-static u32 mdl_entity_id_type( u32 entity_id )
-{
+static u32 mdl_entity_id_type( u32 entity_id ){
    return (entity_id & 0xffff0000) >> 16;
 }
 
-static u32 mdl_entity_id_id( u32 entity_id )
-{
+static u32 mdl_entity_id_id( u32 entity_id ){
    return entity_id & 0x0000ffff;
 }
 
-static u32 mdl_entity_id( u32 type, u32 index )
-{
+static u32 mdl_entity_id( u32 type, u32 index ){
    return (type & 0xfffff)<<16 | (index & 0xfffff);
 }
 
@@ -89,15 +91,27 @@ struct ent_light{
    v2f angle_sin_cos;
 };
 
+/* v101 */
+#if 0
 enum gate_type{
    k_gate_type_unlinked = 0,
    k_gate_type_teleport = 1,
    k_gate_type_nonlocal_unlinked = 2,
    k_gate_type_nonlocel = 3
 };
+#endif
+
+/* v102+ */
+enum ent_gate_flag{
+   k_ent_gate_linked      = 0x1, /* this is a working portal */
+   k_ent_gate_nonlocal    = 0x2, /* use the key string to link this portal.
+                                       NOTE: if set, it adds the flip flag. */
+   k_ent_gate_flip        = 0x4, /* flip direction 180* for exiting portal */
+   k_ent_gate_custom_mesh = 0x8, /* use a custom submesh instead of default */
+};
 
 struct ent_gate{
-   u32 type,
+   u32 flags,
        target, 
        key;
 
@@ -120,6 +134,9 @@ struct ent_gate{
    double timing_time;
    u16 routes[4];       /* routes that pass through this gate */
    u8 route_count;
+
+   /* v102+ */
+   u32 submesh_start, submesh_count;
 };
 
 struct ent_route_node{
@@ -170,7 +187,7 @@ struct ent_audio_clip{
    union{
       mdl_file file;
       audio_clip clip;
-   };
+   }_;
 
    float probability;
 };
@@ -183,18 +200,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;
@@ -375,6 +391,18 @@ struct ent_glyph{
        indice_count;
 };
 
+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{