X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=80f4df7573fc7b62c440b9ba2cd29e4af024ddc4;hb=be5e25dee2c54c2a22ca3bbb5bbe0eb6149343be;hp=2874441a51b56b0cfccd440f72d4800d6a4e93eb;hpb=a109f126d8adab622e38fbcc2d4281e75255246a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 2874441..80f4df7 100644
--- a/entity.h
+++ b/entity.h
@@ -36,6 +36,26 @@ 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_npc ent_npc;
+
+typedef struct ent_call ent_call;
+struct ent_call{
+   u32 id;
+   i32 function;
+   void *data;
+};
+
+typedef enum entity_call_result entity_call_result;
+enum entity_call_result 
+{
+   k_entity_call_result_OK,
+   k_entity_call_result_unhandled,
+   k_entity_call_result_invalid
+};
+
+typedef enum entity_call_result 
+   (*fn_entity_call_handler)( world_instance *, ent_call *);
+
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -64,22 +84,27 @@ enum entity_alias{
    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 u32 mdl_entity_id_type( u32 entity_id ){
+static inline u32 mdl_entity_id_type( u32 entity_id )
+{
    return (entity_id & 0x0fff0000) >> 16;
 }
 
-static u32 mdl_entity_id_id( u32 entity_id ){
+static inline u32 mdl_entity_id_id( u32 entity_id )
+{
    return entity_id & 0x0000ffff;
 }
 
-static u32 mdl_entity_id( u32 type, u32 index ){
+static inline u32 mdl_entity_id( u32 type, u32 index )
+{
    return (type & 0xfffff)<<16 | (index & 0xfffff);
 }
 
-enum entity_function{
+enum entity_function
+{
    k_ent_function_trigger,
    k_ent_function_particle_spawn,
    k_ent_function_trigger_leave
@@ -237,7 +262,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, event_leave;
+   i32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -414,19 +439,8 @@ struct ent_worldinfo{
    u32 flags;
 };
 
-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++ ){
-      ent_marker *marker = mdl_arritm( arr, i );
-
-      if( !strcmp( mdl_pstr( mdl, marker->pstr_alias ), alias ) ){
-         return marker;
-      }
-   }
-
-   return NULL;
-}
+ent_marker *ent_find_marker( mdl_context *mdl, mdl_array_ptr *arr, 
+                             const char *alias );
 
 enum channel_behaviour{
    k_channel_behaviour_unlimited = 0,
@@ -499,8 +513,8 @@ struct ent_objective{
        flags,
        id_next,
        filter,filter2,
-       id_win,
-       win_event;
+       id_win;
+   i32 win_event;
    f32 time_limit;
 };
 
@@ -512,18 +526,18 @@ struct ent_challenge{
    mdl_transform transform;
    u32 pstr_alias,
        flags,
-       target,
-       target_event,
-       reset,
-       reset_event,
-       first,
+       target;
+   i32 target_event;
+   u32 reset;
+   i32 reset_event;
+   u32 first,
        camera,
        status;
 };
 
 struct ent_relay {
    u32 targets[4][2];
-   u32 targets_events[4];
+   i32 targets_events[4];
 };
 
 struct ent_cubemap {
@@ -532,12 +546,6 @@ struct ent_cubemap {
        framebuffer_id, renderbuffer_id, placeholder[2];
 };
 
-typedef struct ent_call ent_call;
-struct ent_call{
-   u32 id, function;
-   void *data;
-};
-
 struct ent_miniworld {
    mdl_transform transform;
    u32 pstr_world;
@@ -564,5 +572,11 @@ struct ent_glider {
    f32 cooldown;
 };
 
+struct ent_npc 
+{
+   mdl_transform transform;
+   u32 id, context, camera;
+};
+
 #include "world.h"
-static void entity_call( world_instance *world, ent_call *call );
+void entity_call( world_instance *world, ent_call *call );