X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=ece92972c080625f6390e4252640363355572921;hb=refs%2Fheads%2Frigidbody;hp=b1363b7a9a056c9d55a29685e80bfb4b0c024350;hpb=fdfd087053eb596f1e9123951af8acee94d8cd99;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_load.c b/world_load.c
index b1363b7..ece9297 100644
--- a/world_load.c
+++ b/world_load.c
@@ -69,21 +69,26 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    MDL_LOAD_ARRAY( meta, &world->ent_miniworld, ent_miniworld,  heap );
    MDL_LOAD_ARRAY( meta, &world->ent_prop,      ent_prop,       heap );
    MDL_LOAD_ARRAY( meta, &world->ent_region,    ent_region,     heap );
+   MDL_LOAD_ARRAY( meta, &world->ent_glider,    ent_glider,     heap );
 
    mdl_array_ptr infos;
    MDL_LOAD_ARRAY( meta, &infos, ent_worldinfo, vg_mem.scratch );
 
    world->skybox = k_skybox_default;
-   if( mdl_arrcount(&infos) ){
+   if( mdl_arrcount(&infos) )
+   {
       world->info = *((ent_worldinfo *)mdl_arritm(&infos,0));
 
-      if( world->meta.info.version >= 104 ){
-         if( MDL_CONST_PSTREQ( &world->meta, world->info.pstr_skybox,"space")){
+      if( world->meta.info.version >= 104 )
+      {
+         if( MDL_CONST_PSTREQ( &world->meta, world->info.pstr_skybox,"space"))
+         {
             world->skybox = k_skybox_space;
          }
       }
    }
-   else{
+   else
+   {
       world->info.pstr_author = 0;
       world->info.pstr_desc = 0;
       world->info.pstr_name = 0;
@@ -131,21 +136,14 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
 
    /* init player position.
     *   - this is overriden by the save state when(if) it loads */
-   ent_spawn *rp = world_find_spawn_by_name( world, "start" );
-   if( !rp ) rp = world_find_closest_spawn( world, (v3f){0.0f,0.0f,0.0f} );
-   if( rp )
-      v3_copy( rp->transform.co, world->player_co );
-   else{
-      /* FIXME: we need to find a safe place to put the player_co using
-       * raycasts. */
-      v3_zero( world->player_co );
-   }
+   world_default_spawn_pos( world, world->player_co );
 
    /* 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 ++ ){
+   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_REQUEST_MAX );
       board->status = k_request_status_client_error;
@@ -347,8 +345,13 @@ static void skaterift_change_world_start( addon_reg *reg ){
 }
 
 /* console command for the above function */
-static int skaterift_load_world_command( int argc, const char *argv[] ){
-   if( !vg_loader_availible() ) return 0; /* FIXME */
+static int skaterift_load_world_command( int argc, const char *argv[] )
+{
+   if( !vg_loader_availible() ) 
+   {
+      vg_error( "Loading thread is currently unavailible\n" );
+      return 0;
+   }
 
    if( argc == 1 ){
       addon_alias q;