X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=2ca957a1cca75b13b04761da3e59122b43dc6166;hb=53597f45307d8a2120e3a0bbe71797b216e8750b;hp=983feeea00b229bd55d87fbe9b69584a72130c5c;hpb=14b3d5c13faab36bd37ae27aa8c1501ba7146f89;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_load.c b/world_load.c
index 983feee..2ca957a 100644
--- a/world_load.c
+++ b/world_load.c
@@ -60,8 +60,8 @@ VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){
    mdl_load_array( meta, &world->ent_skateshop, "ent_skateshop",  heap );
    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_objective, "ent_objective",  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_load_array( meta, &world->ent_cubemap,   "ent_cubemap",    heap );
 
@@ -372,6 +372,13 @@ static void world_free( world_instance *world )
                      vg_linear_header(world->heap) );
    }
 
+   for( u32 i=0; i<mdl_arrcount(&world->ent_cubemap); i++ ){
+      ent_cubemap *cm = mdl_arritm(&world->ent_cubemap,i);
+      glDeleteTextures( 1, &cm->texture_id );
+      glDeleteFramebuffers( 1, &cm->framebuffer_id );
+      glDeleteRenderbuffers( 1, &cm->renderbuffer_id );
+   }
+
    world->status = k_world_status_unloaded;
 }