X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=d3072785671a37955b62bcd75e10c1f13e0a5022;hb=75703291fbf045008a3b1ebb20fc46a2617b6b3b;hp=bf58144a3b8727c9b80fc5fea3bfa7752d1fa968;hpb=297468e5a3cc8c7805c16fdd615f42f3876eb908;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index bf58144..d307278 100644
--- a/world.h
+++ b/world.h
@@ -451,11 +451,11 @@ VG_STATIC void world_init(void)
    /* Other systems */
    vg_info( "Loading other world systems\n" );
 
-   vg_loader_highwater( world_render_init, NULL, NULL );
-   vg_loader_highwater( world_sfd_init, NULL, NULL );
-   vg_loader_highwater( world_water_init, NULL, NULL );
-   vg_loader_highwater( world_gates_init, NULL, NULL );
-   vg_loader_highwater( world_routes_init, NULL, NULL );
+   vg_loader_step( world_render_init, NULL );
+   vg_loader_step( world_sfd_init, NULL );
+   vg_loader_step( world_water_init, NULL );
+   vg_loader_step( world_gates_init, NULL );
+   vg_loader_step( world_routes_init, NULL );
 
    /* Allocate dynamic world memory arena */
    u32 max_size = 76*1024*1024;
@@ -557,11 +557,11 @@ VG_STATIC void world_update( v3f pos )
       {
          world.switching_to_new_world = 0;
          world_unload();
-         world_load();
+         vg_loader_start( world_load );
+         return;
       }
    }
 
-
    world.sky_time += world.sky_rate * vg.time_delta;
    world.sky_rate = vg_lerp( world.sky_rate, world.sky_target_rate, 
                                  vg.time_delta * 5.0 );