X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=d34ed6e0932f88d0d70a70bddf6f6ce8afd21dc0;hb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;hp=bf7916e33369a94ea7017d59ce8e664ca1c5b12d;hpb=4eb81766e4e7c54599b057ebf57b7fab01cd0726;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index bf7916e..d34ed6e 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -27,7 +27,7 @@ static void world_entity_unfocus(void){
    localplayer.immobile = 0;
    skaterift.activity = k_skaterift_default;
    menu.disable_open = 0;
-   srinput.enabled = 0;
+   srinput.state = k_input_state_resume;
 }
 
 static void world_entity_focus_camera( world_instance *world, u32 uid ){
@@ -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;
    }
@@ -120,11 +119,10 @@ static void world_gen_entities_init( world_instance *world ){
    for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, j );
 
-      if( !(gate->flags & k_ent_gate_nonlocal) ) {
+      if( !(gate->flags & k_ent_gate_nonlocal_DELETED) ) {
          gate_transform_update( gate );
       }
    }
-   vg_async_call( world_link_nonlocal_async, world, 0 );
 
    /* water */
    for( u32 j=0; j<mdl_arrcount(&world->ent_water); j++ ){
@@ -287,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 ){
@@ -586,7 +595,7 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
       ent_challenge *challenge = mdl_arritm( &world->ent_challenge, i );
       const char *alias = mdl_pstr( &world->meta, challenge->pstr_alias );
 
-      if( vg_msg_seekkvu32( sav, alias, k_vg_msg_first ) ){
+      if( vg_msg_getkvu32( sav, alias, 0 ) ){
          ent_call call;
          call.data = NULL;
          call.function = 0;
@@ -596,6 +605,38 @@ 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
+ */
+static void world_entity_relink( world_instance *world ){
+   vg_info( "entity_relink(%d)\n", world - world_static.instances );
+   for( u32 i=0; i<mdl_arrcount(&world->ent_miniworld); i++ ){
+      ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld, i );
+      miniworld->purpose = k_world_purpose_invalid;
+
+      const char *uid = mdl_pstr( &world->meta, miniworld->pstr_world );
+      addon_alias q;
+      addon_uid_to_alias( uid, &q );
+
+      u32 addon_id = addon_match( &q );
+      if( addon_id != 0xffffffff ){
+         addon_reg *reg = get_addon_from_index( k_addon_type_world, addon_id );
+         
+         for( int j=0; j<k_world_max; j ++ ){
+            world_instance *other = &world_static.instances[j];
+            if( other == world ) continue;
+            if( (other->status == k_world_status_loaded) && 
+                (world_static.instance_addons[j] == reg) ){
+               miniworld->purpose = j;
+               break;
+            }
+         }
+      }
+   }
+}
+#endif
+
 static void world_entity_serialize( world_instance *world, vg_msg *sav ){
    for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){
       ent_challenge *challenge = mdl_arritm(&world->ent_challenge,i);