projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch to entity list
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.h
diff --git
a/entity.h
b/entity.h
index 487c4d390042104ca7fa133922fd7419c9840ee7..05294f3b58809d3c800f7af03623d849370487c8 100644
(file)
--- a/
entity.h
+++ b/
entity.h
@@
-47,7
+47,8
@@
enum entity_alias{
k_ent_menuitem = 15,
k_ent_worldinfo = 16,
k_ent_ccmd = 17,
k_ent_menuitem = 15,
k_ent_worldinfo = 16,
k_ent_ccmd = 17,
- k_ent_challenge = 18
+ k_ent_challenge = 18,
+ k_ent_relay = 19
};
static u32 mdl_entity_id_type( u32 entity_id ){
};
static u32 mdl_entity_id_type( u32 entity_id ){
@@
-171,7
+172,7
@@
struct ent_audio_clip{
union{
mdl_file file;
audio_clip clip;
union{
mdl_file file;
audio_clip clip;
- };
+ }
_
;
float probability;
};
float probability;
};
@@
-184,18
+185,17
@@
struct volume_trigger{
u32 event, blank;
};
u32 event, blank;
};
-enum
volume_subtype
{
- k_
volume_subtype_trigger
,
- k_
volume_subtype_particle
+enum
ent_volume_flag
{
+ k_
ent_volume_flag_particles = 0x1
,
+ k_
ent_volume_flag_disabled = 0x2
};
struct ent_volume{
mdl_transform transform;
m4x3f to_world, to_local;
};
struct ent_volume{
mdl_transform transform;
m4x3f to_world, to_local;
- u32
type
;
+ u32
flags
;
u32 target;
u32 target;
-
union{
volume_trigger trigger;
volume_particles particles;
union{
volume_trigger trigger;
volume_particles particles;
@@
-386,6
+386,7
@@
struct ent_challenge{
submesh_count,
id_next,
filter;
submesh_count,
id_next,
filter;
+ f32 time_limit;
};
typedef struct ent_call ent_call;
};
typedef struct ent_call ent_call;