X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.c;h=5a97d944b5f0bb6c79899765a636bab0398b450e;hb=53b534974303043efaf1d887711fcd349f6a2885;hp=40f3d75423b7fbdf09f4d4cfce6001555500a33d;hpb=1d8d9366022c064ef56d80d463c90a79721c6243;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.c b/world.c
index 40f3d75..5a97d94 100644
--- a/world.c
+++ b/world.c
@@ -26,13 +26,48 @@ static void world_init(void)
                                                    VG_MEMORY_SYSTEM );
 }
 
-static void world_set_active_instance( u32 index ){
-   world_static.challenge_target = NULL;
-   world_static.challenge_timer = 0.0f;
-   world_static.focused_entity = 0;
-   world_static.focus_strength = 0.0f;
-   world_static.active_trigger_volume_count = 0;
+static void world_switch_instance( u32 index ){
+   localplayer.subsystem = k_player_subsystem_walk;
+
+   if( index >= vg_list_size(world_static.instances) ){
+      vg_error( "Instance ID out of range (%u)\n", index );
+      return;
+   }
+
+   world_instance *new = &world_static.instances[ index ];
+
+   if( new->status != k_world_status_loaded ){
+      vg_error( "Instance is not loaded (%u)\n", index );
+      return;
+   }
+
+   if( skaterift.demo_mode ){
+      if( world_static.instance_addons[index]->flags & ADDON_REG_PREMIUM ){
+         vg_error( "Can't switch to a premium world in the demo version\n" );
+         return;
+      }
+   }
+
+   world_instance *current = 
+      &world_static.instances[ world_static.active_instance ];
+
+   if( index != world_static.active_instance ){
+      v3_copy( localplayer.rb.co, current->player_co );
+      skaterift_autosave(1);
+   }
+
+   v3_copy( new->player_co, localplayer.rb.co );
+
    world_static.active_instance = index;
+   player__reset();
+}
+
+static int skaterift_switch_instance_cmd( int argc, const char *argv[] ){
+   if( argc )
+      world_switch_instance( atoi(argv[0]) );
+   else 
+      vg_info( "switch_active_instance <id>\n" );
+   return 0;
 }
 
 static void skaterift_world_get_save_path( enum world_purpose which, 
@@ -56,7 +91,6 @@ static void skaterift_world_get_save_path( enum world_purpose which,
 #include "world_water.c"
 #include "world_audio.c"
 #include "world_routes.c"
-#include "world_traffic.c"
 
 static void world_update( world_instance *world, v3f pos ){
    world_render.sky_time += world_render.sky_rate * vg.time_delta;
@@ -66,7 +100,7 @@ static void world_update( world_instance *world, v3f pos ){
 
    world_routes_update_timer_texts( world );
    world_routes_update( world );
-   world_traffic_update( world, pos );
+   ent_traffic_update( world, pos );
    world_sfd_update( world, pos );
    world_volumes_update( world, pos );
 }