projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
workshop ready
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.h
diff --git
a/entity.h
b/entity.h
index a92f4bf1055d96d1fadb50d0c57e6f9280409bde..1de6f7026b62379c7f80092ecc6550849e5723c7 100644
(file)
--- a/
entity.h
+++ b/
entity.h
@@
-24,6
+24,7
@@
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;
enum entity_alias{
k_ent_none = 0,
enum entity_alias{
k_ent_none = 0,
@@
-41,7
+42,8
@@
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
};
static u32 mdl_entity_id_type( u32 entity_id )
};
static u32 mdl_entity_id_type( u32 entity_id )
@@
-96,7
+98,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];
@@
-215,12
+218,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{
@@
-297,6
+324,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 )
{
@@
-351,5
+383,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 */