projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup unused files
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.h
diff --git
a/entity.h
b/entity.h
index cab16c84ee2bb11ebbf075e5eaa94de58d6a1453..1c11f38ce3ec3544d7c82ac935df6f71c09463ca 100644
(file)
--- a/
entity.h
+++ b/
entity.h
@@
-31,6
+31,8
@@
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;
+typedef struct ent_region ent_region;
enum entity_alias{
k_ent_none = 0,
enum entity_alias{
k_ent_none = 0,
@@
-55,7
+57,10
@@
enum entity_alias{
k_ent_challenge = 19,
k_ent_relay = 20,
k_ent_cubemap = 21,
k_ent_challenge = 19,
k_ent_relay = 20,
k_ent_cubemap = 21,
- k_ent_miniworld = 22
+ k_ent_miniworld = 22,
+ k_ent_prop = 23,
+ k_ent_list = 24,
+ k_ent_region = 25
};
static u32 mdl_entity_id_type( u32 entity_id ){
};
static u32 mdl_entity_id_type( u32 entity_id ){
@@
-72,7
+77,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{
@@
-111,11
+117,13
@@
enum gate_type{
/* v102+ */
enum ent_gate_flag{
k_ent_gate_linked = 0x1, /* this is a working portal */
/* v102+ */
enum ent_gate_flag{
k_ent_gate_linked = 0x1, /* this is a working portal */
- k_ent_gate_nonlocal
_DELETED
= 0x2, /* use the key string to link this portal.
+ k_ent_gate_nonlocal
= 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 */
k_ent_gate_locked = 0x10,/* has to be unlocked to be useful */
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 */
k_ent_gate_locked = 0x10,/* has to be unlocked to be useful */
+
+ k_ent_gate_clean_pass = 0x20,/* player didn't rewind while getting here */
};
struct ent_gate{
};
struct ent_gate{
@@
-160,12
+168,23
@@
struct ent_checkpoint{
u16 gate_index,
path_start,
path_count;
u16 gate_index,
path_start,
path_count;
+
+ /* EXTENSION */
+ f32 best_time;
+};
+
+enum ent_route_flag {
+ k_ent_route_flag_achieve_silver = 0x1,
+ k_ent_route_flag_achieve_gold = 0x2,
+
+ k_ent_route_flag_out_of_zone = 0x10,
+ k_ent_region_flag_hasname = 0x20
};
struct ent_route{
union{
mdl_transform transform;
};
struct ent_route{
union{
mdl_transform transform;
- u32 official_track_id;
+ u32 official_track_id;
/* TODO: remove this */
}
anon;
}
anon;
@@
-185,6
+204,13
@@
struct ent_route{
f64 timing_base;
u32 id_camera; /* v103+ */
f64 timing_base;
u32 id_camera; /* v103+ */
+
+ /* v104+, but always accessible */
+ u32 flags;
+ f64 best_laptime;
+ f32 ui_stopper, ui_residual;
+
+ ui_px ui_first_block_width, ui_residual_block_w;
};
struct ent_water{
};
struct ent_water{
@@
-207,7
+233,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 {
@@
-245,9
+271,11
@@
struct ent_marker{
};
enum skateshop_type{
};
enum skateshop_type{
- k_skateshop_type_boardshop,
- k_skateshop_type_charshop,
- k_skateshop_type_worldshop,
+ k_skateshop_type_boardshop = 0,
+ k_skateshop_type_charshop = 1,
+ k_skateshop_type_worldshop = 2,
+ k_skateshop_type_DELETED = 3,
+ k_skateshop_type_server = 4
};
struct ent_skateshop{
};
struct ent_skateshop{
@@
-273,6
+301,11
@@
struct ent_skateshop{
id_info;
}
worlds;
id_info;
}
worlds;
+
+ struct{
+ u32 id_lever;
+ }
+ server;
};
};
};
};
@@
-374,6
+407,7
@@
struct ent_worldinfo{
u32 pstr_name, pstr_author, pstr_desc;
f32 timezone;
u32 pstr_skybox;
u32 pstr_name, pstr_author, pstr_desc;
f32 timezone;
u32 pstr_skybox;
+ u32 flags;
};
static ent_marker *ent_find_marker( mdl_context *mdl,
};
static ent_marker *ent_find_marker( mdl_context *mdl,
@@
-485,6
+519,7
@@
struct ent_challenge{
struct ent_relay {
u32 targets[4][2];
struct ent_relay {
u32 targets[4][2];
+ u32 targets_events[4];
};
struct ent_cubemap {
};
struct ent_cubemap {
@@
-502,8
+537,18
@@
struct ent_call{
struct ent_miniworld {
mdl_transform transform;
u32 pstr_world;
struct ent_miniworld {
mdl_transform transform;
u32 pstr_world;
+ u32 camera;
+ u32 proxy;
+};
- i32 purpose;
+struct ent_prop {
+ mdl_transform transform;
+ u32 submesh_start, submesh_count, flags, pstr_alias;
+};
+
+struct ent_region {
+ mdl_transform transform;
+ u32 submesh_start, submesh_count, pstr_title, flags, zone_volume;
};
#include "world.h"
};
#include "world.h"