X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=6d503f9b9f334728bbd895033939fcbcfadb3c57;hb=ea41214530c8f3517b59ccbf7fad9f3bb159684a;hp=80f4df7573fc7b62c440b9ba2cd29e4af024ddc4;hpb=f01a25e33a54c92e4d6bca0889b76f33af5e51eb;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 80f4df7..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;
@@ -38,25 +38,6 @@ 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,
@@ -88,6 +69,15 @@ enum entity_alias{
    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 )
 {
    return (entity_id & 0x0fff0000) >> 16;
@@ -579,4 +569,14 @@ struct ent_npc
 };
 
 #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 );