diff --git a/src/libsm64.c b/src/libsm64.c index fb568c2..3b8d523 100644 --- a/src/libsm64.c +++ b/src/libsm64.c @@ -146,7 +146,7 @@ SM64_LIB_FN void sm64_audio_init( const uint8_t *rom ) { #define SAMPLES_LOW 528 extern SM64_LIB_FN uint32_t sm64_audio_tick( uint32_t numQueuedSamples, uint32_t numDesiredSamples, int16_t *audio_buffer ) { - if ( !is_audio_initialized ) { + if ( !g_is_audio_initialized ) { DEBUG_PRINT("Attempted to tick audio, but sm64_audio_init() has not been called yet."); return 0; } @@ -271,7 +271,9 @@ SM64_LIB_FN void sm64_mario_delete( int32_t marioId ) struct GlobalState *globalState = ((struct MarioInstance *)s_mario_instance_pool.objects[ marioId ])->globalState; global_state_bind( globalState ); - stop_sound(SOUND_MARIO_SNORING3, gMarioState->marioObj->header.gfx.cameraToObject); + if ( g_is_audio_initialized ) { + stop_sound(SOUND_MARIO_SNORING3, gMarioState->marioObj->header.gfx.cameraToObject); + } free( gMarioObject ); free_area( gCurrentArea ); diff --git a/src/load_audio_data.c b/src/load_audio_data.c index 2548d71..3fc5ef5 100644 --- a/src/load_audio_data.c +++ b/src/load_audio_data.c @@ -4,7 +4,7 @@ #include "decomp/audio/load.h" #include "decomp/audio/load_dat.h" -bool is_audio_initialized = false; +bool g_is_audio_initialized = false; extern void load_audio_banks( const uint8_t *rom ) { // FIXME: rom_copy purposfully leaks here @@ -24,5 +24,5 @@ extern void load_audio_banks( const uint8_t *rom ) { sound_init(); sound_reset( 0 ); - is_audio_initialized = true; + g_is_audio_initialized = true; } \ No newline at end of file diff --git a/src/load_audio_data.h b/src/load_audio_data.h index 9616f27..1e2fb35 100644 --- a/src/load_audio_data.h +++ b/src/load_audio_data.h @@ -3,6 +3,6 @@ #include #include -extern bool is_audio_initialized; +extern bool g_is_audio_initialized; extern void load_audio_banks( const uint8_t *rom ); \ No newline at end of file diff --git a/src/play_sound.c b/src/play_sound.c index 59ccf5b..27af905 100644 --- a/src/play_sound.c +++ b/src/play_sound.c @@ -7,7 +7,7 @@ SM64PlaySoundFunctionPtr g_play_sound_func = NULL; extern void play_sound( uint32_t soundBits, f32 *pos ) { - if ( is_audio_initialized ) { + if ( g_is_audio_initialized ) { DEBUG_PRINT("$ play_sound(%d) request %d; pos %f %f %f\n", soundBits,sSoundRequestCount,pos[0],pos[1],pos[2]); sSoundRequests[sSoundRequestCount].soundBits = soundBits; sSoundRequests[sSoundRequestCount].position = pos;