X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=ae9d63bd45f7aa442b41779d7d1d6d919792c648;hb=844527ec68c063d78d4993bd8e4053f9ddc47b78;hp=487c4d390042104ca7fa133922fd7419c9840ee7;hpb=a1b878e2cdbf145b59d611b5060d3c1a1a80d017;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 487c4d3..ae9d63b 100644
--- a/entity.h
+++ b/entity.h
@@ -27,6 +27,8 @@ typedef struct ent_swspreview ent_swspreview;
 typedef struct ent_worldinfo ent_worldinfo;
 typedef struct ent_ccmd ent_ccmd;
 typedef struct ent_challenge ent_challenge;
+typedef struct ent_unlock ent_unlock;
+typedef struct ent_relay ent_relay;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -47,7 +49,9 @@ 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_unlock      = 19,
+   k_ent_relay       = 20
 };
 
 static u32 mdl_entity_id_type( u32 entity_id ){
@@ -90,15 +94,28 @@ 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 */
+   k_ent_gate_locked      = 0x10,/* has to be unlocked to be useful */
+};
 
 struct ent_gate{
-   u32 type,
+   u32 flags,
        target, 
        key;
 
@@ -121,6 +138,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{
@@ -171,7 +191,7 @@ struct ent_audio_clip{
    union{
       mdl_file file;
       audio_clip clip;
-   };
+   }_;
 
    float probability;
 };
@@ -184,18 +204,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;
@@ -385,7 +404,21 @@ struct ent_challenge{
    u32 submesh_start,
        submesh_count,
        id_next,
-       filter;
+       filter,
+       id_win,
+       win_event;
+   f32 time_limit;
+};
+
+struct ent_unlock{
+   u32 pstr_alias,
+       target,
+       target_event,
+       status;
+};
+
+struct ent_relay {
+   u32 targets[4][2];
 };
 
 typedef struct ent_call ent_call;