X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.c;h=4f8cda2f165221c7e18ff4d70ed9fe0a0d1d6f1b;hb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;hp=ad0372389a54eaff63cdbdb0011098a1877c2915;hpb=874c9d7e6ee2d826f9eb34518e8163283439c38e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.c b/world.c
index ad03723..4f8cda2 100644
--- a/world.c
+++ b/world.c
@@ -44,29 +44,9 @@ static void world_switch_instance( u32 index ){
    world_instance *current = 
       &world_static.instances[ world_static.active_instance ];
 
-   if( index != world_static.active_instance ){
+   if( index != world_static.active_instance )
       v3_copy( localplayer.rb.co, current->player_co );
-      v3_copy( localplayer.angles, current->player_angles );
-      v3_copy( localplayer.cam.pos, current->cam_co );
-      current->player_angles[3] = player_get_heading_yaw();
-   }
-
    v3_copy( new->player_co, localplayer.rb.co );
-   v3_copy( new->player_angles, localplayer.angles );
-   v3_copy( new->cam_co, localplayer.cam.pos );
-   q_axis_angle( localplayer.rb.q, (v3f){0,1,0}, new->player_angles[3] );
-
-   /* run exit events on triggers */
-   for( u32 i=0; i<world_static.active_trigger_volume_count; i++ ){
-      i32 idx = world_static.active_trigger_volumes[i];
-      ent_volume *volume = mdl_arritm( &current->ent_volume, idx );
-
-      ent_call basecall;
-      basecall.function = k_ent_function_trigger_leave;
-      basecall.id = mdl_entity_id( k_ent_volume, idx );
-      basecall.data = NULL;
-      entity_call( current, &basecall );
-   }
 
    world_static.active_instance = index;