small compression

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 70ca783137dcc48751ec4851696562658c130199..fd75aa8f8cca887ca34443154fbaf071800936ff 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -97,6 +97,18 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    world_gen_compute_light_indices( world );
    mdl_close( meta );
 
+   /* allocate leaderboard buffers */
+   u32 bs = mdl_arrcount(&world->ent_route)*sizeof(struct leaderboard_cache);
+   world->leaderboard_cache = vg_linear_alloc( heap, bs );
+
+   for( u32 i=0; i<mdl_arrcount( &world->ent_route ); i ++ ){
+      struct leaderboard_cache *board = &world->leaderboard_cache[i];
+      board->data = vg_linear_alloc( heap, NETWORK_LEADERBOARD_MAX_SIZE );
+      board->status = k_request_status_client_error;
+      board->cache_time = 0.0;
+      board->data_len = 0;
+   }
+
    vg_async_call( async_world_postprocess, world, 0 );
    vg_async_stall();
 }
@@ -130,11 +142,9 @@ struct world_load_args {
  */
 static void skaterift_world_load_thread( void *_args ){
    struct world_load_args *args = _args;
-   enum world_purpose purpose = args->purpose;
-   addon_reg *reg = args->reg;
 
-   if( purpose == k_world_purpose_hub ) world_static.addon_hub = reg;
-   else world_static.addon_client = reg;
+   addon_reg *reg = args->reg;
+   world_static.instance_addons[ args->purpose ] = reg;
 
    char path_buf[4096];
    vg_str path;
@@ -149,7 +159,7 @@ static void skaterift_world_load_thread( void *_args ){
       return;
    }
 
-   char worlds[3][4096];
+   char worlds[k_world_max-1][4096];
    u32 i=0;
 
    vg_dir dir;
@@ -172,7 +182,7 @@ static void skaterift_world_load_thread( void *_args ){
          if( !ext ) continue;
          if( strcmp(ext,".mdl") ) continue;
 
-         if( i == 3 ){
+         if( i == k_world_max-1 ){
             vg_warn( "There are too many .mdl files in the map folder!(3)\n" );
             break;
          }
@@ -199,7 +209,7 @@ static void skaterift_world_load_thread( void *_args ){
    }
 
    u32 instance_start = 0, instance_count = 1;
-   if( purpose == k_world_purpose_client ) instance_start = 1;
+   if( args->purpose == k_world_purpose_client ) instance_start = 1;
 
    world_instance_load_mdl( instance_start, worlds[first_index] );
 
@@ -221,7 +231,7 @@ static void skaterift_world_load_thread( void *_args ){
    data->instance_start = instance_start;
    data->instance_count = instance_count;
 
-   skaterift_world_get_save_path( purpose, data->save.path );
+   skaterift_world_get_save_path( args->purpose, data->save.path );
    savedata_file_read( &data->save );
 
    vg_async_dispatch( final_call, skaterift_world_load_done );
@@ -231,7 +241,7 @@ static void skaterift_world_load_thread( void *_args ){
 /* holding pattern before we can start loading the new world, since we might be
  * waiting for audio to stop */
 static void skaterift_change_client_world_preupdate(void){
-   for( u32 i=1; i<vg_list_size(world_static.instances); i++ ){
+   for( u32 i=1; i<k_world_max; i++ ){
       world_instance *inst = &world_static.instances[i];
       
       if( inst->status == k_world_status_unloading ){
@@ -250,7 +260,7 @@ static void skaterift_change_client_world_preupdate(void){
       struct world_load_args *args = 
          vg_linear_alloc( vg_async.buffer, sizeof(struct world_load_args) );
       args->purpose = k_world_purpose_client;
-      args->reg = world_static.addon_client; 
+      args->reg = world_static.instance_addons[ k_world_purpose_client ];
 
       /* this is replaces the already correct reg but we have to set it again
        * TOO BAD */
@@ -265,7 +275,7 @@ 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 ){
+      if( world_static.instance_addons[ k_world_purpose_client ] == reg ){
          vg_warn( "World is already loaded\n" );
          return;
       }
@@ -290,7 +300,7 @@ static void skaterift_change_world_start( addon_reg *reg ){
          }
       }
 
-      world_static.addon_client = reg;
+      world_static.instance_addons[ k_world_purpose_client ] = reg;
       network_send_item( k_netmsg_playeritem_world1 );
       relink_all_remote_player_worlds();
    }
@@ -355,8 +365,7 @@ static int world_freeable( world_instance *world ){
 /*
  * Free all resources for world instance
  */
-static void world_free( world_instance *world )
-{
+static void world_free( world_instance *world ){
    vg_info( "Free world @%p\n", world );
 
    /* free meshes */
@@ -395,8 +404,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
  */
-static void world_init_blank( world_instance *world )
-{
+static void world_init_blank( world_instance *world ){
    memset( &world->meta, 0, sizeof(mdl_context) );
 
    world->textures = NULL;