Changeset 627Tweet

Timestamp:

May 9, 2011, 9:21:51 PM (11 years ago)

Author:

Sam Hocevar

Message:

sdlport: make the SFX availability check more robust.

File:

• abuse/trunk/src/sdlport/sound.cpp (modified) (3 diffs)

abuse/trunk/src/sdlport/sound.cpp

@@ -44 +44 @@
 {
     char *sfxdir, *datadir;
-    FILE *fd = NULL;
+    FILE *f = NULL;
 
     // Disable sound if requested.
@@ -56 +56 @@
     // Check for the sfx directory, disable sound if we can't find it.
     datadir = get_filename_prefix();
-    sfxdir = (char *)malloc( strlen( datadir ) + 5 + 1 );
-    sprintf( sfxdir, "%s/sfx/", datadir );
-    if( (fd = fopen( sfxdir,"r" )) == NULL )
+    sfxdir = (char *)malloc(strlen(datadir) + 5 + 1);
+    sprintf(sfxdir, "%s/sfx/ambcave1.wav", datadir);
+    FILE *f = fopen(sfxdir, "r");
+    if (!f)
     {
         // Didn't find the directory, so disable sound.
@@ -64 +65 @@
         return 0;
     }
-    free( sfxdir );
+    fclose(f);
+    free(sfxdir);
 
     if (Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 128) < 0)