projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process triggers on leave world
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.h
diff --git
a/entity.h
b/entity.h
index 72a666744a4d30bd264b03615e924ac5206a7bf9..bdb69f85593b01008d3793f267b4cff26fd3992f 100644
(file)
--- 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_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,
enum entity_alias{
k_ent_none = 0,
@@
-59,7
+60,7
@@
enum entity_alias{
};
static u32 mdl_entity_id_type( u32 entity_id ){
};
static u32 mdl_entity_id_type( u32 entity_id ){
- return (entity_id & 0x
f
fff0000) >> 16;
+ return (entity_id & 0x
0
fff0000) >> 16;
}
static u32 mdl_entity_id_id( u32 entity_id ){
}
static u32 mdl_entity_id_id( u32 entity_id ){
@@
-72,7
+73,8
@@
static u32 mdl_entity_id( u32 type, u32 index ){
enum entity_function{
k_ent_function_trigger,
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{
};
struct ent_spawn{
@@
-207,7
+209,7
@@
struct volume_particles{
};
struct volume_trigger{
};
struct volume_trigger{
- u32 event,
blank
;
+ u32 event,
event_leave
;
};
enum ent_volume_flag {
};
enum ent_volume_flag {
@@
-373,6
+375,7
@@
struct ent_menuitem{
struct ent_worldinfo{
u32 pstr_name, pstr_author, pstr_desc;
f32 timezone;
struct ent_worldinfo{
u32 pstr_name, pstr_author, pstr_desc;
f32 timezone;
+ u32 pstr_skybox;
};
static ent_marker *ent_find_marker( mdl_context *mdl,
};
static ent_marker *ent_find_marker( mdl_context *mdl,
@@
-503,6
+506,12
@@
struct ent_miniworld {
u32 pstr_world;
i32 purpose;
u32 pstr_world;
i32 purpose;
+ u32 proxy;
+};
+
+struct ent_prop {
+ mdl_transform transform;
+ u32 submesh_start, submesh_count, flags;
};
#include "world.h"
};
#include "world.h"