more sensible world loading stuff (wip)

[carveJwlIkooP6JGAAIwe30JlM.git] / world_audio.c

diff --git a/world_audio.c b/world_audio.c
index facbcc46c5373db8ba6c14e2bb288a4f561d23c7..a8e88d6631fdbf00e14ad98774a32bdbb56a5b64 100644 (file)
--- a/world_audio.c
+++ b/world_audio.c
@@ -13,7 +13,7 @@ VG_STATIC void world_fadeout_audio( world_instance *world )
                       " audio.\n" );
    }
 
-   u8 world_id = (world - world_static.worlds) + 1;
+   u8 world_id = (world - world_static.instances) + 1;
 
    audio_lock();
    for( u32 i=0; i<AUDIO_CHANNELS; i++ ){
@@ -115,7 +115,7 @@ VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value )
 
    distances[si] = dist;
 
-   if( vg_lines.draw ){
+   if( vg_audio.debug_ui && vg_lines.draw ){
       for( int i=0; i<14; i++ ){
          if( distances[i] != 200.0f ){
             u32 colours[] = { VG__RED, VG__BLUE, VG__GREEN,
@@ -127,7 +127,7 @@ VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value )
             v3f p1;
             v3_muladds( ro, sample_directions[i], distances[i], p1 );
             vg_line( ro, p1, colour );
-            vg_line_pt3( p1, 0.1f, colour );
+            vg_line_point( p1, 0.1f, colour );
          }
       }
    }