X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.c;h=40f3d75423b7fbdf09f4d4cfce6001555500a33d;hb=9c0893a71497912deecdcd84dff9afbeac32f8f4;hp=c3b55163110fe686905d99ba31e0d878719a9ad8;hpb=c77e15a8dc7b976371a473bc8794cb55601d82f6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.c b/world.c
index c3b5516..40f3d75 100644
--- a/world.c
+++ b/world.c
@@ -26,13 +26,18 @@ static void world_init(void)
                                                    VG_MEMORY_SYSTEM );
 }
 
+static void world_set_active_instance( u32 index ){
+   world_static.challenge_target = NULL;
+   world_static.challenge_timer = 0.0f;
+   world_static.focused_entity = 0;
+   world_static.focus_strength = 0.0f;
+   world_static.active_trigger_volume_count = 0;
+   world_static.active_instance = index;
+}
+
 static void skaterift_world_get_save_path( enum world_purpose which, 
                                            char buf[128] ){
-   addon_reg *reg;
-
-   if( which == k_world_purpose_hub ) reg = world_static.addon_hub;
-   else reg = world_static.addon_client;
-
+   addon_reg *reg = world_static.instance_addons[ which ];
    assert( reg );
 
    char id[76];
@@ -40,7 +45,6 @@ static void skaterift_world_get_save_path( enum world_purpose which,
    snprintf( buf, 128, "savedata/%s.bkv", id );
 }
 
-
 #include "world_entity.c"
 #include "world_gate.c"
 #include "world_gen.c"
@@ -54,8 +58,7 @@ static void skaterift_world_get_save_path( enum world_purpose which,
 #include "world_routes.c"
 #include "world_traffic.c"
 
-VG_STATIC void world_update( world_instance *world, v3f pos )
-{
+static void world_update( world_instance *world, v3f pos ){
    world_render.sky_time += world_render.sky_rate * vg.time_delta;
    world_render.sky_rate = vg_lerp( world_render.sky_rate, 
                                     world_render.sky_target_rate,