fix long standing grind bug

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index bf6b2d5b776655dc7242ffa4f7b83a86b63a1d8d..1de6f7026b62379c7f80092ecc6550849e5723c7 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -24,6 +24,7 @@ typedef struct ent_glyph ent_glyph;
 typedef struct ent_skateshop ent_skateshop;
 typedef struct ent_camera ent_camera;
 typedef struct ent_swspreview ent_swspreview;
+typedef struct ent_worldinfo ent_worldinfo;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -41,7 +42,8 @@ enum entity_alias{
    k_ent_skateshop   = 12,
    k_ent_camera      = 13,
    k_ent_swspreview  = 14,
-   k_ent_menuitem    = 15
+   k_ent_menuitem    = 15,
+   k_ent_worldinfo   = 16
 };
 
 static u32 mdl_entity_id_type( u32 entity_id )
@@ -96,7 +98,8 @@ enum gate_type{
 
 struct ent_gate{
    u32 type,
-       target;
+       target, 
+       key;
 
    v3f dimensions,
        co[2];
@@ -217,7 +220,8 @@ struct ent_marker{
 
 enum skateshop_type{
    k_skateshop_type_boardshop,
-   k_skateshop_type_charshop
+   k_skateshop_type_charshop,
+   k_skateshop_type_worldshop
 };
 
 struct ent_skateshop{
@@ -237,6 +241,12 @@ struct ent_skateshop{
              id_info;
       }
       character;
+
+      struct{
+         u32 id_display,
+             id_info;
+      }
+      worlds;
    };
 };
 
@@ -314,6 +324,11 @@ struct ent_menuitem{
    };
 };
 
+struct ent_worldinfo{
+   u32 pstr_name, pstr_author, pstr_desc;
+   f32 timezone;
+};
+
 VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
                                        mdl_array_ptr *arr, const char *alias )
 {
@@ -368,5 +383,6 @@ struct ent_call{
 };
 
 #include "world.h"
+VG_STATIC void entity_call( world_instance *world, ent_call *call );
 
 #endif /* ENTITY_H */