some niceer ui stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 9ca847c85d191f09707a7bd6a2fca92e38307b0f..afd4986826e0a63f856e39950fad077c3ca36bf4 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -60,6 +60,8 @@ VG_STATIC void world_load_mdl( const char *path )
    mdl_load_array( meta, &world->ent_swspreview,"ent_swspreview", heap );
    mdl_load_array( meta, &world->ent_ccmd,      "ent_ccmd",       heap );
    mdl_load_array( meta, &world->ent_challenge, "ent_challenge",  heap );
+   mdl_load_array( meta, &world->ent_unlock,    "ent_unlock",     heap );
+   mdl_load_array( meta, &world->ent_relay,     "ent_relay",      heap );
 
    mdl_array_ptr infos;
    mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch );
@@ -84,8 +86,6 @@ VG_STATIC void world_load_mdl( const char *path )
    world_gen_load_surfaces();
    world_gen_routes_ent_init();
    world_gen_entities_init();
-   world->volume_bh = bh_create( heap, &bh_system_volumes, world,
-                                 mdl_arrcount( &world->ent_volume ), 1 );
    
    /* main bulk */
    world_gen_generate_meshes();
@@ -338,8 +338,8 @@ VG_STATIC void world_init_blank( world_instance *world )
    world->surface_count = 0;
 
    world->geo_bh = NULL;
-   world->volume_bh = NULL;
-   world->audio_bh = NULL;
+   world->entity_bh = NULL;
+   world->entity_list = NULL;
    world->rendering_gate = NULL;
 
    world->water.enabled = 0;