foliage windy shader

[carveJwlIkooP6JGAAIwe30JlM.git] / world.c

diff --git a/world.c b/world.c
index def59a36b3edec09d1fe06aa2a9e1a2c4dd34886..550ac508f0c894a64412a73923fe92cc3289068b 100644 (file)
--- a/world.c
+++ b/world.c
@@ -27,7 +27,7 @@ static void world_init(void)
 }
 
 static void world_switch_instance( u32 index ){
-   assert( localplayer.subsystem == k_player_subsystem_walk );
+   localplayer.subsystem = k_player_subsystem_walk;
 
    if( index >= vg_list_size(world_static.instances) ){
       vg_error( "Instance ID out of range (%u)\n", index );
@@ -41,17 +41,15 @@ static void world_switch_instance( u32 index ){
       return;
    }
 
+   world_instance *current = 
+      &world_static.instances[ world_static.active_instance ];
+
    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();
+      skaterift_autosave(1);
    }
 
    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;