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 6e30ef219ec96a5b0080eec52fe2e9d7f18dec9f..05294f3b58809d3c800f7af03623d849370487c8 100644
(file)
--- a/
entity.h
+++ b/
entity.h
@@
-24,6
+24,9
@@
typedef struct ent_glyph ent_glyph;
typedef struct ent_skateshop ent_skateshop;
typedef struct ent_camera ent_camera;
typedef struct ent_swspreview ent_swspreview;
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,
enum entity_alias{
k_ent_none = 0,
@@
-41,21
+44,22
@@
enum entity_alias{
k_ent_skateshop = 12,
k_ent_camera = 13,
k_ent_swspreview = 14,
k_ent_skateshop = 12,
k_ent_camera = 13,
k_ent_swspreview = 14,
- k_ent_menuitem = 15
+ k_ent_menuitem = 15,
+ k_ent_worldinfo = 16,
+ k_ent_ccmd = 17,
+ 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 ){
return (entity_id & 0xffff0000) >> 16;
}
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;
}
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);
}
return (type & 0xfffff)<<16 | (index & 0xfffff);
}
@@
-96,7
+100,8
@@
enum gate_type{
struct ent_gate{
u32 type,
struct ent_gate{
u32 type,
- target;
+ target,
+ key;
v3f dimensions,
co[2];
v3f dimensions,
co[2];
@@
-167,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;
};
@@
-180,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;
@@
-215,12
+219,36
@@
struct ent_marker{
u32 pstr_alias;
};
u32 pstr_alias;
};
+enum skateshop_type{
+ k_skateshop_type_boardshop,
+ k_skateshop_type_charshop,
+ k_skateshop_type_worldshop
+};
+
struct ent_skateshop{
mdl_transform transform;
struct ent_skateshop{
mdl_transform transform;
- u32 id_display,
- id_info,
- id_rack,
- id_camera;
+ u32 type, id_camera;
+
+ union{
+ struct{
+ u32 id_display,
+ id_info,
+ id_rack;
+ }
+ boards;
+
+ struct{
+ u32 id_display,
+ id_info;
+ }
+ character;
+
+ struct{
+ u32 id_display,
+ id_info;
+ }
+ worlds;
+ };
};
struct ent_swspreview{
};
struct ent_swspreview{
@@
-256,10
+284,17
@@
typedef struct ent_menuitem ent_menuitem;
struct ent_menuitem{
u32 type, groups,
id_links[4]; /* ent_menuitem */
struct ent_menuitem{
u32 type, groups,
id_links[4]; /* ent_menuitem */
+ f32 factive, fvisible;
mdl_transform transform;
u32 submesh_start, submesh_count;
mdl_transform transform;
u32 submesh_start, submesh_count;
+ union{ u64 _u64; /* force storage for 64bit pointers */
+ i32 *pi32;
+ f32 *pf32;
+ void *pvoid;
+ };
+
union{
struct{
u32 id_min, /* ent_marker */
union{
struct{
u32 id_min, /* ent_marker */
@@
-277,6
+312,7
@@
struct ent_menuitem{
struct{
u32 id_check, /* ent_menuitem */
pstr_data;
struct{
u32 id_check, /* ent_menuitem */
pstr_data;
+ v3f offset; /* relative to parent */
}
checkmark;
}
checkmark;
@@
-289,6
+325,11
@@
struct ent_menuitem{
};
};
};
};
+struct ent_worldinfo{
+ u32 pstr_name, pstr_author, pstr_desc;
+ f32 timezone;
+};
+
VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
mdl_array_ptr *arr, const char *alias )
{
VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
mdl_array_ptr *arr, const char *alias )
{
@@
-335,6
+376,18
@@
struct ent_glyph{
indice_count;
};
indice_count;
};
+struct ent_ccmd{
+ u32 pstr_command;
+};
+
+struct ent_challenge{
+ mdl_transform transform;
+ u32 submesh_start,
+ submesh_count,
+ id_next,
+ filter;
+ f32 time_limit;
+};
typedef struct ent_call ent_call;
struct ent_call{
typedef struct ent_call ent_call;
struct ent_call{
@@
-343,5
+396,6
@@
struct ent_call{
};
#include "world.h"
};
#include "world.h"
+VG_STATIC void entity_call( world_instance *world, ent_call *call );
#endif /* ENTITY_H */
#endif /* ENTITY_H */