X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=d96ddc997cd4b06630e3a6e9118426da0d389747;hb=71b7175073e0c764c3c5cb0c7ceee0f8cca09e58;hp=c39d22400bff0d2c710967f0259f3bef64bd1b20;hpb=dd7d6eb0702cd9a0c97ab6da9ec577af0b797b88;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index c39d224..d96ddc9 100644
--- a/entity.h
+++ b/entity.h
@@ -32,6 +32,7 @@ typedef struct ent_relay ent_relay;
 typedef struct ent_cubemap ent_cubemap;
 typedef struct ent_miniworld ent_miniworld;
 typedef struct ent_prop ent_prop;
+typedef struct ent_region ent_region;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -56,7 +57,10 @@ enum entity_alias{
    k_ent_challenge   = 19,
    k_ent_relay       = 20,
    k_ent_cubemap     = 21,
-   k_ent_miniworld   = 22
+   k_ent_miniworld   = 22,
+   k_ent_prop        = 23,
+   k_ent_list        = 24,
+   k_ent_region      = 25
 };
 
 static u32 mdl_entity_id_type( u32 entity_id ){
@@ -118,6 +122,8 @@ enum ent_gate_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{
@@ -162,12 +168,22 @@ struct ent_checkpoint{
    u16 gate_index,
        path_start,
        path_count;
+
+   /* EXTENSION */
+   f32 best_time;
+};
+
+enum ent_route_flag {
+   k_ent_route_flag_achieve_silver = 0x1,
+   k_ent_route_flag_achieve_gold   = 0x2,
+
+   k_ent_route_flag_out_of_zone    = 0x10
 };
 
 struct ent_route{
    union{
       mdl_transform transform;
-      u32 official_track_id;
+      u32 official_track_id;   /* TODO: remove this */
    }
    anon;
 
@@ -187,6 +203,13 @@ struct ent_route{
    f64 timing_base;
 
    u32 id_camera; /* v103+ */
+
+   /* v104+, but always accessible */
+   u32 flags;
+   f64 best_laptime;
+   f32 ui_stopper, ui_residual;
+
+   ui_px ui_first_block_width, ui_residual_block_w;
 };
 
 struct ent_water{
@@ -494,6 +517,7 @@ struct ent_challenge{
 
 struct ent_relay {
    u32 targets[4][2];
+   u32 targets_events[4];
 };
 
 struct ent_cubemap {
@@ -520,6 +544,11 @@ struct ent_prop {
    u32 submesh_start, submesh_count, flags;
 };
 
+struct ent_region {
+   mdl_transform transform;
+   u32 submesh_start, submesh_count, pstr_title, flags, zone_volume;
+};
+
 #include "world.h"
 static void entity_call( world_instance *world, ent_call *call );