X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=04237919605fde85772fe8ebae5a88593d58c46b;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=ce9424ab1f9ed46de28a4f76dbdc3f8aa9369c01;hpb=f252ecb6f870260e0e944579ef732b94d1ed0ebe;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index ce9424a..0423791 100644
--- a/entity.h
+++ b/entity.h
@@ -161,11 +161,11 @@ struct ent_checkpoint{
 };
 
 struct ent_route{
-
    union{
       mdl_transform transform;
       u32 official_track_id;
-   };
+   }
+   anon;
 
    u32 pstr_name;
    u16 checkpoints_start,
@@ -177,10 +177,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{
@@ -299,9 +301,16 @@ enum ent_menuitem_type{
    k_ent_menuitem_type_toggle       = 3,
    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
 };
 
+enum ent_menuitem_stack_behaviour{
+   k_ent_menuitem_stack_append  = 0,
+   k_ent_menuitem_stack_replace = 1
+};
+
 typedef struct ent_menuitem ent_menuitem;
 struct ent_menuitem{
    u32 type, groups, 
@@ -332,7 +341,8 @@ struct ent_menuitem{
       slider;
 
       struct{
-         u32 pstr;
+         u32 pstr,
+             stack_behaviour;
       }
       button;
 
@@ -349,6 +359,12 @@ struct ent_menuitem{
              id_viewpoint;   /* ent_camera */
       }
       page;
+
+      struct{
+         u32 pstr_bind,
+             font_variant;
+      }
+      binding;
    };
 };
 
@@ -357,7 +373,7 @@ struct ent_worldinfo{
    f32 timezone;
 };
 
-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++ ){
@@ -481,6 +497,6 @@ struct ent_call{
 };
 
 #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 */