X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=80f4df7573fc7b62c440b9ba2cd29e4af024ddc4;hb=refs%2Fheads%2Fmenu2;hp=a925318b92be649ec09725ce3a2112572474edc0;hpb=5f6a4f9df6c8accc89f1920bfe9ace3cbac4c4b6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index a925318..6d503f9 100644
--- a/entity.h
+++ b/entity.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "vg/vg_audio.h"
-#include "vg/vg_imgui.h"
+#include "vg/vg_ui/imgui.h"
 #include "model.h"
 
 typedef struct ent_spawn ent_spawn;
@@ -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_npc ent_npc;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -64,7 +65,17 @@ 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
+};
+
+typedef struct ent_call ent_call;
+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
 };
 
 static inline u32 mdl_entity_id_type( u32 entity_id )
@@ -241,7 +252,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, event_leave;
+   i32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -492,8 +503,8 @@ struct ent_objective{
        flags,
        id_next,
        filter,filter2,
-       id_win,
-       win_event;
+       id_win;
+   i32 win_event;
    f32 time_limit;
 };
 
@@ -505,18 +516,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 {
@@ -525,12 +536,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;
@@ -557,5 +562,21 @@ struct ent_glider {
    f32 cooldown;
 };
 
+struct ent_npc 
+{
+   mdl_transform transform;
+   u32 id, context, camera;
+};
+
 #include "world.h"
+
+struct ent_call{
+   u32 id;
+   i32 function;
+   void *data;
+};
+
+typedef enum entity_call_result 
+   (*fn_entity_call_handler)( world_instance *, ent_call *);
+
 void entity_call( world_instance *world, ent_call *call );