X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=d34ed6e0932f88d0d70a70bddf6f6ce8afd21dc0;hb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;hp=73caa0bf8849ec6e83323d824b937733b61c5a26;hpb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index 73caa0b..d34ed6e 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -37,8 +37,7 @@ static void world_entity_focus_camera( world_instance *world, u32 uid ){
 
       v3f dir = {0.0f,-1.0f,0.0f};
       mdl_transform_vector( &cam->transform, dir, dir );
-      m3x3_mulv( localplayer.invbasis, dir, dir );
-      player_vector_angles( world_static.focus_cam.angles, dir, 1.0f, 0.0f );
+      v3_angles( dir, world_static.focus_cam.angles );
       v3_copy( cam->transform.co, world_static.focus_cam.pos );
       world_static.focus_cam.fov = cam->fov;
    }
@@ -286,6 +285,17 @@ static void ent_volume_call( world_instance *world, ent_call *call )
          entity_call( world, call );
       }
    }
+   else if( call->function == k_ent_function_trigger_leave ){
+      call->id = volume->target;
+
+      if( volume->flags & k_ent_volume_flag_particles ){
+         assert(0);
+      }
+      else{
+         call->function = volume->trigger.event_leave;
+         entity_call( world, call );
+      }
+   }
 }
 
 static void ent_audio_call( world_instance *world, ent_call *call ){
@@ -595,6 +605,7 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
    }
 }
 
+#if 0
 /* 
  * used for relinking multi-world data. ran anytime the world setup changes
  */
@@ -624,6 +635,7 @@ static void world_entity_relink( world_instance *world ){
       }
    }
 }
+#endif
 
 static void world_entity_serialize( world_instance *world, vg_msg *sav ){
    for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){