X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=78bd332a472a507e2a7c4e54532554677b349dcd;hb=6e96ba64e805ea8a39ca46171e28426c6bc86ab6;hp=e2c2bb3f3c6c783304f8e0a540713e325f4792ec;hpb=70ff4a83e5a4b35436388d9bb999c939559ac23f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index e2c2bb3..78bd332 100644 --- a/world_load.c +++ b/world_load.c @@ -300,19 +300,19 @@ static void skaterift_change_world_start( addon_reg *reg ){ vg_linear_clear( vg_mem.scratch ); /* ?? */ vg_info( "unloading old worlds\n" ); - - for( u32 i=1; istatus == k_world_status_loaded ){ - inst->status = k_world_status_unloading; - world_fadeout_audio( inst ); - } + world_instance *client_world = + &world_static.instances[ k_world_purpose_client ]; + + if( client_world->status == k_world_status_loaded ){ + client_world->status = k_world_status_unloading; + world_fadeout_audio( client_world ); } world_static.instance_addons[ k_world_purpose_client ] = reg; network_send_item( k_netmsg_playeritem_world1 ); relink_all_remote_player_worlds(); + world_unlink_nonlocal( &world_static.instances[k_world_purpose_hub] ); } }