X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=respawn.c;h=b7594db52b38ffe80eb6a7e757ebec074df7826f;hb=d27f8a570e5cfad1974b4be303888e17ff846406;hp=e10d0cf90133acd62ad16ef73c46de037625ec82;hpb=22f62f001f21d1b91fefd9fc495c122d9ddf205a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/respawn.c b/respawn.c
index e10d0cf..b7594db 100644
--- a/respawn.c
+++ b/respawn.c
@@ -87,14 +87,8 @@ static void respawn_map_draw_icon( camera *cam,
 static void respawn_chooser_pre_update(void){
    if( skaterift.activity != k_skaterift_respawning ) return;
 
-   gui_helper_action( joystick_display_string(k_srjoystick_steer,2), "move" );
-   if( world_static.instances[0].status == k_world_status_loaded )
-      gui_helper_action( axis_display_string(k_sraxis_mworld_h), "world" );
-   gui_helper_action( button_display_string(k_srbind_maccept), "spawn" );
-   gui_helper_action( button_display_string(k_srbind_home), "home" );
-
    if( button_down( k_srbind_mback ) ){
-      srinput.enabled = 0;
+      srinput.state = k_input_state_resume;
       skaterift.activity = k_skaterift_menu;
       menu.page = 0xffffffff;
       menu_open_page( "Main Menu", k_ent_menuitem_stack_append );
@@ -103,7 +97,7 @@ static void respawn_chooser_pre_update(void){
 
    if( button_down( k_srbind_maccept ) ){
       skaterift.activity = k_skaterift_default;
-      srinput.enabled = 0;
+      srinput.state = k_input_state_resume;
 
       if( respawn_chooser.spawn ){
          world_static.active_instance = respawn_chooser.world_id;
@@ -220,6 +214,17 @@ static void respawn_chooser_pre_update(void){
          respawn_map_draw_icon( cam, k_gui_icon_rift, gate->co[0] );
       }
    }
+
+   for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
+      ent_route *route = mdl_arritm( &world->ent_route, i );
+
+      v4f colour;
+      v4_copy( route->colour, colour );
+      v3_muls( colour, 1.6666f, colour );
+      gui_icon_setcolour( colour );
+      respawn_map_draw_icon( cam, k_gui_icon_rift_run, 
+                             route->board_transform[3] );
+   }
 }
 
 static void respawn_begin_chooser(void){
@@ -232,6 +237,21 @@ static void respawn_begin_chooser(void){
    respawn_world_to_plane_pos( localplayer.rb.co, respawn_chooser.plane_pos );
    respawn_chooser.boom_dist = 400.0f;
    respawn_chooser.home_select = 0;
+
+   gui_helper_clear();
+
+   vg_str text;
+   if( gui_new_helper( input_joy_list[k_srjoystick_steer], &text ) )
+      vg_strcat( &text, "move" );
+
+   if( gui_new_helper( input_button_list[k_srbind_mleft], &text ) )
+      vg_strcat( &text, "world" );
+
+   if( gui_new_helper( input_button_list[k_srbind_maccept], &text ) )
+      vg_strcat( &text, "spawn" );
+
+   if( gui_new_helper( input_button_list[k_srbind_home], &text ) )
+      vg_strcat( &text, "home" );
 }
 
 static void respawn_chooser_shader_uniforms(void){