X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=c7b8688e4023c6d881ee4eb509e6b1968646b881;hb=5a233469f45ee7cbdc89cb87956f9ef2989ad1b5;hp=89ee898d71691479f54fa25d3ef57e8393f7e153;hpb=9695bd6aa2ca31da9dbcde29eb5d082489c4decc;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 89ee898..c7b8688 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -456,7 +456,8 @@ static void present_view_with_post_processing(void){
 
 static void render_player_transparent(void)
 {
-   if( (menu.page == k_menu_page_main) && 
+   if( (skaterift.activity == k_skaterift_menu) &&
+       (menu.page == k_menu_page_main) && 
        (menu.main_index == k_menu_main_guide) )
    {
       return;
@@ -748,7 +749,7 @@ void vg_gui(void)
       ui_rect screen = { 0, 0, vg.window_x, vg.window_y };
       ui_rect panel = { 0, 0, 1000, 700 };
       ui_rect_center( screen, panel );
-      vg_ui.wants_mouse = 1;
+      ui_capture_mouse( 1 );
 
       ui_fill( panel, ui_colour( k_ui_bg+1 ) );
       ui_outline( panel, 1, ui_colour( k_ui_bg+7 ), 0 );
@@ -760,9 +761,9 @@ void vg_gui(void)
 
    if( k_light_editor )
       imgui_world_light_edit( world_current_instance() );
-
-   vg_ui.tex_bg = gpipeline.fb_main->attachments[0].id;
-   render_fb_inverse_ratio( gpipeline.fb_main, vg_ui.bg_inverse_ratio );
+   
+   g_ui_ctx->tex_bg = gpipeline.fb_main->attachments[0].id;
+   render_fb_inverse_ratio( gpipeline.fb_main, g_ui_ctx->bg_inverse_ratio );
 
    menu_gui();
    player__im_gui();