notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed error checking from magic tools as it was causing problems with --nosound

Browse source
This commit is contained in:
Andrew Corcoran 2008-08-03 22:15:52 +00:00
parent a60c242972
commit a0cd6daeb5
8 changed files with 10 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
magic/src/alien.c
View file

@ -80,9 +80,6 @@ int alien_init(magic_api * api){
for (i = 0; i < alien_NUM_TOOLS; i++){ for (i = 0; i < alien_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, alien_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, alien_snd_filenames[i]);
alien_snd_effect[i] = Mix_LoadWAV(fname); alien_snd_effect[i] = Mix_LoadWAV(fname);
if (alien_snd_effect[i]==NULL){
return(0);
}
} }
return(1); 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; 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: // Affect the canvas on click:
void alien_click(magic_api * api, int which, int mode, void alien_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * last, SDL_Surface * canvas, SDL_Surface * last,

3
magic/src/blur.c
View file

@ -72,9 +72,6 @@ int blur_init(magic_api * api){
for (i = 0; i < blur_NUM_TOOLS; i++){ for (i = 0; i < blur_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, blur_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, blur_snd_filenames[i]);
blur_snd_effect[i] = Mix_LoadWAV(fname); blur_snd_effect[i] = Mix_LoadWAV(fname);
if (blur_snd_effect[i]==NULL){
return(0);
}
} }
return(1); return(1);
} }

3
magic/src/mosaic.c
View file

@ -86,9 +86,6 @@ int mosaic_init(magic_api * api){
for (i = 0; i < mosaic_NUM_TOOLS; i++){ for (i = 0; i < mosaic_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, mosaic_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, mosaic_snd_filenames[i]);
mosaic_snd_effect[i] = Mix_LoadWAV(fname); mosaic_snd_effect[i] = Mix_LoadWAV(fname);
if (mosaic_snd_effect[i]==NULL){
return(0);
}
} }
return(1); return(1);

3
magic/src/noise.c
View file

@ -79,9 +79,6 @@ int noise_init(magic_api * api){
for (i = 0; i < noise_NUM_TOOLS; i++){ for (i = 0; i < noise_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, noise_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, noise_snd_filenames[i]);
noise_snd_effect[i] = Mix_LoadWAV(fname); noise_snd_effect[i] = Mix_LoadWAV(fname);
if (noise_snd_effect[i]==NULL){
return(0);
}
} }
return(1); return(1);
} }

3
magic/src/rain.c
View file

@ -87,9 +87,6 @@ int rain_init(magic_api * api){
for (i = 0; i < rain_NUM_TOOLS; i++){ for (i = 0; i < rain_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, rain_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, rain_snd_filenames[i]);
rain_snd_effect[i] = Mix_LoadWAV(fname); rain_snd_effect[i] = Mix_LoadWAV(fname);
if (rain_snd_effect[i] == NULL){
return(0);
}
} }
return(1); return(1);

3
magic/src/sharpen.c
View file

@ -95,9 +95,6 @@ int sharpen_init(magic_api * api){
for (i = 0; i < sharpen_NUM_TOOLS; i++){ for (i = 0; i < sharpen_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, sharpen_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, sharpen_snd_filenames[i]);
sharpen_snd_effect[i] = Mix_LoadWAV(fname); sharpen_snd_effect[i] = Mix_LoadWAV(fname);
if (sharpen_snd_effect[i]==NULL){
return(0);
}
} }
return(1); return(1);

3
magic/src/snow.c
View file

@ -98,9 +98,6 @@ int snow_init(magic_api * api){
for (i = 0; i < snow_NUM_TOOLS; i++){ for (i = 0; i < snow_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, snow_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, snow_snd_filenames[i]);
snow_snd_effect[i] = Mix_LoadWAV(fname); snow_snd_effect[i] = Mix_LoadWAV(fname);
if (snow_snd_effect[i]==NULL){
return(0);
}
} }
return(1); return(1);
} }

3
magic/src/tint.c
View file

@ -84,9 +84,6 @@ int tint_init(magic_api * api){
for (i = 0; i < tint_NUM_TOOLS; i++){ for (i = 0; i < tint_NUM_TOOLS; i++){
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, tint_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, tint_snd_filenames[i]);
tint_snd_effect[i] = Mix_LoadWAV(fname); tint_snd_effect[i] = Mix_LoadWAV(fname);
if (tint_snd_effect[i] == NULL){
return(0);
}
} }
return(1); return(1);
} }