From db87da1ac5586bfef05db1621f5671719025a013 Mon Sep 17 00:00:00 2001 From: zicodxx <> Date: Thu, 12 Jun 2008 08:01:00 +0000 Subject: [PATCH] Setting GameArg.SndNoSound to true if SDL_mixer init fails --- CHANGELOG.txt | 1 + arch/sdl/digi_mixer.c | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9769d1464..6425315df 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D1X-Rebirth Changelog 20080612 -------- README.txt, main/collide.c, main/multi.c, main/netdrv_udp.c, main/network.c, main/state.c: Improved Player relay for Endlevel status; Fixed leaving when UDP hosts leaves; Fixed multi_frame_calling while demos since demos can be Game_mode & GM_MULTI; Re-added lost collision fix between robots and reactor; Made state_defaut_item static so selected state slot stays selected +arch/sdl/digi_mixer.c: Setting GameArg.SndNoSound to true if SDL_mixer init fails 20080605 -------- diff --git a/arch/sdl/digi_mixer.c b/arch/sdl/digi_mixer.c index 75339bdd1..91984d07c 100644 --- a/arch/sdl/digi_mixer.c +++ b/arch/sdl/digi_mixer.c @@ -78,6 +78,7 @@ int digi_mixer_init() { if (Mix_OpenAudio(digi_sample_rate, MIX_OUTPUT_FORMAT, MIX_OUTPUT_CHANNELS, SOUND_BUFFER_SIZE)) { //edited on 10/05/98 by Matt Mueller - should keep running, just with no sound. con_printf(CON_URGENT,"\nError: Couldn't open audio: %s\n", SDL_GetError()); + GameArg.SndNoSound = 1; return 1; }