X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.c;h=40f3d75423b7fbdf09f4d4cfce6001555500a33d;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=019e572a63b714c6c690a0ecb438bdc369b7f518;hpb=99376ce8eaf30125fb08dd5dc8b534800580fe47;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.c b/world.c index 019e572..40f3d75 100644 --- a/world.c +++ b/world.c @@ -37,11 +37,7 @@ static void world_set_active_instance( u32 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]; @@ -49,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" @@ -63,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,