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,
k_ent_objective = 18,
k_ent_challenge = 19,
k_ent_relay = 20,
- k_ent_cubemap = 21
+ k_ent_cubemap = 21,
+ k_ent_miniworld = 22
};
static u32 mdl_entity_id_type( u32 entity_id ){
- return (entity_id & 0xffff0000) >> 16;
+ return (entity_id & 0x0fff0000) >> 16;
}
static u32 mdl_entity_id_id( u32 entity_id ){
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{
/* v102+ */
enum ent_gate_flag{
k_ent_gate_linked = 0x1, /* this is a working portal */
- k_ent_gate_nonlocal = 0x2, /* use the key string to link this portal.
+ k_ent_gate_nonlocal_DELETED = 0x2, /* use the key string to link this portal.
NOTE: if set, it adds the flip flag. */
k_ent_gate_flip = 0x4, /* flip direction 180* for exiting portal */
k_ent_gate_custom_mesh = 0x8, /* use a custom submesh instead of default */
};
struct ent_route{
-
union{
mdl_transform transform;
u32 official_track_id;
- };
+ }
+ anon;
u32 pstr_name;
u16 checkpoints_start,
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{
};
struct volume_trigger{
- u32 event, blank;
+ u32 event, event_leave;
};
enum ent_volume_flag {
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,
slider;
struct{
- u32 pstr;
+ u32 pstr,
+ stack_behaviour;
}
button;
id_viewpoint; /* ent_camera */
}
page;
+
+ struct{
+ u32 pstr_bind,
+ font_variant;
+ }
+ binding;
};
};
struct ent_worldinfo{
u32 pstr_name, pstr_author, pstr_desc;
f32 timezone;
+ u32 pstr_skybox;
};
-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++ ){
void *data;
};
+struct ent_miniworld {
+ mdl_transform transform;
+ u32 pstr_world;
+
+ i32 purpose_DELTED;
+ u32 proxy;
+};
+
+struct ent_prop {
+ mdl_transform transform;
+ u32 submesh_start, submesh_count, flags;
+};
+
#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 */