sm64-mirrors/libsm64
1
0
Fork 0
mirror of https://github.com/libsm64/libsm64.git synced 2025-01-22 07:32:04 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #33 from Brawmario/fix/terminate-without-audio

Browse source 
Avoid crash in mario_delete if audio not init
This commit is contained in:
Jeremy Burns 2023-02-08 16:23:25 -07:00 committed by GitHub
commit 6278df0dd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libsm64.c
View file

@ -146,13 +146,13 @@ SM64_LIB_FN void sm64_audio_init( 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;
}
update_game_sound();
u32 num_audio_samples = numQueuedSamples < numDesiredSamples ? SAMPLES_HIGH : SAMPLES_LOW;
for (int i = 0; i < 2; i++)
{
@ -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 );
@ -592,7 +594,7 @@ SM64_LIB_FN void sm64_surface_object_delete( uint32_t objectId )
}
SM64_LIB_FN int32_t sm64_surface_find_wall_collision( float *xPtr, float *yPtr, float *zPtr, float offsetY, float radius )
SM64_LIB_FN int32_t sm64_surface_find_wall_collision( float *xPtr, float *yPtr, float *zPtr, float offsetY, float radius )
{
return f32_find_wall_collision( xPtr, yPtr, zPtr, offsetY, radius );
}

8
src/load_audio_data.c
View file

@ -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( uint8_t *rom ) {
uint8_t *rom2 = malloc( 0x800000 );
@ -19,9 +19,9 @@ extern void load_audio_banks( uint8_t *rom ) {
gBankSetsData[0x45]=0x00;
ptrs_to_offsets( gSoundDataADSR );
audio_init();
audio_init();
sound_init();
sound_reset( 0 );
is_audio_initialized = true;
g_is_audio_initialized = true;
}

2
src/load_audio_data.h
View file

@ -3,6 +3,6 @@
#include <stdbool.h>
#include <stdint.h>
extern bool is_audio_initialized;
extern bool g_is_audio_initialized;
extern void load_audio_banks( uint8_t *rom );

2
src/play_sound.c
View file

@ -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;