X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=9d8cd4970dc8c037d98b30eb03ce5f4d48e844ff;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=dde9aea83048a93f26a4f0227c0464df69132fb7;hpb=1a7f4a35e88698bdb45c90f646f1645589d5511c;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index dde9aea..9d8cd49 100644 --- a/world.h +++ b/world.h @@ -49,6 +49,7 @@ static void skaterift_world_get_save_path( enum world_purpose which, #include "world_water.h" #include "world_audio.h" #include "world_routes.h" +#include "world_routes_ui.h" /* console variables */ @@ -63,7 +64,7 @@ struct world_instance { * ------------------------------------------------------- */ - v4f player_co, player_angles; + v4f player_co; void *heap; enum world_status{ @@ -85,6 +86,7 @@ struct world_instance { water; f64 time; + f32 tar_min, tar_max; /* STD140 */ struct ub_world_lighting{ @@ -181,7 +183,8 @@ struct world_instance { ent_relay, ent_cubemap, ent_miniworld, - ent_prop; + ent_prop, + ent_region; enum skybox { k_skybox_default, @@ -215,6 +218,9 @@ struct world_instance { /* leaderboards */ struct leaderboard_cache *leaderboard_cache; + + /* ui */ + struct route_ui *routes_ui; }; struct world_static {