X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=80f4df7573fc7b62c440b9ba2cd29e4af024ddc4;hb=be5e25dee2c54c2a22ca3bbb5bbe0eb6149343be;hp=105f4496c78b2469d95e2b10c5959f52e6fe5e18;hpb=14851c4c820eb07a0db0ec0366a70bdd6518c331;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 105f449..80f4df7 100644
--- a/entity.h
+++ b/entity.h
@@ -38,6 +38,25 @@ 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,
    k_ent_gate        = 1,
@@ -243,7 +262,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, event_leave;
+   i32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -494,8 +513,8 @@ struct ent_objective{
        flags,
        id_next,
        filter,filter2,
-       id_win,
-       win_event;
+       id_win;
+   i32 win_event;
    f32 time_limit;
 };
 
@@ -507,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 {
@@ -527,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;
@@ -562,7 +575,7 @@ struct ent_glider {
 struct ent_npc 
 {
    mdl_transform transform;
-   u32 id, context;
+   u32 id, context, camera;
 };
 
 #include "world.h"