chaos pt 1

[carveJwlIkooP6JGAAIwe30JlM.git] / world.c

diff --git a/world.c b/world.c
index 40f3d75423b7fbdf09f4d4cfce6001555500a33d..def59a36b3edec09d1fe06aa2a9e1a2c4dd34886 100644 (file)
--- a/world.c
+++ b/world.c
@@ -26,13 +26,44 @@ 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 ){
+   assert( 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( index != world_static.active_instance ){
+      world_instance *current = 
+         &world_static.instances[ world_static.active_instance ];
+      v3_copy( localplayer.rb.co, current->player_co );
+      v3_copy( localplayer.angles, current->player_angles );
+      current->player_angles[3] = player_get_heading_yaw();
+   }
+
+   v3_copy( new->player_co, localplayer.rb.co );
+   v3_copy( new->player_angles, localplayer.angles );
+   q_axis_angle( localplayer.rb.q, (v3f){0,1,0}, new->player_angles[3] );
+
    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,