refactor (reduction)

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index 6faa7d99e786a881ee97c4c2bb7eaea4df2699b2..22ee913c6a6199ff938aa14793ad5c41cee3f1fa 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -298,7 +298,14 @@ 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_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 +324,11 @@ struct ent_menuitem{
    };
 
    union{
+      struct{
+         u32 pstr_name;
+      }
+      visual;
+
       struct{
          u32 id_min,    /* ent_marker */
              id_max,    /* . */
@@ -326,7 +338,8 @@ struct ent_menuitem{
       slider;
 
       struct{
-         u32 pstr;
+         u32 pstr,
+             stack_behaviour;
       }
       button;
 
@@ -343,6 +356,12 @@ struct ent_menuitem{
              id_viewpoint;   /* ent_camera */
       }
       page;
+
+      struct{
+         u32 pstr_bind,
+             font_variant;
+      }
+      binding;
    };
 };
 
@@ -351,7 +370,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++ ){
@@ -425,7 +444,8 @@ enum ent_objective_filter{
 };
 
 enum ent_objective_flag {
-   k_ent_objective_hidden = 0x1
+   k_ent_objective_hidden = 0x1,
+   k_ent_objective_passed = 0x2
 };
 
 struct ent_objective{
@@ -474,6 +494,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 */