adaptions for vg3.000

[carveJwlIkooP6JGAAIwe30JlM.git] / player_remote.c

diff --git a/player_remote.c b/player_remote.c
index 43c56079cd436123f39f638e8f4706aa7e6581f4..592a42420552a0be367a7e93e9acd38b99570d31 100644 (file)
--- a/player_remote.c
+++ b/player_remote.c
@@ -872,7 +872,7 @@ static void chat_box( ui_point tag_root, f64 time, const char *message )
 
    ui_rect wr;
    wr[2] = ui_text_line_width( message ) + 8;
-   wr[3] = vg_ui.font->ch + 2;
+   wr[3] = g_ui_ctx->font->ch + 2;
    wr[0] = tag_root[0]-(wr[2]/2);
    wr[1] = tag_root[1] - wr[3] - 8;
 
@@ -915,7 +915,7 @@ static void remote_player_nametag( ui_point tag_root,
       for( int i=0; i<3; i ++ ){
          if( player->medals[i] ){
             ui_rect col = { wr[0] + (f32)cols*w, wr[1] + wr[3], w, 
-                           vg_ui.font->ch };
+                           g_ui_ctx->font->ch };
 
             vg_strnull( &str, buf, 32 );
 #if 0
@@ -1032,7 +1032,7 @@ void remote_players_imgui_lobby(void)
 void remote_players_imgui_world( world_instance *world, m4x4f pv,
                                  f32 max_dist, int geo_cull )
 {
-   ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
+   ui_flush( k_ui_shader_colour );
 
    for( u32 i=0; i<NETWORK_MAX_PLAYERS; i++ ){
       struct network_player *player = &netplayers.list[i];
@@ -1078,15 +1078,15 @@ void remote_players_imgui_world( world_instance *world, m4x4f pv,
          
          remote_player_world_gui( pv, co, player );
 
-         vg_ui.colour[3] = player->opacity;
-         ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
+         g_ui_ctx->colour[3] = player->opacity;
+         ui_flush( k_ui_shader_colour );
       }
    }
 
-   vg_ui.colour[3] = 1.0f;
+   g_ui_ctx->colour[3] = 1.0f;
 
    remote_player_world_gui( pv, localplayer.rb.co, NULL );
-   ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
+   ui_flush( k_ui_shader_colour );
 }
 
 static void chat_escape(void){