X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=cbe7432a54aacc1e70b3cc31462d795af348e9c8;hb=15c0b8cb57ed5d10814103eaa0b5c06e8ae117e4;hp=c5c2fc747a3a77ebbb61bd85b53af7dff26d3f4f;hpb=00653e446d6b1310fa89d3aace70800f9fef4122;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index c5c2fc7..cbe7432 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -118,10 +118,12 @@ 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_DELETED) ) {
+      if( !(gate->flags & k_ent_gate_nonlocal) ) {
          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++ ){
@@ -210,6 +212,19 @@ static void world_gen_entities_init( world_instance *world ){
 
    world->entity_bh = bh_create( world->heap, &bh_system_entity_list, world,
                                  indexed_count, 2 );
+
+   world->tar_min = world->entity_bh->nodes[0].bbx[0][1];
+   world->tar_max = world->entity_bh->nodes[0].bbx[1][1] + 20.0f;
+
+   for( u32 i=0; i<mdl_arrcount(&world->ent_marker); i++ ){
+      ent_marker *marker = mdl_arritm( &world->ent_marker, i );
+
+      if( MDL_CONST_PSTREQ( &world->meta, marker->pstr_alias, "tar_min" ) )
+         world->tar_min = marker->transform.co[1];
+
+      if( MDL_CONST_PSTREQ( &world->meta, marker->pstr_alias, "tar_max" ) )
+         world->tar_max = marker->transform.co[1];
+   }
 }
 
 static
@@ -316,7 +331,7 @@ static void ent_audio_call( world_instance *world, ent_call *call ){
       v3_copy( audio->transform.co, sound_co );
    }
    else
-      vg_fatal_error( "ent_audio_call (invalid function id)" );
+      return;
 
    float chance = vg_randf64()*100.0f,
          bar = 0.0f;
@@ -604,38 +619,6 @@ 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);