X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=487c4d390042104ca7fa133922fd7419c9840ee7;hb=ca35eceae3abfcfb9ba266d6ea8e664bc06b0a3e;hp=a14314a0ead9dea344529ae0ce668856a1f25565;hpb=e5d79dc0355e04baecce8908e29b8e7569d1e857;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index a14314a..487c4d3 100644
--- a/entity.h
+++ b/entity.h
@@ -25,6 +25,8 @@ typedef struct ent_skateshop ent_skateshop;
 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_challenge ent_challenge;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -43,21 +45,20 @@ enum entity_alias{
    k_ent_camera      = 13,
    k_ent_swspreview  = 14,
    k_ent_menuitem    = 15,
-   k_ent_worldinfo   = 16
+   k_ent_worldinfo   = 16,
+   k_ent_ccmd        = 17,
+   k_ent_challenge   = 18
 };
 
-static u32 mdl_entity_id_type( u32 entity_id )
-{
+static u32 mdl_entity_id_type( u32 entity_id ){
    return (entity_id & 0xffff0000) >> 16;
 }
 
-static u32 mdl_entity_id_id( u32 entity_id )
-{
+static u32 mdl_entity_id_id( u32 entity_id ){
    return entity_id & 0x0000ffff;
 }
 
-static u32 mdl_entity_id( u32 type, u32 index )
-{
+static u32 mdl_entity_id( u32 type, u32 index ){
    return (type & 0xfffff)<<16 | (index & 0xfffff);
 }
 
@@ -98,7 +99,8 @@ enum gate_type{
 
 struct ent_gate{
    u32 type,
-       target;
+       target, 
+       key;
 
    v3f dimensions,
        co[2];
@@ -219,7 +221,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{
@@ -239,6 +242,12 @@ struct ent_skateshop{
              id_info;
       }
       character;
+
+      struct{
+         u32 id_display,
+             id_info;
+      }
+      worlds;
    };
 };
 
@@ -367,6 +376,17 @@ struct ent_glyph{
        indice_count;
 };
 
+struct ent_ccmd{
+   u32 pstr_command;
+};
+
+struct ent_challenge{
+   mdl_transform transform;
+   u32 submesh_start,
+       submesh_count,
+       id_next,
+       filter;
+};
 
 typedef struct ent_call ent_call;
 struct ent_call{
@@ -375,5 +395,6 @@ struct ent_call{
 };
 
 #include "world.h"
+VG_STATIC void entity_call( world_instance *world, ent_call *call );
 
 #endif /* ENTITY_H */