X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=respawn.c;h=b6e3874907f7d0a368714ff96bc5b7f95929f785;hb=53597f45307d8a2120e3a0bbe71797b216e8750b;hp=a8727fc3e213429fb23113e5438be433978f9ace;hpb=bf9f3897d358cb6c417e28d659bb412344a52bc3;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/respawn.c b/respawn.c
index a8727fc..b6e3874 100644
--- a/respawn.c
+++ b/respawn.c
@@ -79,15 +79,15 @@ VG_STATIC void respawn_chooser_pre_update(void){
 
    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_mbrowse_h), "world" );
+      gui_helper_action( axis_display_string(k_sraxis_mworld_h), "world" );
    gui_helper_action( button_display_string(k_srbind_maccept), "spawn" );
-   gui_helper_action( axis_display_string(k_sraxis_mbrowse_v), "home" );
+   gui_helper_action( button_display_string(k_srbind_home), "home" );
 
    if( button_down( k_srbind_mback ) ){
       srinput.enabled = 0;
       skaterift.activity = k_skaterift_menu;
       menu.page = 0xffffffff;
-      menu_open_page( "Main Menu" );
+      menu_open_page( "Main Menu", k_ent_menuitem_stack_append );
       return;
    }
 
@@ -104,30 +104,23 @@ VG_STATIC void respawn_chooser_pre_update(void){
       return;
    }
 
-   if( button_down( k_srbind_mleft ) ){
+   if( button_down( k_srbind_world_left ) ){
       if( respawn_chooser.world_id > 0 )
          respawn_chooser_setworld( respawn_chooser.world_id-1 );
    }
 
-   if( button_down( k_srbind_mright ) ){
+   if( button_down( k_srbind_world_right ) ){
       u32 next = respawn_chooser.world_id+1;
       if( next < vg_list_size(world_static.instances) )
          respawn_chooser_setworld( next );
    }
 
-   if( button_down(k_srbind_mup) ){
+   if( button_down(k_srbind_home) ){
       respawn_chooser.home_select ++;
       if( respawn_chooser.home_select >= vg_list_size(respawn_homes) )
          respawn_chooser.home_select = 0;
       respawn_chooser_gohome();
    }
-   else if( button_down(k_srbind_mdown) ){
-      if( respawn_chooser.home_select == 0 )
-         respawn_chooser.home_select = vg_list_size(respawn_homes)-1;
-      else
-         respawn_chooser.home_select --;
-      respawn_chooser_gohome();
-   }
 
    world_instance *world = &world_static.instances[ respawn_chooser.world_id ];
    v3f *bbx = world->scene_geo.bbx;