X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=c020532fd0d204d276c503941e5dd9b389001a68;hb=00653e446d6b1310fa89d3aace70800f9fef4122;hp=254c80df27e6a28700d52ed788bdf2b657408ac3;hpb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 254c80d..c020532 100644 --- a/skaterift.c +++ b/skaterift.c @@ -324,8 +324,7 @@ static void vg_pre_update(void){ /* time rate */ f32 target = 1; - if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu| - k_skaterift_respawning) ) { + if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ){ target = 0; } @@ -341,7 +340,6 @@ static void vg_pre_update(void){ world_update( world_current_instance(), localplayer.rb.co ); audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co ); - respawn_chooser_pre_update(); } static void vg_fixed_update(void){ @@ -545,12 +543,6 @@ static void skaterift_composite_maincamera(void){ } } - if( skaterift.activity == k_skaterift_respawning ){ - camera_copy( &respawn_chooser.cam, &skaterift.cam ); - skaterift.cam.nearz = 4.0f; - skaterift.cam.farz = 3100.0f; - } - camera_update_transform( &skaterift.cam ); camera_update_view( &skaterift.cam ); camera_update_projection( &skaterift.cam ); @@ -652,16 +644,8 @@ static void vg_gui(void){ render_view_framebuffer_ui(); remote_player_network_imgui( vg.pv ); - - 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 ); - } + remote_players_chat_imgui(); /* TODO: conditional */ + remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 ); }