projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic npc
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.h
diff --git
a/entity.h
b/entity.h
index a925318b92be649ec09725ce3a2112572474edc0..105f4496c78b2469d95e2b10c5959f52e6fe5e18 100644
(file)
--- a/
entity.h
+++ b/
entity.h
@@
-36,6
+36,7
@@
typedef struct ent_prop ent_prop;
typedef struct ent_region ent_region;
typedef struct ent_list ent_list;
typedef struct ent_glider ent_glider;
typedef struct ent_region ent_region;
typedef struct ent_list ent_list;
typedef struct ent_glider ent_glider;
+typedef struct ent_npc ent_npc;
enum entity_alias{
k_ent_none = 0,
enum entity_alias{
k_ent_none = 0,
@@
-64,7
+65,8
@@
enum entity_alias{
k_ent_prop = 23,
k_ent_list = 24,
k_ent_region = 25,
k_ent_prop = 23,
k_ent_list = 24,
k_ent_region = 25,
- k_ent_glider = 26
+ k_ent_glider = 26,
+ k_ent_npc = 27
};
static inline u32 mdl_entity_id_type( u32 entity_id )
};
static inline u32 mdl_entity_id_type( u32 entity_id )
@@
-557,5
+559,11
@@
struct ent_glider {
f32 cooldown;
};
f32 cooldown;
};
+struct ent_npc
+{
+ mdl_transform transform;
+ u32 id, context;
+};
+
#include "world.h"
void entity_call( world_instance *world, ent_call *call );
#include "world.h"
void entity_call( world_instance *world, ent_call *call );