X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=bdb69f85593b01008d3793f267b4cff26fd3992f;hb=7f4c71033c06954f3094c9d51219628438b80ac8;hp=cab16c84ee2bb11ebbf075e5eaa94de58d6a1453;hpb=63fe317d7db724162561da52aa382c82ac3c29be;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/entity.h b/entity.h index cab16c8..bdb69f8 100644 --- a/entity.h +++ b/entity.h @@ -31,6 +31,7 @@ typedef struct ent_challenge ent_challenge; 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, @@ -72,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{ @@ -207,7 +209,7 @@ struct volume_particles{ }; struct volume_trigger{ - u32 event, blank; + u32 event, event_leave; }; enum ent_volume_flag { @@ -504,6 +506,12 @@ struct ent_miniworld { u32 pstr_world; i32 purpose; + u32 proxy; +}; + +struct ent_prop { + mdl_transform transform; + u32 submesh_start, submesh_count, flags; }; #include "world.h"