more gui changes

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_miniworld.c

diff --git a/ent_miniworld.c b/ent_miniworld.c
index 5e9a23c03f17f6a0bb37b23430866b8083c87955..0ceefdab1dfaad6f7e37c7cb94d75d05cce66e71 100644 (file)
--- a/ent_miniworld.c
+++ b/ent_miniworld.c
@@ -8,11 +8,12 @@
 static void miniworld_helper_default(void){
    gui_helper_clear();
    vg_str text;
-   if( gui_new_helper( input_button_list[k_srbind_miniworld_resume], &text ))
-      vg_strcat( &text, "Enter World" );
 
    if( gui_new_helper( input_button_list[k_srbind_miniworld_teleport],&text))
       vg_strcat( &text, "Teleport" );
+
+   if( gui_new_helper( input_button_list[k_srbind_miniworld_resume], &text ))
+      vg_strcat( &text, "Enter World" );
 }
 
 static void miniworld_helper_tele(void){
@@ -37,10 +38,14 @@ static void ent_miniworld_call( world_instance *world, ent_call *call ){
 
       mdl_transform_m4x3( &miniworld->transform, global_miniworld.mmdl );
       global_miniworld.active = miniworld;
+      global_miniworld.mode = 0;
+      global_miniworld.dest_spawn = NULL;
       miniworld_helper_default();
    }
    else if( call->function == 1 ){
       global_miniworld.active = NULL;
+      global_miniworld.mode = 0;
+      global_miniworld.dest_spawn = NULL;
       gui_helper_clear();
 
       if( miniworld->proxy ){
@@ -129,18 +134,6 @@ static void ent_miniworld_render( world_instance *host_world, camera *cam ){
       miniworld_icon( cam, icon, challenge->transform.co, 1.0f );
    }
 
-#if 0
-   for( u32 i=0; i<mdl_arrcount(&dest_world->ent_skateshop); i++ ){
-      ent_skateshop *shop = mdl_arritm( &dest_world->ent_skateshop, i );
-      if( shop->type == k_skateshop_type_boardshop ){
-         miniworld_icon( cam, k_gui_icon_board, shop->transform.co, 1.0f );
-      }
-      else if( shop->type == k_skateshop_type_worldshop ){
-         miniworld_icon( cam, k_gui_icon_world, shop->transform.co, 1.0f );
-      }
-   }
-#endif
-
    for( u32 i=0; i<mdl_arrcount(&dest_world->ent_route); i++ ){
       ent_route *route = mdl_arritm( &dest_world->ent_route, i );
 
@@ -166,6 +159,7 @@ static void ent_miniworld_preupdate(void){
       
       if( global_miniworld.mode ){
          global_miniworld.mode = 0;
+         global_miniworld.dest_spawn = 0;
          menu.disable_open = 0;
          srinput.state = k_input_state_resume;
          gui_helper_clear();