render routes in mini-world

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 1605325f44fb6c37ea511aee360590c961b6863b..50a882c2fab5dc1f8907a87c051d189eb55fed62 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -68,6 +68,7 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    mdl_load_array( meta, &world->ent_relay,     "ent_relay",      heap );
    mdl_load_array( meta, &world->ent_cubemap,   "ent_cubemap",    heap );
    mdl_load_array( meta, &world->ent_miniworld, "ent_miniworld",  heap );
+   mdl_load_array( meta, &world->ent_prop,      "ent_prop",  heap );
 
    mdl_array_ptr infos;
    mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch );
@@ -106,7 +107,6 @@ 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 */
-   v3_zero( world->player_angles );
    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} );
 
@@ -146,13 +146,6 @@ static void skaterift_world_load_done( void *payload, u32 size ){
    world_entity_start( world, &sav );
    world->status = k_world_status_loaded;
    world_static.load_state = k_world_loader_none;
-
-   for( int i=0; i<k_world_max; i ++ ){
-      world_instance *wi = &world_static.instances[i];
-
-      if( wi->status == k_world_status_loaded )
-         world_entity_relink( wi );
-   }
 }
 
 struct world_load_args {
@@ -312,8 +305,6 @@ static void skaterift_change_world_start( addon_reg *reg ){
          }
       }
 
-      world_entity_relink( &world_static.instances[k_world_purpose_hub] );
-
       world_static.instance_addons[ k_world_purpose_client ] = reg;
       network_send_item( k_netmsg_playeritem_world1 );
       relink_all_remote_player_worlds();