/* 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} );
static void skaterift_world_load_done( void *payload, u32 size ){
struct world_load_complete_data *data = payload;
+ world_instance *world = &world_static.instances[ data->purpose ];
- /* TODO(W2): Load player position from this save file */
vg_msg sav;
vg_msg_init( &sav, data->save.buf, data->save.len );
- world_instance *world = &world_static.instances[ data->purpose ];
+ 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 );
+ }
+ }
+
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 {
* Does a complete world switch using the remaining free slots
*/
static void skaterift_world_load_thread( void *_args ){
- /* FIXME: we need to check all threads that take args. args can dissapear! */
struct world_load_args args = *((struct world_load_args *)_args);
addon_reg *reg = args.reg;
vg_linear_clear( vg_mem.scratch ); /* ?? */
vg_info( "unloading old worlds\n" );
-
- for( u32 i=1; i<vg_list_size(world_static.instances); i++ ){
- world_instance *inst = &world_static.instances[i];
- if( inst->status == 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 ];
- world_entity_relink( &world_static.instances[k_world_purpose_hub] );
+ 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] );
}
}