X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=612ad61ec27e8239ecbc3eda1f11aff8c3a7e1ef;hb=ca1798f62b65b72703e960d132dd0170728b7709;hp=06b2c6e19e8bfd510d18d6cae6dfab7b23eabedf;hpb=53597f45307d8a2120e3a0bbe71797b216e8750b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 06b2c6e..612ad61 100644
--- a/entity.h
+++ b/entity.h
@@ -30,6 +30,8 @@ typedef struct ent_objective ent_objective;
 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,
@@ -53,11 +55,12 @@ enum entity_alias{
    k_ent_objective   = 18,
    k_ent_challenge   = 19,
    k_ent_relay       = 20,
-   k_ent_cubemap     = 21
+   k_ent_cubemap     = 21,
+   k_ent_miniworld   = 22
 };
 
 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 ){
@@ -70,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{
@@ -109,7 +113,7 @@ enum gate_type{
 /* 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.
+   k_ent_gate_nonlocal_DELETED = 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 */
@@ -161,11 +165,11 @@ struct ent_checkpoint{
 };
 
 struct ent_route{
-
    union{
       mdl_transform transform;
       u32 official_track_id;
-   };
+   }
+   anon;
 
    u32 pstr_name;
    u16 checkpoints_start,
@@ -177,10 +181,12 @@ struct ent_route{
    u16 active_checkpoint, 
        valid_checkpoints;
 
-   float factive;
+   f32 factive;
    m4x3f board_transform;
    mdl_submesh sm;
-   double timing_base;
+   f64 timing_base;
+
+   u32 id_camera; /* v103+ */
 };
 
 struct ent_water{
@@ -203,7 +209,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, blank;
+   u32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -300,6 +306,7 @@ enum ent_menuitem_type{
    k_ent_menuitem_type_slider       = 4,
    k_ent_menuitem_type_page         = 5,
    k_ent_menuitem_type_binding      = 6,
+   k_ent_menuitem_type_visual_nocol = 7,
    k_ent_menuitem_type_disabled     = 90
 };
 
@@ -368,9 +375,10 @@ struct ent_menuitem{
 struct ent_worldinfo{
    u32 pstr_name, pstr_author, pstr_desc;
    f32 timezone;
+   u32 pstr_skybox;
 };
 
-VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
+static ent_marker *ent_find_marker( mdl_context *mdl,
                                        mdl_array_ptr *arr, const char *alias )
 {
    for( u32 i=0; i<mdl_arrcount(arr); i++ ){
@@ -493,7 +501,19 @@ struct ent_call{
    void *data;
 };
 
+struct ent_miniworld {
+   mdl_transform transform;
+   u32 pstr_world;
+   u32 camera;
+   u32 proxy;
+};
+
+struct ent_prop {
+   mdl_transform transform;
+   u32 submesh_start, submesh_count, flags;
+};
+
 #include "world.h"
-VG_STATIC void entity_call( world_instance *world, ent_call *call );
+static void entity_call( world_instance *world, ent_call *call );
 
 #endif /* ENTITY_H */