yet again more world load revision

[carveJwlIkooP6JGAAIwe30JlM.git] / world_entity.h

diff --git a/world_entity.h b/world_entity.h
index 807cd9713743edc255a1516d6f1f240022f650a9..63cab47673e075f9c237c9032d36303abf414d91 100644 (file)
--- a/world_entity.h
+++ b/world_entity.h
@@ -3,14 +3,35 @@
 
 #include "world.h"
 #include "entity.h"
+#include "bvh.h"
+#include "save.h"
 
-VG_STATIC void world_gen_entities_init(void);
+VG_STATIC void world_gen_entities_init( world_instance *world );
 VG_STATIC ent_spawn *world_find_spawn_by_name( world_instance *world, 
                                                const char *name );
 VG_STATIC ent_spawn *world_find_closest_spawn( world_instance *world, 
                                                v3f position );
+VG_STATIC void world_entity_start( world_instance *world,
+                                   struct savedata *sav );
 
 VG_STATIC void ent_volume_call( world_instance *world, ent_call *call );
 VG_STATIC void ent_audio_call( world_instance *world, ent_call *call );
+VG_STATIC void ent_ccmd_call( world_instance *world, ent_call *call );
+
+VG_STATIC void entity_bh_expand_bound( void *user, boxf bound, u32 item_index );
+VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis );
+VG_STATIC void entity_bh_swap( void *user, u32 ia, u32 ib );
+VG_STATIC void entity_bh_debug( void *user, u32 item_index );
+VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point,
+                                  v3f closest );
+
+static bh_system bh_system_entity_list = {
+   .expand_bound = entity_bh_expand_bound,
+   .item_centroid = entity_bh_centroid,
+   .item_closest = entity_bh_closest,
+   .item_swap = entity_bh_swap,
+   .item_debug = entity_bh_debug,
+   .cast_ray = NULL
+};
 
 #endif /* WORLD_ENTITY_H */