From a84133850af6d348c0c4e252b26618148702153b Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 20 Sep 2007 13:24:20 +0000
Subject: Merged a bunch of small changes from trunk to 0.0 and set
 svn:eol-style to native for some files that were still missing this property.
 This is a feeble attempt to reduce the amount of conflicts for future merges.

---
 src/sound.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/sound.h')

diff --git a/src/sound.h b/src/sound.h
index 07db0587..34490d9a 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -62,8 +62,8 @@ class Sound {
         /**
          * Starts background music.
          *
-         * \param in   Full path to file
-         * \param loop The number of times the song is played (-1 = infinite)
+         * @param path The full path to the music file.
+         * @param loop The number of times the song is played (-1 = infinite)
          */
         void playMusic(const char *path, int loop = -1);
 
@@ -75,37 +75,37 @@ class Sound {
         /**
          * Fades in background music.
          *
-         * \param in   Full path to file
-         * \param loop The number of times the song is played (-1 = infinite)
-         * \param ms   Duration of fade-in effect (ms)
+         * @param path The full path to the music file.
+         * @param loop The number of times the song is played (-1 = infinite)
+         * @param ms   Duration of fade-in effect (ms)
          */
         void fadeInMusic(const char *path, int loop = -1, int ms = 2000);
 
         /**
          * Fades out currently running background music track.
          *
-         * \param ms   Duration of fade-out effect (ms)
+         * @param ms   Duration of fade-out effect (ms)
          */
         void fadeOutMusic(int ms);
 
         /**
          * Sets music volume.
          *
-         * \param volume Volume value
+         * @param volume Volume value
          */
         void setMusicVolume(int volume);
 
         /**
          * Sets sfx volume.
          *
-         * \param volume Volume value
+         * @param volume Volume value
          */
         void setSfxVolume(int volume);
 
         /**
          * Plays an item.
          *
-         * \param path     Full path to file
+         * @param path The resource path to the sound file.
          */
         void playSfx(const std::string &path);
 
-- 
cgit v1.2.3-60-g2f50