build system revision

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 4c768bfe4e1027124d17349b760b4e9608dad9fe..aaf689fa5e1a533dddfac8af5d9a789a027840a2 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -10,13 +10,12 @@
 #include "vg/vg_msg.h"
 #include "network.h"
 #include "player_remote.h"
+#include "vg/vg_loader.h"
 
 /* 
  * load the .mdl file located in path as a world instance
  */
 static void world_instance_load_mdl( u32 instance_id, const char *path ){
-   vg_rand_seed( 9001 );
-
    world_instance *world = &world_static.instances[ instance_id ];
    world_init_blank( world );
    world->status = k_world_status_loading;
@@ -71,21 +70,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;
@@ -133,21 +137,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;
@@ -177,7 +174,8 @@ static void skaterift_world_load_done( void *payload, u32 size ){
    if( data->purpose != k_world_purpose_hub ){
       vg_msg player_frame = sav;
       if( vg_msg_seekframe( &player_frame, "player" ) ){
-         vg_msg_getkvv3f( &player_frame, "position", world->player_co, NULL );
+         vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f, 
+                           world->player_co, NULL );
       }
    }
 
@@ -208,7 +206,6 @@ static void skaterift_world_load_thread( void *_args ){
    vg_str path;
    vg_strnull( &path, path_buf, 4096 );
 
-   assert( reg );
    addon_get_content_folder( reg, &path, 1 );
 
    vg_str folder = path;
@@ -349,8 +346,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;