adaptions for vg3.000

[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c

diff --git a/workshop.c b/workshop.c
index 3bd2f166643f81bf4c7d3a681dcb8d15c03c8abc..84ea8415a3adec5d3447d656b9cad01951b1b736 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -1088,8 +1088,8 @@ static void workshop_form_gui_draw_preview( ui_rect img_box ){
          return;
       }
 
-      int hover  = ui_inside_rect( img_box, vg_ui.mouse ),
-          target = ui_inside_rect( img_box, vg_ui.mouse_click );
+      int hover  = ui_inside_rect( img_box, g_ui_ctx->mouse ),
+          target = ui_inside_rect( img_box, g_ui_ctx->mouse_click );
       
       if( ui_click_down(UI_MOUSE_MIDDLE) && target ){
          v3_copy( workshop_form.view_offset,
@@ -1101,8 +1101,8 @@ static void workshop_form_gui_draw_preview( ui_rect img_box ){
       }
 
       if( ui_clicking(UI_MOUSE_MIDDLE) && target ){
-         v2f delta = { vg_ui.mouse[0]-vg_ui.mouse_click[0],
-                       vg_ui.mouse[1]-vg_ui.mouse_click[1] };
+         v2f delta = { g_ui_ctx->mouse[0]-g_ui_ctx->mouse_click[0],
+                       g_ui_ctx->mouse[1]-g_ui_ctx->mouse_click[1] };
 
          float *begin  = workshop_form.view_offset_begin,
                *offset = workshop_form.view_offset;
@@ -1111,8 +1111,8 @@ static void workshop_form_gui_draw_preview( ui_rect img_box ){
          workshop_form.view_changed = 1;
       }
       else if( ui_clicking(UI_MOUSE_LEFT) && target ){
-         v2f delta = { vg_ui.mouse[0]-vg_ui.mouse_click[0],
-                       vg_ui.mouse[1]-vg_ui.mouse_click[1] };
+         v2f delta = { g_ui_ctx->mouse[0]-g_ui_ctx->mouse_click[0],
+                       g_ui_ctx->mouse[1]-g_ui_ctx->mouse_click[1] };
 
          v2f angles;
          v2_muladds( workshop_form.view_angles_begin, delta, 0.002f, angles);
@@ -1391,7 +1391,7 @@ void workshop_form_gui(void)
    ui_rect screen = { 0, 0, vg.window_x, vg.window_y };
    ui_rect window = { 0, 0, 1000, 700 };
    ui_rect_center( screen, window );
-   vg_ui.wants_mouse = 1;
+   g_ui_ctx->wants_mouse = 1;
 
    ui_fill( window, ui_colour( k_ui_bg+1 ) );
    ui_outline( window, 1, ui_colour( k_ui_bg+7 ), 0 );