chaos pt 2

[carveJwlIkooP6JGAAIwe30JlM.git] / respawn.c

diff --git a/respawn.c b/respawn.c
index e90f9be3ebf389fb088370ad67905beb2a39e9dd..f7be930b60cf883f1f571bc0c178b5fc1258cb8e 100644 (file)
--- a/respawn.c
+++ b/respawn.c
@@ -87,12 +87,6 @@ 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.state = k_input_state_resume;
       skaterift.activity = k_skaterift_menu;
@@ -107,8 +101,6 @@ static void respawn_chooser_pre_update(void){
 
       if( respawn_chooser.spawn ){
          world_static.active_instance = respawn_chooser.world_id;
-         localplayer.viewable_world = 
-            &world_static.instances[ respawn_chooser.world_id ];
          player__spawn( respawn_chooser.spawn );
       }
       return;
@@ -214,13 +206,6 @@ static void respawn_chooser_pre_update(void){
       }
    }
 
-   for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
-      ent_gate *gate = mdl_arritm( &world->ent_gate, i );
-      if( gate->flags & k_ent_gate_nonlocal ){
-         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 );
 
@@ -243,8 +228,24 @@ 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" );
 }
 
+#if 0
 static void respawn_chooser_shader_uniforms(void){
    v4f uPlayerPos, uSpawnPos;
    v4_zero( uPlayerPos );
@@ -261,5 +262,6 @@ static void respawn_chooser_shader_uniforms(void){
    shader_scene_override_uPlayerPos( uPlayerPos );
    shader_scene_override_uSpawnPos( uSpawnPos );
 }
+#endif
 
 #endif /* RESPAWN_C */