View difference between Paste ID: PEHNnhag and 5EwJ9UTA

-/* sound -- sound handling.
+
- * Copyright (C) 2010-2011 The Zatacka X development team
+
 static Mix_Music *bgm = NULL;
- * This program is free software: you can redistribute it and/or modify
+
- * it under the terms of the GNU General Public License as published by
+
- * the Free Software Foundation, either version 3 of the License, or
+
- * (at your option) any later version.
+
 static Mix_Chunk *seBeeeeep = NULL;
- * This program is distributed in the hope that it will be useful,
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+
- * GNU General Public License for more details.
+
 static Mix_Chunk *seCrash = NULL;
- * You should have received a copy of the GNU General Public License
+
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 static Mix_Chunk *seConfusion = NULL;
 static Mix_Chunk *seSharpturn = NULL;
 static Mix_Chunk *seTimestep = NULL;
 static Mix_Chunk *seMole = NULL;
 static Mix_Chunk *seWarp = NULL;
 static Mix_Chunk *seGhost = NULL;
 static Mix_Chunk *seDisable = NULL;
 static Mix_Chunk *seSwitch = NULL;
 static Mix_Chunk *sounds[N_SOUNDS];
 
 /**
  * Initializes the mixer and loads sound files.
  *
  * @return -1 on failiure, 0 else.
  */
 int initSound(void)
 {
     if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY * 2, MIX_DEFAULT_FORMAT,
                       2, 512) == -1 )
     {
         return -1;
     }
 
     if ((bgm = Mix_LoadMUS("data/sound/theme1.ogg")) == NULL) {
         fileNotFound("data/sound/theme1.ogg");
         return -1;
     }
 
- * Loads a sound effect into appropriate sound array index.
+
         return -1;
- * @param sound Pointer to where to put the loaded sound.
+
- * @param soundstr Name of the sound (.ogg added).
+
- * @param index Index in the sound array (0 --> N_SOUNDS).
+
         return -1;
     if (loadSound(seBeeeep, "beeeep", SOUND_BEEEEP) == -1)
-int loadSound(Mix_Chunk *sound, char *soundstr, int index)
+
     if (loadSound(seBeeeeep, "beeeeep", SOUND_BEEEEEP) == -1)
-    char *soundpath = malloc(STRBUF);
+
-    snprintf(soundpath, STRBUF, "data/sound/%s.ogg", soundstr);
+
-    if ((sound = Mix_LoadWAV(soundpath)) == NULL) {
+
-        fileNotFound(soundpath);
+
-        free(soundpath);
+
     if (loadSound(seBeeeeeeeep, "beeeeeeeep", SOUND_BEEEEEEEEP) == -1)
-    } else {
+
-        sounds[index] = sound;
+
-        free(soundpath);
+
-        return 0;
+
         return -1;
-}
+
         return -1;
     if (loadSound(seFreeze, "freeze", SOUND_FREEZE) == -1)
         return -1;
     if (loadSound(seConfusion, "confusion", SOUND_CONFUSION) == -1)
         return -1;
     if (loadSound(seSharpturn, "sharpturn", SOUND_SHARPTURN) == -1)
         return -1;
     if (loadSound(seTimestep, "timestep", SOUND_TIMESTEP) == -1)
         return -1;
     if (loadSound(seMole, "mole", SOUND_MOLE) == -1)
         return -1;
     if (loadSound(seWarp, "warp", SOUND_WARP) == -1)
         return -1;
     if (loadSound(seGhost, "ghost", SOUND_GHOST) == -1)
         return -1;
     if (loadSound(seDisable, "ghost", SOUND_DISABLE) == -1)
         return -1;
     if (loadSound(seSwitch, "switch", SOUND_SWITCH) == -1)
         return -1;
 
     return 0;
 }