X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=c39d22400bff0d2c710967f0259f3bef64bd1b20;hb=dd7d6eb0702cd9a0c97ab6da9ec577af0b797b88;hp=9e0424fc8704684d1abfde4bbc429e70bfca7593;hpb=188685bc8454ff40b733d9e9df8da45e3c2e2c39;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 9e0424f..c39d224 100644
--- a/entity.h
+++ b/entity.h
@@ -26,10 +26,12 @@ 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_objective ent_objective;
 typedef struct ent_challenge ent_challenge;
-typedef struct ent_unlock ent_unlock;
 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,
@@ -50,14 +52,15 @@ enum entity_alias{
    k_ent_menuitem    = 15,
    k_ent_worldinfo   = 16,
    k_ent_ccmd        = 17,
-   k_ent_challenge   = 18,
-   k_ent_unlock      = 19,
+   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{
@@ -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 {
@@ -241,9 +247,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{
@@ -269,6 +277,11 @@ struct ent_skateshop{
              id_info;
       }
       worlds;
+
+      struct{
+         u32 id_lever;
+      }
+      server;
    };
 };
 
@@ -298,7 +311,15 @@ enum ent_menuitem_type{
    k_ent_menuitem_type_page_button  = 2,
    k_ent_menuitem_type_toggle       = 3,
    k_ent_menuitem_type_slider       = 4,
-   k_ent_menuitem_type_page         = 5
+   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
+};
+
+enum ent_menuitem_stack_behaviour{
+   k_ent_menuitem_stack_append  = 0,
+   k_ent_menuitem_stack_replace = 1
 };
 
 typedef struct ent_menuitem ent_menuitem;
@@ -317,6 +338,11 @@ struct ent_menuitem{
    };
 
    union{
+      struct{
+         u32 pstr_name;
+      }
+      visual;
+
       struct{
          u32 id_min,    /* ent_marker */
              id_max,    /* . */
@@ -326,7 +352,8 @@ struct ent_menuitem{
       slider;
 
       struct{
-         u32 pstr;
+         u32 pstr,
+             stack_behaviour;
       }
       button;
 
@@ -343,15 +370,22 @@ struct ent_menuitem{
              id_viewpoint;   /* ent_camera */
       }
       page;
+
+      struct{
+         u32 pstr_bind,
+             font_variant;
+      }
+      binding;
    };
 };
 
 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++ ){
@@ -401,33 +435,35 @@ struct ent_ccmd{
    u32 pstr_command;
 };
 
-enum ent_challenge_filter{
-   k_ent_challenge_filter_none            = 0x00000000,
-   k_ent_challenge_filter_trick_shuvit    = 0x00000001,
-   k_ent_challenge_filter_trick_kickflip  = 0x00000002,
-   k_ent_challenge_filter_trick_treflip   = 0x00000004,
-   k_ent_challenge_filter_trick_any       = 
-      k_ent_challenge_filter_trick_shuvit|
-      k_ent_challenge_filter_trick_treflip|
-      k_ent_challenge_filter_trick_kickflip,
-   k_ent_challenge_filter_flip_back       = 0x00000008,
-   k_ent_challenge_filter_flip_front      = 0x00000010,
-   k_ent_challenge_filter_flip_any        =
-      k_ent_challenge_filter_flip_back|
-      k_ent_challenge_filter_flip_front,
-   k_ent_challenge_filter_grind_truck_any = 0x00000020,
-   k_ent_challenge_filter_grind_board_any = 0x00000040,
-   k_ent_challenge_filter_grind_any       =
-      k_ent_challenge_filter_grind_truck_any|
-      k_ent_challenge_filter_grind_board_any,
-   k_ent_challenge_filter_footplant       = 0x00000080
-};
-
-enum ent_challenge_flag {
-   k_ent_challenge_hidden = 0x1
-};
-
-struct ent_challenge{
+enum ent_objective_filter{
+   k_ent_objective_filter_none            = 0x00000000,
+   k_ent_objective_filter_trick_shuvit    = 0x00000001,
+   k_ent_objective_filter_trick_kickflip  = 0x00000002,
+   k_ent_objective_filter_trick_treflip   = 0x00000004,
+   k_ent_objective_filter_trick_any       = 
+      k_ent_objective_filter_trick_shuvit|
+      k_ent_objective_filter_trick_treflip|
+      k_ent_objective_filter_trick_kickflip,
+   k_ent_objective_filter_flip_back       = 0x00000008,
+   k_ent_objective_filter_flip_front      = 0x00000010,
+   k_ent_objective_filter_flip_any        =
+      k_ent_objective_filter_flip_back|
+      k_ent_objective_filter_flip_front,
+   k_ent_objective_filter_grind_truck_any = 0x00000020,
+   k_ent_objective_filter_grind_board_any = 0x00000040,
+   k_ent_objective_filter_grind_any       =
+      k_ent_objective_filter_grind_truck_any|
+      k_ent_objective_filter_grind_board_any,
+   k_ent_objective_filter_footplant       = 0x00000080,
+   k_ent_objective_filter_passthrough     = 0x00000100
+};
+
+enum ent_objective_flag {
+   k_ent_objective_hidden = 0x1,
+   k_ent_objective_passed = 0x2
+};
+
+struct ent_objective{
    mdl_transform transform;
    u32 submesh_start,
        submesh_count,
@@ -439,10 +475,20 @@ struct ent_challenge{
    f32 time_limit;
 };
 
-struct ent_unlock{
+enum ent_challenge_flag {
+   k_ent_challenge_timelimit = 0x1
+};
+
+struct ent_challenge{
+   mdl_transform transform;
    u32 pstr_alias,
+       flags,
        target,
        target_event,
+       reset,
+       reset_event,
+       first,
+       camera,
        status;
 };
 
@@ -462,7 +508,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 */