X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=3fd3508eef3358ff47766b73ef2ad11cc0dddbc0;hb=cab063a27c067f6b5387305fe358c94fc7793f45;hp=72a666744a4d30bd264b03615e924ac5206a7bf9;hpb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 72a6667..3fd3508 100644
--- a/entity.h
+++ b/entity.h
@@ -31,6 +31,7 @@ typedef struct ent_challenge ent_challenge;
 typedef struct ent_relay ent_relay;
 typedef struct ent_cubemap ent_cubemap;
 typedef struct ent_miniworld ent_miniworld;
+typedef struct ent_prop ent_prop;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -59,7 +60,7 @@ enum entity_alias{
 };
 
 static u32 mdl_entity_id_type( u32 entity_id ){
-   return (entity_id & 0xffff0000) >> 16;
+   return (entity_id & 0x0fff0000) >> 16;
 }
 
 static u32 mdl_entity_id_id( u32 entity_id ){
@@ -72,7 +73,8 @@ static u32 mdl_entity_id( u32 type, u32 index ){
 
 enum entity_function{
    k_ent_function_trigger,
-   k_ent_function_particle_spawn
+   k_ent_function_particle_spawn,
+   k_ent_function_trigger_leave
 };
 
 struct ent_spawn{
@@ -111,11 +113,13 @@ enum gate_type{
 /* v102+ */
 enum ent_gate_flag{
    k_ent_gate_linked      = 0x1, /* this is a working portal */
-   k_ent_gate_nonlocal_DELETED = 0x2, /* use the key string to link this 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 */
+
+   k_ent_gate_clean_pass  = 0x20,/* player didn't rewind while getting here */
 };
 
 struct ent_gate{
@@ -185,6 +189,10 @@ struct ent_route{
    f64 timing_base;
 
    u32 id_camera; /* v103+ */
+
+   /* v104+, but always accessible */
+   u32 achievment_status;
+   f64 best_laptime;
 };
 
 struct ent_water{
@@ -207,7 +215,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, blank;
+   u32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -245,9 +253,11 @@ struct ent_marker{
 };
 
 enum skateshop_type{
-   k_skateshop_type_boardshop,
-   k_skateshop_type_charshop,
-   k_skateshop_type_worldshop,
+   k_skateshop_type_boardshop = 0,
+   k_skateshop_type_charshop = 1,
+   k_skateshop_type_worldshop = 2,
+   k_skateshop_type_DELETED = 3,
+   k_skateshop_type_server = 4
 };
 
 struct ent_skateshop{
@@ -273,6 +283,11 @@ struct ent_skateshop{
              id_info;
       }
       worlds;
+
+      struct{
+         u32 id_lever;
+      }
+      server;
    };
 };
 
@@ -373,6 +388,7 @@ struct ent_menuitem{
 struct ent_worldinfo{
    u32 pstr_name, pstr_author, pstr_desc;
    f32 timezone;
+   u32 pstr_skybox;
 };
 
 static ent_marker *ent_find_marker( mdl_context *mdl,
@@ -501,8 +517,13 @@ struct ent_call{
 struct ent_miniworld {
    mdl_transform transform;
    u32 pstr_world;
+   u32 camera;
+   u32 proxy;
+};
 
-   i32 purpose;
+struct ent_prop {
+   mdl_transform transform;
+   u32 submesh_start, submesh_count, flags;
 };
 
 #include "world.h"