X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=inline;f=skaterift.c;h=edbfb23fa3829ab7d4b0a419f44a0306e703935f;hb=9c0893a71497912deecdcd84dff9afbeac32f8f4;hp=8aa061bb85ce3a183d4d245d521a750c1b0f771d;hpb=b35ac7383d4aba1d0b8a74be7bf1695996ff57f4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 8aa061b..edbfb23 100644 --- a/skaterift.c +++ b/skaterift.c @@ -306,7 +306,9 @@ static void skaterift_change_client_world_preupdate(void); * ---------------------------------------------------------------------------*/ static void vg_pre_update(void){ - srinput.enabled = 1; + if( !netplayers.chatting ) /* FIXME */ + srinput.enabled = 1; + skaterift_preupdate_inputs(); if( k_tools_mode ) return; @@ -467,7 +469,6 @@ static void render_player_transparent(void){ /* Draw player to window buffer and blend background ontop */ player__render( &small_cam ); - render_remote_players_tags( localplayer.viewable_world, &skaterift.cam ); } static void render_scene(void){ @@ -671,10 +672,15 @@ static void vg_gui(void){ remote_player_network_imgui( vg.pv ); - remote_players_imgui_world( world_current_instance(), vg.pv, INFINITY ); if( skaterift.activity == k_skaterift_respawning ){ + remote_players_imgui_world( world_current_instance(), vg.pv, + 2000.0f, 0 ); remote_players_imgui_lobby(); } + else { + remote_players_chat_imgui(); /* TODO: conditional */ + remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 ); + } }