Some formatting changes to align with the 0.0 branch.

5 files changed, 18 insertions, 26 deletions

diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 42c0a743..d77d08f5 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -117,7 +117,6 @@ class AnimatedSprite
         Action *mAction;               /**< The currently active action. */
         Animation *mAnimation;         /**< The currently active animation. */
         Frame *mFrame;                 /**< The currently active frame. */
-        std::string mAnimationFile;
 };
 
 #endif
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index e42e7b59..696f4fc6 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -91,6 +91,7 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         int mSelected;                      /**< Index of selected item. */
 };
+
 extern EquipmentWindow *equipmentWindow;
 
 #endif
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index bddf7cee..e38b665f 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -146,7 +146,8 @@ ItemContainer::selectNone()
 void
 ItemContainer::setSelectedItem(Item *item)
 {
-    if (mSelectedItem != item) {
+    if (mSelectedItem != item)
+    {
         mSelectedItem = item;
         fireSelectionChangedEvent();
     }
@@ -159,7 +160,8 @@ ItemContainer::fireSelectionChangedEvent()
     SelectionListeners::iterator i_end = mListeners.end();
     SelectionListeners::iterator i;
 
-    for (i = mListeners.begin(); i != i_end; ++i) {
+    for (i = mListeners.begin(); i != i_end; ++i)
+    {
         (*i)->selectionChanged(event);
     }
 }
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index c9fbd4c9..b068056d 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -59,7 +59,7 @@ class MonsterInfo
         ~MonsterInfo();
 
         void
-        setName(std::string name) { mName = name; } ;
+        setName(std::string name) { mName = name; }
 
         void
         setSprite(std::string filename) { mSprite = filename; }
@@ -72,10 +72,10 @@ class MonsterInfo
         addSound(MonsterSoundEvent event, std::string filename);
 
         const std::string&
-        getName () const { return mName; };
+        getName() const { return mName; }
 
         const std::string&
-        getSprite () const { return mSprite; };
+        getSprite() const { return mSprite; }
 
         const Being::TargetCursorSize
         getTargetCursorSize() const { return mTargetCursorSize; }
diff --git a/src/sound.cpp b/src/sound.cpp
index 9f858e15..cf77cfab 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -40,8 +40,7 @@ Sound::~Sound()
 {
 }
 
-void
-Sound::init()
+void Sound::init()
 {
     // Don't initialize sound engine twice
     if (mInstalled) return;
@@ -72,8 +71,7 @@ Sound::init()
     mInstalled = true;
 }
 
-void
-Sound::info()
+void Sound::info()
 {
     SDL_version compiledVersion;
     const SDL_version *linkedVersion;
@@ -112,8 +110,7 @@ Sound::info()
     logger->log("Sound::info() Channels: %i", channels);
 }
 
-void
-Sound::setMusicVolume(int volume)
+void Sound::setMusicVolume(int volume)
 {
     if (!mInstalled) return;
 
@@ -121,8 +118,7 @@ Sound::setMusicVolume(int volume)
     Mix_VolumeMusic(volume);
 }
 
-void
-Sound::setSfxVolume(int volume)
+void Sound::setSfxVolume(int volume)
 {
     if (!mInstalled) return;
 
@@ -130,8 +126,7 @@ Sound::setSfxVolume(int volume)
     Mix_Volume(-1, volume);
 }
 
-void
-Sound::playMusic(const std::string &path, int loop)
+void Sound::playMusic(const std::string &path, int loop)
 {
     if (!mInstalled) return;
 
@@ -151,8 +146,7 @@ Sound::playMusic(const std::string &path, int loop)
     }
 }
 
-void
-Sound::stopMusic()
+void Sound::stopMusic()
 {
     if (!mInstalled) return;
 
@@ -165,8 +159,7 @@ Sound::stopMusic()
     }
 }
 
-void
-Sound::fadeInMusic(const std::string &path, int loop, int ms)
+void Sound::fadeInMusic(const std::string &path, int loop, int ms)
 {
     if (!mInstalled) return;
 
@@ -187,8 +180,7 @@ Sound::fadeInMusic(const std::string &path, int loop, int ms)
     }
 }
 
-void
-Sound::fadeOutMusic(int ms)
+void Sound::fadeOutMusic(int ms)
 {
     if (!mInstalled) return;
 
@@ -201,8 +193,7 @@ Sound::fadeOutMusic(int ms)
     }
 }
 
-void
-Sound::playSfx(const std::string &path)
+void Sound::playSfx(const std::string &path)
 {
     if (!mInstalled || path.length() == 0) return;
 
@@ -214,8 +205,7 @@ Sound::playSfx(const std::string &path)
     }
 }
 
-void
-Sound::close()
+void Sound::close()
 {
     stopMusic();