more sensible world loading stuff (wip)

[carveJwlIkooP6JGAAIwe30JlM.git] / world_gate.c

diff --git a/world_gate.c b/world_gate.c
index f757cdf8e1b760d167299c080b1731501e9ae1f8..b49113b3f0c381d1f27a618d9a213e57c3748776 100644 (file)
--- a/world_gate.c
+++ b/world_gate.c
@@ -267,7 +267,7 @@ VG_STATIC ent_gate *world_intersect_gates( world_instance *world,
       if( gate->flags & k_ent_gate_locked ) continue;
 
       if( gate->flags & k_ent_gate_nonlocal ){
-         if( world_loader.state != k_world_loader_none ){
+         if( world_static.load_state != k_world_loader_none ){
             continue;
          }
       }
@@ -296,10 +296,9 @@ VG_STATIC void world_unlink_nonlocal( world_instance *world ){
 /* 
  * attatches nonlocal gates, to be called from main thread ONLY! 
  */
-VG_STATIC void world_link_nonlocal_async( void *payload, u32 size )
-{
+VG_STATIC void world_link_nonlocal_async( void *payload, u32 size ){
    world_instance *world = payload;
-   u32 world_id = world - world_static.worlds;
+   u32 world_id = world - world_static.instances;
 
    for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, j );
@@ -310,8 +309,8 @@ VG_STATIC void world_link_nonlocal_async( void *payload, u32 size )
       const char *key = mdl_pstr( &world->meta, gate->key );
       vg_info( "key: %s\n", key );
 
-      for( u32 i=0; i<vg_list_size(world_static.worlds); i++ ){
-         world_instance *other = &world_static.worlds[i];
+      for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
+         world_instance *other = &world_static.instances[i];
          if( other == world ) continue;
          if( other->status != k_world_status_loaded ) continue;
          vg_info( "Checking world %u for key matches\n", i );