review save method

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index bf6b2d5b776655dc7242ffa4f7b83a86b63a1d8d..ae9d63bd45f7aa442b41779d7d1d6d919792c648 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -24,6 +24,11 @@ typedef struct ent_glyph ent_glyph;
 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;
+typedef struct ent_unlock ent_unlock;
+typedef struct ent_relay ent_relay;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -41,21 +46,23 @@ enum entity_alias{
    k_ent_skateshop   = 12,
    k_ent_camera      = 13,
    k_ent_swspreview  = 14,
-   k_ent_menuitem    = 15
+   k_ent_menuitem    = 15,
+   k_ent_worldinfo   = 16,
+   k_ent_ccmd        = 17,
+   k_ent_challenge   = 18,
+   k_ent_unlock      = 19,
+   k_ent_relay       = 20
 };
 
-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);
 }
 
@@ -87,16 +94,30 @@ 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,
-       target;
+   u32 flags,
+       target, 
+       key;
 
    v3f dimensions,
        co[2];
@@ -117,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{
@@ -167,7 +191,7 @@ struct ent_audio_clip{
    union{
       mdl_file file;
       audio_clip clip;
-   };
+   }_;
 
    float probability;
 };
@@ -180,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;
@@ -217,7 +240,8 @@ struct ent_marker{
 
 enum skateshop_type{
    k_skateshop_type_boardshop,
-   k_skateshop_type_charshop
+   k_skateshop_type_charshop,
+   k_skateshop_type_worldshop
 };
 
 struct ent_skateshop{
@@ -237,6 +261,12 @@ struct ent_skateshop{
              id_info;
       }
       character;
+
+      struct{
+         u32 id_display,
+             id_info;
+      }
+      worlds;
    };
 };
 
@@ -314,6 +344,11 @@ struct ent_menuitem{
    };
 };
 
+struct ent_worldinfo{
+   u32 pstr_name, pstr_author, pstr_desc;
+   f32 timezone;
+};
+
 VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
                                        mdl_array_ptr *arr, const char *alias )
 {
@@ -360,6 +395,31 @@ 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,
+       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;
 struct ent_call{
@@ -368,5 +428,6 @@ struct ent_call{
 };
 
 #include "world.h"
+VG_STATIC void entity_call( world_instance *world, ent_call *call );
 
 #endif /* ENTITY_H */