X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=respawn.c;fp=respawn.c;h=0cee183b94755a9300bb21e69d599707acea82dc;hb=f0c064ff3c9bb162db39bf533e5df973816621c0;hp=a8727fc3e213429fb23113e5438be433978f9ace;hpb=8c6ba83d5eaab5922468e981c4e8b799d8f77e2f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/respawn.c b/respawn.c index a8727fc..0cee183 100644 --- a/respawn.c +++ b/respawn.c @@ -79,9 +79,9 @@ 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; @@ -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;