AAAAAAAAAAAAAAAAAAAAAAAAAAAA

diff --git a/content_skaterift/maps/dev_tutorial/main.mdl b/content_skaterift/maps/dev_tutorial/main.mdl
index 9b6ec4b7d3aaace5e1a06ab5caf74af28b4810e2..7484dcead3ea7c777ae526248d63c8d6ba1f26e8 100644 (file)
Binary files a/content_skaterift/maps/dev_tutorial/main.mdl and b/content_skaterift/maps/dev_tutorial/main.mdl differ

diff --git a/content_skaterift/maps/mp_line1/main.mdl b/content_skaterift/maps/mp_line1/main.mdl
index 79141db9b1bdec858cfef224942695a16d565ce5..dac746da05552ce17b94cbafaf6786e94d851a0c 100644 (file)
Binary files a/content_skaterift/maps/mp_line1/main.mdl and b/content_skaterift/maps/mp_line1/main.mdl differ

diff --git a/content_skaterift/maps/mp_mtzero/before.mdl b/content_skaterift/maps/mp_mtzero/before.mdl
index 640bbf313497945cb284f97c9b80276c7e3a9c28..23b5945bd0cb6ebff6b1240c5f5728a922f3c9ce 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 3134fafb78289755e1bb6b9c4b53c4c8be450bb3..e31185df196a23e0d47a637bfa0ec141dec79f94 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/maps/mp_spawn/main.mdl b/content_skaterift/maps/mp_spawn/main.mdl
index 58b4d7d762d2c89ae6cc2b6217e84f1ea1dd2586..3b401b8ba0bae50de772f5acac8a3cdafcd478e3 100644 (file)
Binary files a/content_skaterift/maps/mp_spawn/main.mdl and b/content_skaterift/maps/mp_spawn/main.mdl differ

diff --git a/content_skaterift/sound/bell.ogg b/content_skaterift/sound/bell.ogg
new file mode 100644 (file)
index 0000000..3c5d7eb
Binary files /dev/null and b/content_skaterift/sound/bell.ogg differ

diff --git a/src/metascene.c b/src/metascene.c
index 8e8856eebb1f484cccdcd7b1f738fc6c943d12f9..3ebb1613f64af94d07020b8c31893e9685f9dde5 100644 (file)
--- a/src/metascene.c
+++ b/src/metascene.c
@@ -44,7 +44,10 @@ struct cs_instance *_cutscene_get_first_model_instance( const char *mdl_name )
 void _cutscene_unload(void)
 {
    vg_info( "Unloading cutscene\n" );
+   vg_audio_lock();
    vg_audio_fadeout_flagged_audio( AUDIO_FLAG_CUTSCENE, 1.0f );
+   vg_audio_set_flagged_pause( AUDIO_FLAG_CUTSCENE, 0 );
+   vg_audio_unlock();
 
    for( u32 i=0; i<_cutscene.unique_refs; i ++ )
       mdl_sync_std_unload( &_cutscene.refs[i].mdl );
@@ -465,7 +468,16 @@ void cutscene_update( f32 delta )
    if( _cutscene.state == k_cutscene_state_unloading )
    {
       if( !vg_audio_flagged_stopped( AUDIO_FLAG_CUTSCENE ) )
+      {
+         static u32 ticker = 0;
+         ticker ++;
+         if( ticker > 50 )
+         {
+            vg_low( "waiting for audio to stop...\n" );
+            ticker = 0;
+         }
          return;
+      }
 
       vg_allocator_free( _cutscene.arena );
       _cutscene.arena = NULL;
@@ -473,6 +485,7 @@ void cutscene_update( f32 delta )
       _cutscene.marker_this_frame = NULL;
       _cutscene.subtitle = NULL;
       _cutscene.raiser_entity = 0;
+      vg_info( "Finished unloading cutscene\n" );
       return;
    }
 

diff --git a/src/world_load.c b/src/world_load.c
index 4ff46c80db7a8e4b8e0377e687da37fcd8bbd638..528aec86aa1097a79706cd954fc8e6c46ea8bee1 100644 (file)
--- a/src/world_load.c
+++ b/src/world_load.c
@@ -520,7 +520,10 @@ void skaterift_load_world_start( addon_id addon_id, bool preview )
       if( (_cutscene.state != k_cutscene_state_none) && (_cutscene.state != k_cutscene_state_unloading) )
          _cutscene_unload();
 
+      vg_audio_lock();
       vg_audio_fadeout_flagged_audio( AUDIO_FLAG_WORLD, 1.0f );
+      vg_audio_set_flagged_pause( AUDIO_FLAG_WORLD, 0 );
+      vg_audio_unlock();
    }
 
    _world.loader_instance = world;