diff --git a/magic/src/alien.c b/magic/src/alien.c index bf7696a3f..21afe7969 100644 --- a/magic/src/alien.c +++ b/magic/src/alien.c @@ -80,9 +80,6 @@ int alien_init(magic_api * api){ for (i = 0; i < alien_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, alien_snd_filenames[i]); alien_snd_effect[i] = Mix_LoadWAV(fname); - if (alien_snd_effect[i]==NULL){ - return(0); - } } return(1); } @@ -176,6 +173,16 @@ void alien_drag(magic_api * api, int which, SDL_Surface * canvas, update_rect->h = (y + alien_RADIUS) - update_rect->y; } +int use_sound = 1; + +Mix_Chunk * magic_loadsound(char* file){ + if (!use_sound){ + return (Mix_Chunk*)-1; + } + Mix_Chunk * temp = Mix_LoadWAV(file); + return temp; +} + // Affect the canvas on click: void alien_click(magic_api * api, int which, int mode, SDL_Surface * canvas, SDL_Surface * last, diff --git a/magic/src/blur.c b/magic/src/blur.c index 91f16d31e..b341be6ed 100644 --- a/magic/src/blur.c +++ b/magic/src/blur.c @@ -72,9 +72,6 @@ int blur_init(magic_api * api){ for (i = 0; i < blur_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, blur_snd_filenames[i]); blur_snd_effect[i] = Mix_LoadWAV(fname); - if (blur_snd_effect[i]==NULL){ - return(0); - } } return(1); } diff --git a/magic/src/mosaic.c b/magic/src/mosaic.c index efbd7f4df..124af0973 100644 --- a/magic/src/mosaic.c +++ b/magic/src/mosaic.c @@ -86,9 +86,6 @@ int mosaic_init(magic_api * api){ for (i = 0; i < mosaic_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, mosaic_snd_filenames[i]); mosaic_snd_effect[i] = Mix_LoadWAV(fname); - if (mosaic_snd_effect[i]==NULL){ - return(0); - } } return(1); diff --git a/magic/src/noise.c b/magic/src/noise.c index c8891ba37..2bb8833e1 100644 --- a/magic/src/noise.c +++ b/magic/src/noise.c @@ -79,9 +79,6 @@ int noise_init(magic_api * api){ for (i = 0; i < noise_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, noise_snd_filenames[i]); noise_snd_effect[i] = Mix_LoadWAV(fname); - if (noise_snd_effect[i]==NULL){ - return(0); - } } return(1); } diff --git a/magic/src/rain.c b/magic/src/rain.c index 9b3389d23..bdf381ef2 100644 --- a/magic/src/rain.c +++ b/magic/src/rain.c @@ -87,9 +87,6 @@ int rain_init(magic_api * api){ for (i = 0; i < rain_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, rain_snd_filenames[i]); rain_snd_effect[i] = Mix_LoadWAV(fname); - if (rain_snd_effect[i] == NULL){ - return(0); - } } return(1); diff --git a/magic/src/sharpen.c b/magic/src/sharpen.c index d6453a8e8..128ef54de 100644 --- a/magic/src/sharpen.c +++ b/magic/src/sharpen.c @@ -95,9 +95,6 @@ int sharpen_init(magic_api * api){ for (i = 0; i < sharpen_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, sharpen_snd_filenames[i]); sharpen_snd_effect[i] = Mix_LoadWAV(fname); - if (sharpen_snd_effect[i]==NULL){ - return(0); - } } return(1); diff --git a/magic/src/snow.c b/magic/src/snow.c index 760d2f5be..9a11eb856 100644 --- a/magic/src/snow.c +++ b/magic/src/snow.c @@ -98,9 +98,6 @@ int snow_init(magic_api * api){ for (i = 0; i < snow_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, snow_snd_filenames[i]); snow_snd_effect[i] = Mix_LoadWAV(fname); - if (snow_snd_effect[i]==NULL){ - return(0); - } } return(1); } diff --git a/magic/src/tint.c b/magic/src/tint.c index 88c1d5618..0a7f97b24 100644 --- a/magic/src/tint.c +++ b/magic/src/tint.c @@ -84,9 +84,6 @@ int tint_init(magic_api * api){ for (i = 0; i < tint_NUM_TOOLS; i++){ snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, tint_snd_filenames[i]); tint_snd_effect[i] = Mix_LoadWAV(fname); - if (tint_snd_effect[i] == NULL){ - return(0); - } } return(1); }