projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sit_t animator exchange
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.h
diff --git
a/entity.h
b/entity.h
index 06b2c6e19e8bfd510d18d6cae6dfab7b23eabedf..04237919605fde85772fe8ebae5a88593d58c46b 100644
(file)
--- a/
entity.h
+++ b/
entity.h
@@
-161,11
+161,11
@@
struct ent_checkpoint{
};
struct ent_route{
};
struct ent_route{
-
union{
mdl_transform transform;
u32 official_track_id;
union{
mdl_transform transform;
u32 official_track_id;
- };
+ }
+ anon;
u32 pstr_name;
u16 checkpoints_start,
u32 pstr_name;
u16 checkpoints_start,
@@
-177,10
+177,12
@@
struct ent_route{
u16 active_checkpoint,
valid_checkpoints;
u16 active_checkpoint,
valid_checkpoints;
- f
loat
factive;
+ f
32
factive;
m4x3f board_transform;
mdl_submesh sm;
m4x3f board_transform;
mdl_submesh sm;
- double timing_base;
+ f64 timing_base;
+
+ u32 id_camera; /* v103+ */
};
struct ent_water{
};
struct ent_water{
@@
-300,6
+302,7
@@
enum ent_menuitem_type{
k_ent_menuitem_type_slider = 4,
k_ent_menuitem_type_page = 5,
k_ent_menuitem_type_binding = 6,
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
};
k_ent_menuitem_type_disabled = 90
};
@@
-370,7
+373,7
@@
struct ent_worldinfo{
f32 timezone;
};
f32 timezone;
};
-
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++ ){
mdl_array_ptr *arr, const char *alias )
{
for( u32 i=0; i<mdl_arrcount(arr); i++ ){
@@
-494,6
+497,6
@@
struct ent_call{
};
#include "world.h"
};
#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 */
#endif /* ENTITY_H */