fix couple bugs. some story linkeage

diff --git a/content_skaterift/maps/mp_mtzero/before.mdl b/content_skaterift/maps/mp_mtzero/before.mdl
index e4568af8d3dc50933251af6673dc492aefab48f6..6321574dfabf3bc7d484e6aa7c4ef59fa1a5f6d8 100644 (file)
Binary files a/content_skaterift/maps/mp_mtzero/before.mdl and b/content_skaterift/maps/mp_mtzero/before.mdl differ

diff --git a/content_skaterift/maps/mp_mtzero/main.mdl b/content_skaterift/maps/mp_mtzero/main.mdl
index c0f0ccf519f0a4e4cc6f4a6be09b8ae41546805c..567e19bffc5df2cc9cebc290b918a878d3919e2a 100644 (file)
Binary files a/content_skaterift/maps/mp_mtzero/main.mdl and b/content_skaterift/maps/mp_mtzero/main.mdl differ

diff --git a/content_skaterift/models/rs_font.mdl b/content_skaterift/models/rs_font.mdl
index 7316f26557573967a323e1ab772133c53da84299..d83ed95948658a437a30ad8e517f2ed94390837e 100644 (file)
Binary files a/content_skaterift/models/rs_font.mdl and b/content_skaterift/models/rs_font.mdl differ

diff --git a/src/menu.c b/src/menu.c
index 5d52ff6ba661b5d83dc52f4f7102a185e2bc8b83..2e8ecde53250ddd690d2e18150b3c8e8b95bd1da 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -453,6 +453,9 @@ void menu_gui( ui_context *ctx )
 {
    if( skaterift.activity == k_skaterift_default )
    {
+      if( menu.disable_open )
+         return;
+
       if( button_down( k_srbind_mopen ) )
       {
          menu_open( k_menu_page_main );

diff --git a/src/scripts/mtzero.c b/src/scripts/mtzero.c
index cc468e107334762fdd4d053f9bce53ffc64f5186..21ea89749f8015af389b27659f5e8fe222462cb0 100644 (file)
--- a/src/scripts/mtzero.c
+++ b/src/scripts/mtzero.c
@@ -220,12 +220,8 @@ static bool _skaterift_script_ch2s5_before( ent_script_event *event )
 
    if( on_function_trigger( event, 0 ) )
    {
-      /* TODO: Move this to a loop */
-      if( vg_loader_availible() )
-      {
-         _skaterift_script_nugget_set( "ch2s5_view", 3 );
-         skaterift_load_world_command( 1, (const char *[]){ "reload" } );
-      }
+      _skaterift_script_nugget_set( "ch2s5_view", 3 );
+      skaterift_load_world_command( 1, (const char *[]){ "reload" } );
    }
 
    return 1;

diff --git a/src/world_routes_ui.c b/src/world_routes_ui.c
index bf4ac296116c74de4609ec2b4e78e6ee796b6c92..e607b9077d55059ae9682111aa48d9330121a38d 100644 (file)
--- a/src/world_routes_ui.c
+++ b/src/world_routes_ui.c
@@ -163,6 +163,7 @@ static void ent_route_imgui( ui_context *ctx, world_instance *world, ent_route *
 void world_routes_imgui( ui_context *ctx, world_instance *world )
 {
    if( skaterift.activity == k_skaterift_menu ) return;
+   if( _world.event != k_world_event_none ) return;
 
    ui_point cursor = { 4, 4 };
    for( u32 i=0; i<af_arrcount(&world->ent_route); i++ )