projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a mess but stable
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.h
diff --git
a/entity.h
b/entity.h
index d67c5f35d81683fda4bec559a5d7b344eb170357..6d503f9b9f334728bbd895033939fcbcfadb3c57 100644
(file)
--- a/
entity.h
+++ b/
entity.h
@@
-1,7
+1,7
@@
#pragma once
#include "vg/vg_audio.h"
#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;
#include "model.h"
typedef struct ent_spawn ent_spawn;
@@
-69,6
+69,15
@@
enum entity_alias{
k_ent_npc = 27
};
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;
static inline u32 mdl_entity_id_type( u32 entity_id )
{
return (entity_id & 0x0fff0000) >> 16;
@@
-527,13
+536,6
@@
struct ent_cubemap {
framebuffer_id, renderbuffer_id, placeholder[2];
};
framebuffer_id, renderbuffer_id, placeholder[2];
};
-typedef struct ent_call ent_call;
-struct ent_call{
- u32 id;
- i32 function;
- void *data;
-};
-
struct ent_miniworld {
mdl_transform transform;
u32 pstr_world;
struct ent_miniworld {
mdl_transform transform;
u32 pstr_world;
@@
-567,4
+569,14
@@
struct ent_npc
};
#include "world.h"
};
#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 );
void entity_call( world_instance *world, ent_call *call );