X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=00be6120313c129466a122aa60b8da034ea6d222;hb=5fba3602f053116a8e3849bc12c03198d6d7461c;hp=0b96ad8cd0a83b42c144f6d0e8921e0cb67fb31a;hpb=2329044d44a5aff035b01926f7901d9e89ad284e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_load.c b/world_load.c
index 0b96ad8..00be612 100644
--- a/world_load.c
+++ b/world_load.c
@@ -7,11 +7,12 @@
 #include "ent_skateshop.h"
 #include "addon.h"
 #include "save.h"
+#include "vg/vg_msg.h"
 
 /* 
  * load the .mdl file located in path as a world instance
  */
-VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){
+static void world_instance_load_mdl( u32 instance_id, const char *path ){
    vg_rand_seed( 9001 );
 
    world_instance *world = &world_static.instances[ instance_id ];
@@ -59,9 +60,10 @@ 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 );
 
    mdl_array_ptr infos;
    mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch );
@@ -97,29 +99,29 @@ VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){
    vg_async_stall();
 }
 
-
 struct world_load_complete_data{
-   struct savedata save;
+   savedata_file save;
    u32 instance_start, instance_count;
 };
 
 static void skaterift_world_load_done( void *payload, u32 size ){
    struct world_load_complete_data *data = payload;
 
+   vg_msg sav = {0};
+   sav.buf = data->save.buf;
+   sav.len = data->save.len;
+   sav.max = data->save.len;
+
    for( u32 i=0; i<data->instance_count; i++ ){
       world_instance *world = &world_static.instances[ data->instance_start+i ];
-      world_entity_start( world, &data->save );
+      world_entity_start( world, &sav );
    }
 
    world_static.load_state = k_world_loader_none;
 }
 
 struct world_load_args {
-   enum world_purpose{
-      k_world_purpose_hub,
-      k_world_purpose_client
-   }
-   purpose;
+   enum world_purpose purpose;
    addon_reg *reg;
 };
 
@@ -218,9 +220,9 @@ static void skaterift_world_load_thread( void *_args ){
    struct world_load_complete_data *data = final_call->payload;
    data->instance_start = instance_start;
    data->instance_count = instance_count;
-   strcpy( data->save.path, "temp_fuckyou.bkv" );
 
-   savedata_read( &data->save );
+   skaterift_world_get_save_path( purpose, data->save.path );
+   savedata_file_read( &data->save );
 
    vg_async_dispatch( final_call, skaterift_world_load_done );
    vg_async_stall();
@@ -263,9 +265,15 @@ static void skaterift_change_world_start( addon_reg *reg ){
    if( world_static.active_instance != 0 )
       vg_error( "Cannot change worlds while in non-root world\n" );
    else{
+      if( world_static.addon_client == reg ){
+         vg_warn( "World is already loaded\n" );
+         return;
+      }
+
       char buf[76];
       addon_alias_uid( &reg->alias, buf );
       vg_info( "switching to: %s\n", buf );
+      skaterift_autosave(1);
 
       world_static.load_state = k_world_loader_preload;
 
@@ -279,8 +287,6 @@ static void skaterift_change_world_start( addon_reg *reg ){
          if( inst->status == k_world_status_loaded ){
             inst->status = k_world_status_unloading;
             world_fadeout_audio( inst );
-
-            /* TODO: THIS IS WHERE A SAVE SHOULD BE DONE */
          }
       }
 
@@ -290,6 +296,8 @@ static void skaterift_change_world_start( addon_reg *reg ){
 
 /* console command for the above function */
 static int skaterift_change_world_command( int argc, const char *argv[] ){
+   if( !vg_loader_availible() ) return 0;
+
    if( argc == 1 ){
       addon_alias q;
       q.type = k_addon_type_world;
@@ -311,12 +319,6 @@ static int skaterift_change_world_command( int argc, const char *argv[] ){
    return 0;
 }
 
-#if 0
-static world_instance *world_loading_instance(void){
-   return &world_static.instances[ world_loader.world_index ];
-}
-#endif
-
 /* 
  * checks:
  *  1. to see if all audios owned by the world have been stopped
@@ -377,6 +379,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;
 }
 
@@ -384,7 +393,7 @@ static void world_free( world_instance *world )
  * reset the world structure without deallocating persistent buffers 
  * TODO: Make this a memset(0), and have persistent items live in a static loc
  */
-VG_STATIC void world_init_blank( world_instance *world )
+static void world_init_blank( world_instance *world )
 {
    memset( &world->meta, 0, sizeof(mdl_context) );