X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=9d8cd4970dc8c037d98b30eb03ce5f4d48e844ff;hb=fbc68c65e01838feb77f47b30994b45fcc39ebaf;hp=02bb02e9a0564b0fa856bc43a3bfc473bfd72493;hpb=63fe317d7db724162561da52aa382c82ac3c29be;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 02bb02e..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{ @@ -180,7 +182,9 @@ struct world_instance { ent_challenge, ent_relay, ent_cubemap, - ent_miniworld; + ent_miniworld, + ent_prop, + ent_region; enum skybox { k_skybox_default, @@ -214,6 +218,9 @@ struct world_instance { /* leaderboards */ struct leaderboard_cache *leaderboard_cache; + + /* ui */ + struct route_ui *routes_ui; }; struct world_static {